diff --git a/.env.development b/.env.development index aecdae7aa72ae131b53d081874966c0e127541c6..420cb093886e995aeac71dc26da423d2b6307125 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://apifoxmock.com/m1/4021385-0-default/api # 本地端口 VUE_APP_PORT = 2800 diff --git a/.env.production b/.env.production index 900739ddc71551e06243fc2e794111e1b422a30d..efa19d2060f2dfde017db3b45855ce9226a82873 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://apifoxmock.com/m1/4021385-0-default/api \ No newline at end of file diff --git a/README.md b/README.md index d5e80f34b41fe9471ba491319d9ab3214bb20f5e..0e1f22860c68959f82b28d7d7fa522367c616247 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.学.net/](http://scui.ui.学.net/) | +| 演示地址 | [http://scui.ui.学.net/demo/#/login](http://scui.ui.学.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 diff --git a/package.json b/package.json index f68291359052441685214fb187518e545220c5c2..77900ab1a4c87a5094a076c034d25f6b107baf07 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 ed73c22b3b050b30ece40380de40867b6440054f..c110ae0be03755a581670c882ba73bbcb53a1868 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 146acdf95757a0f1e2eb01eb44261c26bdd31d5e..3e74f549a2d888e80841894311a8a445e14618ae 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 2dc2db7e91697dc764b207095b95cf7d5a585482..2ec451aee687edb673ef20e6a7fcfb8ce58b9e26 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 772a7cc397bfb537ce3f0bf2967fb7b1035d4f1e..04c27d7c80996779bcb8d8fe9e12373fce767e2e 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 4752c30e6a8f5e4aabeb21e9a0d051fe07851b89..6427276ffaf44dc7a13f923649dad108231685d5 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 9da0b4aae047f820be87623f193808e5952582df..7dbd59fe3425dbca1c1a12c454821b6854aed394 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 e8ee4809dd657ed78f7d0f0066938d9b6a79d702..c160bea9c929972933be9cadc5a050c8421ba7a9 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 fbcad54a1e29f6f42bcf82b65f7ff90d401aa1bd..97c53b7c21621c94cd125b4e18015ccb772a77c2 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 e9cde490f9351bd359ebbb225e7b2bc95aea29ff..d6f2bc7d2f1712843a07a5e81c8d3bdefcaf2efa 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 2ce45bb49fe8f91f7db01307d0c2ace448c9f5f0..9a3fc37a08a297a49df0ac553d042d1669292597 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 4f136d80fdedeaa155a73b8eb001d16f6036b7dd..9d52a9a15bbddb60c622a34cf77977acdee5fef7 100644 --- a/src/views/template/list/crud/save.vue +++ b/src/views/template/list/crud/save.vue @@ -6,8 +6,8 @@ - - + +