diff --git a/src/modules/base/common/theme.ts b/src/modules/base/common/theme.ts
index b71a3ca..5e761e3 100644
--- a/src/modules/base/common/theme.ts
+++ b/src/modules/base/common/theme.ts
@@ -7,6 +7,3 @@ if (config.app.iconfont) {
createLink(e);
});
}
-
-// 默认
-createLink('//at.alicdn.com/t/c/font_3254019_h02ghb7ckt5.css');
diff --git a/src/modules/base/pages/main/components/process.vue b/src/modules/base/pages/main/components/process.vue
index 718f3e6..495e392 100644
--- a/src/modules/base/pages/main/components/process.vue
+++ b/src/modules/base/pages/main/components/process.vue
@@ -2,13 +2,13 @@
@@ -24,7 +24,8 @@
@click="onTap(item, Number(index))"
@contextmenu.stop.prevent="openCM($event, item)"
>
-
{{ item.meta?.label || item.name || item.path }}
+
{{ item.meta?.label || item.name || item.path }}
+
@@ -163,43 +164,34 @@ onMounted(() => {
.app-process {
display: flex;
align-items: center;
- height: 30px;
position: relative;
- margin: 0 0 10px 0;
- padding: 0 10px;
+ padding: 5px 10px;
user-select: none;
+ background-color: var(--el-bg-color);
+ box-sizing: border-box;
+ margin-bottom: 10px;
&__op {
- display: flex;
- background-color: #fff;
- height: 30px;
- border-radius: 4px;
- margin-right: 10px;
list-style: none;
+ margin-right: 5px;
.item {
display: inline-flex;
align-items: center;
justify-content: center;
position: relative;
- padding: 0 10px;
- color: #333;
+ height: 26px;
+ width: 26px;
cursor: pointer;
- font-weight: bold;
+ border-radius: 4px;
+ margin-right: 5px;
- &:not(:last-child)::after {
- display: block;
- content: '';
- position: absolute;
- right: 0;
- top: calc(50% - 5px);
- height: 10px;
- width: 1px;
- background-color: #eee;
+ .cl-svg {
+ font-size: 16px;
}
&:hover {
- color: var(--el-color-primary);
+ background-color: var(--el-fill-color-light);
}
}
}
@@ -226,13 +218,11 @@ onMounted(() => {
border-radius: 4px;
height: 30px;
padding: 0 10px;
- background-color: #fff;
- font-size: 12px;
margin-right: 10px;
- color: #909399;
cursor: pointer;
+ color: var(--el-color-info);
- span {
+ .el-text {
line-height: 1;
}
@@ -240,12 +230,14 @@ onMounted(() => {
font-size: 13px;
width: 0;
overflow: hidden;
- transition: all 0.3s;
- color: #909399;
+ transition: width 0.3s;
opacity: 0;
+ border-radius: 20px;
+ padding: 2px;
&:hover {
- color: #f56c6c !important;
+ background-color: rgba(0, 0, 0, 0.2);
+ color: #fff;
}
}
@@ -255,14 +247,14 @@ onMounted(() => {
&:hover {
&:not(.active) {
- background-color: #eee;
+ background-color: var(--el-fill-color-light);
}
}
&.active {
background-color: var(--color-primary);
- span {
+ .el-text {
color: #fff;
}
diff --git a/src/modules/base/pages/main/components/route-nav.vue b/src/modules/base/pages/main/components/route-nav.vue
index eac602f..83f45eb 100644
--- a/src/modules/base/pages/main/components/route-nav.vue
+++ b/src/modules/base/pages/main/components/route-nav.vue
@@ -1,8 +1,8 @@
-
+
{{ lastName }}
-
+
@@ -52,16 +52,19 @@ const list = computed(() => {
});
// 最后一个节点名称
-const lastName = computed(() => last(list.value)?.name);
+const lastName = computed(() => last(list.value)?.meta?.label);
+
+
diff --git a/src/modules/base/static/svg/back.svg b/src/modules/base/static/svg/back.svg
new file mode 100644
index 0000000..1212879
--- /dev/null
+++ b/src/modules/base/static/svg/back.svg
@@ -0,0 +1,17 @@
+
+
diff --git a/src/modules/base/static/svg/exit.svg b/src/modules/base/static/svg/exit.svg
new file mode 100644
index 0000000..f6071c5
--- /dev/null
+++ b/src/modules/base/static/svg/exit.svg
@@ -0,0 +1,25 @@
+
+
diff --git a/src/modules/base/static/svg/expand.svg b/src/modules/base/static/svg/expand.svg
new file mode 100644
index 0000000..36e408c
--- /dev/null
+++ b/src/modules/base/static/svg/expand.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/modules/base/static/svg/fold.svg b/src/modules/base/static/svg/fold.svg
new file mode 100644
index 0000000..9ccd9b9
--- /dev/null
+++ b/src/modules/base/static/svg/fold.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/modules/base/static/svg/home.svg b/src/modules/base/static/svg/home.svg
new file mode 100644
index 0000000..53fc5b6
--- /dev/null
+++ b/src/modules/base/static/svg/home.svg
@@ -0,0 +1,21 @@
+
+
diff --git a/src/modules/base/static/svg/my.svg b/src/modules/base/static/svg/my.svg
new file mode 100644
index 0000000..a422ae4
--- /dev/null
+++ b/src/modules/base/static/svg/my.svg
@@ -0,0 +1,21 @@
+
+
diff --git a/src/modules/base/static/svg/refresh.svg b/src/modules/base/static/svg/refresh.svg
new file mode 100644
index 0000000..a9f1281
--- /dev/null
+++ b/src/modules/base/static/svg/refresh.svg
@@ -0,0 +1,21 @@
+
+
diff --git a/src/modules/chat/components/index.vue b/src/modules/chat/components/index.vue
index 079979b..9945a50 100644
--- a/src/modules/chat/components/index.vue
+++ b/src/modules/chat/components/index.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/src/modules/demo/views/crud/components/crud/service.vue b/src/modules/demo/views/crud/components/crud/service.vue
index eea4284..7059dab 100644
--- a/src/modules/demo/views/crud/components/crud/service.vue
+++ b/src/modules/demo/views/crud/components/crud/service.vue
@@ -47,17 +47,25 @@
import { useCrud, useTable, useUpsert } from '@cool-vue/crud';
import { ref } from 'vue';
import { useCool } from '/@/cool';
+import { useDict } from '/$/dict';
//【很重要】service 是所有请求的集合,是一个对象(刷新页面和保存代码会自动读取后端的所有接口)
const { service, route } = useCool();
console.log('service', service);
+const { dict } = useDict();
+
// cl-crud 配置
const Crud = useCrud(
{
//【很重要】配置 service,如:service.base.sys.user
// 不需要到具体的方法,如:service.base.sys.user.page,这是错误的!
- service: service.base.sys.user
+
+ // 实际用法
+ // service: service.base.sys.user,
+
+ // 测试示例
+ service: 'test'
// 自定义配置1,添加本地 service 文件。
// 【很重要】参考 /src/modules/demo/service/test.ts
@@ -103,31 +111,20 @@ const Table = useTable({
type: 'selection'
},
{
- label: '商品名称',
- prop: 'title',
+ label: '姓名',
+ prop: 'name',
minWidth: 140
},
{
- label: '价格',
- prop: 'price',
+ label: '手机号',
+ prop: 'phone',
minWidth: 140
},
{
- label: '主图',
- prop: 'mainImage',
- minWidth: 140,
- component: {
- name: 'cl-image',
- props: {
- size: 60
- }
- }
- },
- {
- label: '描述',
- prop: 'description',
- minWidth: 200,
- showOverflowTooltip: true
+ label: '工作',
+ prop: 'occupation',
+ dict: dict.get('occupation'),
+ minWidth: 140
},
{
label: '创建时间',
@@ -146,37 +143,28 @@ const Table = useTable({
const Upsert = useUpsert({
items: [
{
- label: '商品名称',
- prop: 'title',
- required: true,
+ label: '姓名',
+ prop: 'name',
component: {
name: 'el-input'
}
},
{
- label: '价格',
- prop: 'price',
- required: true,
+ label: '手机号',
+ prop: 'phone',
component: {
- name: 'el-input-number'
+ name: 'el-input'
}
},
{
- label: '主图',
- prop: 'mainImage',
- required: true,
+ label: '工作',
+ prop: 'occupation',
component: {
- name: 'cl-upload'
- }
- },
- {
- label: '描述',
- prop: 'description',
- component: {
- name: 'el-input',
+ name: 'cl-select',
props: {
- type: 'textarea',
- rows: 4
+ tree: true,
+ checkStrictly: true,
+ options: dict.get('occupation')
}
}
}
diff --git a/src/modules/demo/views/crud/components/upsert/event.vue b/src/modules/demo/views/crud/components/upsert/event.vue
index 4a71952..62ffd1c 100644
--- a/src/modules/demo/views/crud/components/upsert/event.vue
+++ b/src/modules/demo/views/crud/components/upsert/event.vue
@@ -2,7 +2,7 @@
event
- 事件
+ 打开、关闭、提交等事件
diff --git a/src/modules/demo/views/crud/components/upsert/mode.vue b/src/modules/demo/views/crud/components/upsert/mode.vue
index ad5c07b..5689936 100644
--- a/src/modules/demo/views/crud/components/upsert/mode.vue
+++ b/src/modules/demo/views/crud/components/upsert/mode.vue
@@ -2,7 +2,7 @@
mode
- 不同模式
+ 新增、编辑、详情模式
diff --git a/src/modules/helper/components/auto-menu/btn.vue b/src/modules/helper/components/auto-menu/btn.vue
index dfb0b26..83d54bb 100644
--- a/src/modules/helper/components/auto-menu/btn.vue
+++ b/src/modules/helper/components/auto-menu/btn.vue
@@ -1,9 +1,7 @@
-
-
- AI 极速编码
-
-
+
+ AI 极速编码
+