From e6a9d881a75e0ea3d852f3c51646dc9c66b891c0 Mon Sep 17 00:00:00 2001 From: sakuya <81883387@qq.com> Date: Tue, 13 Feb 2024 11:37:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9=20mock=20API=20URL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index aecdae7..e589ffe 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ NODE_ENV = development VUE_APP_TITLE = SCUI(DEV) # 接口地址 -VUE_APP_API_BASEURL = https://www.fastmock.site/mock/5039c4361c39a7e3252c5b55971f1bd3/api +VUE_APP_API_BASEURL = https://mock.apifox.com/m1/4021385-0-default/api # 本地端口 VUE_APP_PORT = 2800 diff --git a/.env.production b/.env.production index 900739d..9ea4fc6 100644 --- a/.env.production +++ b/.env.production @@ -5,4 +5,4 @@ NODE_ENV = production VUE_APP_TITLE = SCUI # 接口地址 -VUE_APP_API_BASEURL = https://www.fastmock.site/mock/5039c4361c39a7e3252c5b55971f1bd3/api \ No newline at end of file +VUE_APP_API_BASEURL = https://mock.apifox.com/m1/4021385-0-default/api \ No newline at end of file -- Gitee From a73b15e30b9dec84b208162d3885f57515273450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E5=BD=AC?= Date: Fri, 15 Nov 2024 23:29:46 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8D=87=E7=BA=A7element-plus=E3=80=81scss?= =?UTF-8?q?=E7=89=88=E6=9C=AC=20=E6=9B=B4=E6=96=B0el-pagination=E7=BB=84?= =?UTF-8?q?=E4=BB=B6small=E5=8F=82=E6=95=B0=E4=B8=BAsize=3D"small"=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC=E5=8F=B71.6.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 2 +- package.json | 6 +++--- src/App.vue | 2 +- src/components/scForm/index.vue | 2 +- src/components/scTable/index.vue | 2 +- src/components/scTableSelect/index.vue | 2 +- src/components/scWorkflow/nodes/approver.vue | 18 +++++++++--------- src/components/scWorkflow/nodes/branch.vue | 4 ++-- src/config/index.js | 4 ++-- src/locales/index.js | 4 ++-- src/style/dark.scss | 2 +- src/style/style.scss | 10 +++++----- src/views/template/list/crud/save.vue | 4 ++-- 14 files changed, 32 insertions(+), 32 deletions(-) diff --git a/.env.development b/.env.development index e589ffe..420cb09 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ NODE_ENV = development VUE_APP_TITLE = SCUI(DEV) # 接口地址 -VUE_APP_API_BASEURL = https://mock.apifox.com/m1/4021385-0-default/api +VUE_APP_API_BASEURL = https://apifoxmock.com/m1/4021385-0-default/api # 本地端口 VUE_APP_PORT = 2800 diff --git a/.env.production b/.env.production index 9ea4fc6..efa19d2 100644 --- a/.env.production +++ b/.env.production @@ -5,4 +5,4 @@ NODE_ENV = production VUE_APP_TITLE = SCUI # 接口地址 -VUE_APP_API_BASEURL = https://mock.apifox.com/m1/4021385-0-default/api \ No newline at end of file +VUE_APP_API_BASEURL = https://apifoxmock.com/m1/4021385-0-default/api \ No newline at end of file diff --git a/package.json b/package.json index f682913..77900ab 100644 --- a/package.json +++ b/package.json @@ -10,13 +10,13 @@ "dependencies": { "@element-plus/icons-vue": "2.0.10", "@tinymce/tinymce-vue": "5.0.0", - "axios": "1.3.4", + "axios": "^1.7.7", "codemirror": "5.65.5", "core-js": "3.29.0", "cropperjs": "1.5.13", "crypto-js": "4.1.1", "echarts": "5.4.1", - "element-plus": "2.2.32", + "element-plus": "2.8.8", "nprogress": "0.2.0", "qrcodejs2": "0.0.2", "sortablejs": "1.15.0", @@ -37,7 +37,7 @@ "@vue/cli-service": "5.0.8", "eslint": "8.35.0", "eslint-plugin-vue": "9.9.0", - "sass": "1.58.3", + "sass": "1.81.0", "sass-loader": "10.1.1" }, "eslintConfig": { diff --git a/src/App.vue b/src/App.vue index ed73c22..c110ae0 100644 --- a/src/App.vue +++ b/src/App.vue @@ -42,5 +42,5 @@ diff --git a/src/components/scForm/index.vue b/src/components/scForm/index.vue index 146acdf..3e74f54 100644 --- a/src/components/scForm/index.vue +++ b/src/components/scForm/index.vue @@ -74,7 +74,7 @@ diff --git a/src/components/scTable/index.vue b/src/components/scTable/index.vue index 2dc2db7..2ec451a 100644 --- a/src/components/scTable/index.vue +++ b/src/components/scTable/index.vue @@ -29,7 +29,7 @@
- +
diff --git a/src/components/scTableSelect/index.vue b/src/components/scTableSelect/index.vue index 772a7cc..04c27d7 100644 --- a/src/components/scTableSelect/index.vue +++ b/src/components/scTableSelect/index.vue @@ -141,7 +141,7 @@ autoCurrentLabel(){ this.$nextTick(() => { if(this.multiple){ - this.$refs.select.selected.forEach(item => { + this.$refs.select.selected?.forEach(item => { item.currentLabel = item.value[this.defaultProps.label] }) }else{ diff --git a/src/components/scWorkflow/nodes/approver.vue b/src/components/scWorkflow/nodes/approver.vue index 4752c30..6427276 100644 --- a/src/components/scWorkflow/nodes/approver.vue +++ b/src/components/scWorkflow/nodes/approver.vue @@ -54,15 +54,15 @@ - 自选一个人 - 自选多个人 + 自选一个人 + 自选多个人 - 直到最上层主管 - 自定义审批终点 + 直到最上层主管 + 自定义审批终点

直到发起人的第 级主管

 @@ -77,17 +77,17 @@ - 自动通过 - 自动拒绝 + 自动通过 + 自动拒绝 -

按顺序依次审批

-

会签 (可同时审批，每个人必须审批通过)

-

或签 (有一人审批通过即可)

+

按顺序依次审批

+

会签 (可同时审批，每个人必须审批通过)

+

或签 (有一人审批通过即可)

 diff --git a/src/components/scWorkflow/nodes/branch.vue b/src/components/scWorkflow/nodes/branch.vue index 9da0b4a..7dbd59f 100644 --- a/src/components/scWorkflow/nodes/branch.vue +++ b/src/components/scWorkflow/nodes/branch.vue @@ -47,8 +47,8 @@ - 且 - 或 + 且 + 或 diff --git a/src/config/index.js b/src/config/index.js index e8ee480..c160bea 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -6,10 +6,10 @@ const DEFAULT_CONFIG = { DASHBOARD_URL: "/dashboard", //版本号 - APP_VER: "1.6.9", + APP_VER: "1.6.10", //内核版本号 - CORE_VER: "1.6.9", + CORE_VER: "1.6.10", //接口地址 API_URL: process.env.NODE_ENV === 'development' && process.env.VUE_APP_PROXY === 'true' ? "/api" : process.env.VUE_APP_API_BASEURL, diff --git a/src/locales/index.js b/src/locales/index.js index fbcad54..97c53b7 100644 --- a/src/locales/index.js +++ b/src/locales/index.js @@ -1,8 +1,8 @@ import sysConfig from "@/config" import tool from '@/utils/tool' import { createI18n } from 'vue-i18n' -import el_zh_cn from 'element-plus/lib/locale/lang/zh-cn' -import el_en from 'element-plus/lib/locale/lang/en' +import el_zh_cn from 'element-plus/es/locale/lang/zh-cn' +import el_en from 'element-plus/es/locale/lang/en' import zh_cn from './lang/zh-cn.js' import en from './lang/en.js' diff --git a/src/style/dark.scss b/src/style/dark.scss index e9cde49..d6f2bc7 100644 --- a/src/style/dark.scss +++ b/src/style/dark.scss @@ -1,4 +1,4 @@ -@import '~element-plus/theme-chalk/src/dark/css-vars.scss'; +@use '~element-plus/theme-chalk/src/dark/css-vars.scss'; html.dark { //变量 diff --git a/src/style/style.scss b/src/style/style.scss index 2ce45bb..9a3fc37 100644 --- a/src/style/style.scss +++ b/src/style/style.scss @@ -1,5 +1,5 @@ -@import 'app.scss'; -@import 'fix.scss'; -@import 'pages.scss'; -@import 'media.scss'; -@import 'dark.scss'; +@use 'app.scss'; +@use 'fix.scss'; +@use 'pages.scss'; +@use 'media.scss'; +@use 'dark.scss'; diff --git a/src/views/template/list/crud/save.vue b/src/views/template/list/crud/save.vue index 4f136d8..9d52a9a 100644 --- a/src/views/template/list/crud/save.vue +++ b/src/views/template/list/crud/save.vue @@ -6,8 +6,8 @@ - 男 - 女 + 男 + 女 -- Gitee From 79f83359dbfda90cf4bbf8c9f903f9a9313c3003 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E5=BD=AC?= Date: Wed, 8 Jan 2025 23:32:14 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]README.md=E4=B8=ADSCUI?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=8F=8A=E6=BC=94=E7=A4=BA=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index d5e80f3..09a3a3f 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,8 @@ SCUI的宗旨是 让一切复杂的东西傻瓜化。 | 类型 | 链接 | | -------- | -------- | -| 文档地址 | https://lolicode.gitee.io/scui-doc/ | -| 演示地址 | https://lolicode.gitee.io/scui-doc/demo/#/login | +| 文档地址 | [http://scui.ui.xn--48s.net/](http://scui.ui.xn--48s.net/) | +| 演示地址 | [http://scui.ui.xn--48s.net/demo/#/login](http://scui.ui.xn--48s.net/demo/#/login) | @@ -54,7 +54,7 @@ SCUI的宗旨是 让一切复杂的东西傻瓜化。 ## 安装教程 ``` sh # 克隆项目 -git clone https://gitee.com/lolicode/scui.git +git clone https://gitee.com/momayun_1_0/scui.git # 进入项目目录 cd scui -- Gitee From efaa2f75e57f14583459238d1d1df7b75a0905b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E5=BD=AC?= Date: Wed, 8 Jan 2025 23:36:58 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]README.md=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E5=9C=B0=E5=9D=80=E5=9F=9F=E5=90=8D=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E4=B8=AD=E6=96=87=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 09a3a3f..0e1f228 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,8 @@ SCUI的宗旨是 让一切复杂的东西傻瓜化。 | 类型 | 链接 | | -------- | -------- | -| 文档地址 | [http://scui.ui.xn--48s.net/](http://scui.ui.xn--48s.net/) | -| 演示地址 | [http://scui.ui.xn--48s.net/demo/#/login](http://scui.ui.xn--48s.net/demo/#/login) | +| 文档地址 | [http://scui.ui.学.net/](http://scui.ui.学.net/) | +| 演示地址 | [http://scui.ui.学.net/demo/#/login](http://scui.ui.学.net/demo/#/login) | -- Gitee