Browse Source

更新依赖

ZaiZai 9 months ago
parent
commit
b40f0427f6

+ 4 - 4
package.json

@@ -17,8 +17,8 @@
         "crypto-js": "^4.2.0",
         "dayjs": "^1.11.11",
         "echarts": "^5.5.0",
-        "element-plus": "^2.7.3",
-        "hc-vue3-ui": "^3.9.7",
+        "element-plus": "^2.7.5",
+        "hc-vue3-ui": "^4.0.2",
         "js-base64": "^3.7.7",
         "js-cookie": "^3.0.5",
         "js-fast-way": "^0.5.0",
@@ -30,7 +30,7 @@
         "sortablejs": "^1.15.2",
         "split.js": "^1.6.5",
         "vue": "3.4.27",
-        "vue-router": "^4.3.2",
+        "vue-router": "^4.3.3",
         "vue-virtual-scroll-list": "^2.3.5",
         "vue-virtual-scroller": "^2.0.0-beta.8",
         "vuedraggable": "^4.1.0"
@@ -44,7 +44,7 @@
         "autoprefixer": "^10.4.19",
         "eslint": "^8.57.0",
         "eslint-plugin-vue": "^9.24.0",
-        "sass": "^1.77.2",
+        "sass": "^1.77.5",
         "unocss": "0.58.9",
         "unocss-preset-extra": "0.5.3",
         "vite": "^4.5.0"

File diff suppressed because it is too large
+ 0 - 0
public/plugins/element-plus/index.css


File diff suppressed because it is too large
+ 0 - 0
public/plugins/element-plus/theme-chalk/el-dropdown.css


+ 1 - 1
public/plugins/element-plus/theme-chalk/el-option-group.css

@@ -1 +1 @@
-.el-select-group{margin:0;padding:0}.el-select-group__wrap{list-style:none;margin:0;padding:0;position:relative}.el-select-group__wrap:not(:last-of-type){padding-bottom:24px}.el-select-group__wrap:not(:last-of-type):after{background:var(--el-border-color-light);bottom:12px;content:"";display:block;height:1px;left:20px;position:absolute;right:20px}.el-select-group__split-dash{background:var(--el-border-color-light);height:1px;left:20px;position:absolute;right:20px}.el-select-group__title{color:var(--el-color-info);font-size:12px;line-height:30px;padding-left:20px}.el-select-group .el-select-dropdown__item{padding-left:20px}
+.el-select-group{margin:0;padding:0}.el-select-group__wrap{list-style:none;margin:0;padding:0;position:relative}.el-select-group__title{color:var(--el-color-info);font-size:12px;line-height:34px;padding-left:20px}.el-select-group .el-select-dropdown__item{padding-left:20px}

File diff suppressed because it is too large
+ 0 - 0
public/plugins/element-plus/theme-chalk/el-select-v2.css


File diff suppressed because it is too large
+ 0 - 0
public/plugins/element-plus/theme-chalk/el-select.css


File diff suppressed because it is too large
+ 0 - 0
public/plugins/element-plus/theme-chalk/el-table.css


File diff suppressed because it is too large
+ 0 - 0
public/plugins/element-plus/theme-chalk/el-tour.css


+ 1 - 1
public/plugins/element-plus/theme-chalk/el-tree-select.css

@@ -1 +1 @@
-.el-tree-select{--el-tree-node-content-height:26px;--el-tree-node-hover-bg-color:var(--el-fill-color-light);--el-tree-text-color:var(--el-text-color-regular);--el-tree-expand-icon-color:var(--el-text-color-placeholder)}.el-tree-select__popper .el-tree-node__expand-icon{margin-left:8px}.el-tree-select__popper .el-tree-node.is-checked>.el-tree-node__content .el-select-dropdown__item.selected:after{content:none}.el-tree-select__popper .el-select-dropdown__item{background:transparent!important;flex:1;height:20px;line-height:20px;padding-left:0}
+.el-tree-select{--el-tree-node-content-height:26px;--el-tree-node-hover-bg-color:var(--el-fill-color-light);--el-tree-text-color:var(--el-text-color-regular);--el-tree-expand-icon-color:var(--el-text-color-placeholder)}.el-tree-select__popper .el-tree-node__expand-icon{margin-left:8px}.el-tree-select__popper .el-tree-node.is-checked>.el-tree-node__content .el-select-dropdown__item.selected:after{content:none}.el-tree-select__popper .el-select-dropdown__list>.el-select-dropdown__item{padding-left:32px}.el-tree-select__popper .el-select-dropdown__item{background:transparent!important;flex:1;height:20px;line-height:20px;padding-left:0}

File diff suppressed because it is too large
+ 0 - 0
public/plugins/element-plus/theme-chalk/index.css


+ 1 - 1
public/plugins/element-plus/theme-chalk/src/common/var.scss

@@ -429,7 +429,7 @@ $select-group: () !default;
 $select-group: map.merge(
   (
     'text-color': getCssVar('color-info'),
-    'height': 30px,
+    'height': 34px,
     'font-size': 12px,
   ),
   $select-group

+ 1 - 0
public/plugins/element-plus/theme-chalk/src/dropdown.scss

@@ -169,6 +169,7 @@ $dropdown-menu-padding-vertical: map.merge(
     color: getCssVar('text-color', 'regular');
     cursor: pointer;
     outline: none;
+    &:not(.is-disabled):hover,
     &:not(.is-disabled):focus {
       background-color: getCssVar('dropdown-menuItem-hover-fill');
       color: getCssVar('dropdown-menuItem-hover-color');

+ 0 - 25
public/plugins/element-plus/theme-chalk/src/option-group.scss

@@ -14,31 +14,6 @@
     list-style: none;
     margin: 0;
     padding: 0;
-
-    &:not(:last-of-type) {
-      padding-bottom: 24px;
-
-      &::after {
-        content: '';
-        position: absolute;
-        display: block;
-        left: $gap;
-        right: $gap;
-        bottom: 12px;
-        height: 1px;
-        background: getCssVar('border-color-light');
-      }
-    }
-  }
-
-  @include e(split) {
-    &-dash {
-      position: absolute;
-      left: $gap;
-      right: $gap;
-      height: 1px;
-      background: getCssVar('border-color-light');
-    }
   }
 
   @include e(title) {

+ 1 - 1
public/plugins/element-plus/theme-chalk/src/segmented.scss

@@ -29,7 +29,7 @@ $segmented-item-padding: () !default;
 $segmented-item-padding: map.merge(
   (
     'large': 0 11px,
-    'default':0 11px,
+    'default': 0 11px,
     'small': 0 7px,
   ),
   $segmented-item-padding

+ 0 - 1
public/plugins/element-plus/theme-chalk/src/table.scss

@@ -217,7 +217,6 @@
   }
 
   th.#{$namespace}-table__cell {
-    user-select: none;
     background-color: getCssVar('table-header-bg-color');
 
     > .cell.highlight {

+ 1 - 0
public/plugins/element-plus/theme-chalk/src/tour.scss

@@ -19,6 +19,7 @@
     box-shadow: getCssVar('box-shadow-light');
     box-sizing: border-box;
     overflow-wrap: break-word;
+    outline: none;
 
     $content-selector: &;
 

+ 5 - 0
public/plugins/element-plus/theme-chalk/src/tree-select.scss

@@ -20,6 +20,11 @@
       content: none;
     }
 
+    .#{$namespace}-select-dropdown__list
+      > .#{$namespace}-select-dropdown__item {
+      padding-left: 32px;
+    }
+
     .#{$namespace}-select-dropdown__item {
       flex: 1;
       background: transparent !important;

+ 0 - 0
public/plugins/element-plus/v2.7.2 → public/plugins/element-plus/v2.7.5


+ 1 - 1
public/version.json

@@ -1,3 +1,3 @@
 {
-  "value": "20240507170348"
+  "value": "20240604105810"
 }

+ 7 - 3
src/api/request/index.js

@@ -16,19 +16,23 @@ export const HcApi = async (obj, msg) => {
         obj.headers['Tenant-Id'] = obj.headers['Tenant-Id'] ?? store.tenantId
         //发起请求
         httpApi(obj).then((response) => {
-            //console.log(response)
+            if (response.code !== 200) {
+                getResData(response, msg)
+            }
             resolve(response)
         }).catch((response) => {
-            getResData(response)
+            getResData(response, msg)
             resolve(response)
         })
     })
 }
 
 //处理数据
-const getResData = ({ code }) => {
+const getResData = ({ msg, code }, isMsg) => {
     if (code === 401) {
         window.$message?.error('身份失效,请重新登录!')
         router.push({ path: '/login-main' }).then()
+    } else if (isMsg) {
+        window.$message?.error(msg || '操作失败')
     }
 }

+ 16 - 16
yarn.lock

@@ -1524,10 +1524,10 @@ electron-to-chromium@^1.4.668:
   resolved "http://39.108.216.210:9000/electron-to-chromium/-/electron-to-chromium-1.4.682.tgz#27577b88ccccc810e09b05093345cf1830f1bd65"
   integrity sha512-oCglfs8yYKs9RQjJFOHonSnhikPK3y+0SvSYc/YpYJV//6rqc0/hbwd0c7vgK4vrl6y2gJAwjkhkSGWK+z4KRA==
 
-element-plus@^2.7.3:
-  version "2.7.3"
-  resolved "http://39.108.216.210:9000/element-plus/-/element-plus-2.7.3.tgz#2266af776927110ad0d347211acbd914159eda20"
-  integrity sha512-OaqY1kQ2xzNyRFyge3fzM7jqMwux+464RBEqd+ybRV9xPiGxtgnj/sVK4iEbnKnzQIa9XK03DOIFzoToUhu1DA==
+element-plus@^2.7.5:
+  version "2.7.5"
+  resolved "http://39.108.216.210:9000/element-plus/-/element-plus-2.7.5.tgz#b6b3101f8c2c61b083c78cae2d8728b93a85039e"
+  integrity sha512-e4oqhfRGBpdblgsjEBK+tA2+fg1H1KZ2Qinty1SaJl0X49FrMLK0lpXQNheWyBqI4V/pyjVOF9sRjz2hfyoctw==
   dependencies:
     "@ctrl/tinycolor" "^3.4.1"
     "@element-plus/icons-vue" "^2.3.1"
@@ -1951,10 +1951,10 @@ has-flag@^4.0.0:
   resolved "http://39.108.216.210:9000/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-hc-vue3-ui@^3.9.7:
-  version "3.9.7"
-  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-3.9.7.tgz#9f333e8f1c4380451d6b53b02b35bc427c568b0b"
-  integrity sha512-Mo8Dyq6jWzJ7HJCmO7B8jUhmEcY/VkjsTC9Xj9Vgixmoxcw/L8pyMyBAwy9QcfcopwRJ3DNWgwhybOPb7BTHRg==
+hc-vue3-ui@^4.0.2:
+  version "4.0.2"
+  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-4.0.2.tgz#7a08b8142ca4d81eac93a4442089de451d386758"
+  integrity sha512-QQ8LqheEtGvHYZAtS4byi6gaxLtI2mh02KXWFjCEdDmwpR+6uKJcAHViBTl/Bx8L7FRZe7dxzGaUhyU0IQ3HxA==
   dependencies:
     axios "^1.7.2"
     dayjs "^1.11.11"
@@ -2667,10 +2667,10 @@ safe-buffer@~5.2.0:
   resolved "http://39.108.216.210:9000/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-sass@^1.77.2:
-  version "1.77.2"
-  resolved "http://39.108.216.210:9000/sass/-/sass-1.77.2.tgz#18d4ed2eefc260cdc8099c5439ec1303fd5863aa"
-  integrity sha512-eb4GZt1C3avsX3heBNlrc7I09nyT00IUuo4eFhAbeXWU2fvA7oXI53SxODVAA+zgZCk9aunAZgO+losjR3fAwA==
+sass@^1.77.5:
+  version "1.77.5"
+  resolved "http://39.108.216.210:9000/sass/-/sass-1.77.5.tgz#5f9009820297521356e962c0bed13ee36710edfe"
+  integrity sha512-oDfX1mukIlxacPdQqNb6mV2tVCrnE+P3nVYioy72V5tlk56CPNcO4TCuFcaCRKKfJ1M3lH95CleRS+dVKL2qMg==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
@@ -3021,10 +3021,10 @@ vue-resize@^2.0.0-alpha.1:
   resolved "http://39.108.216.210:9000/vue-resize/-/vue-resize-2.0.0-alpha.1.tgz#43eeb79e74febe932b9b20c5c57e0ebc14e2df3a"
   integrity sha512-7+iqOueLU7uc9NrMfrzbG8hwMqchfVfSzpVlCMeJQe4pyibqyoifDNbKTZvwxZKDvGkB+PdFeKvnGZMoEb8esg==
 
-vue-router@^4.3.2:
-  version "4.3.2"
-  resolved "http://39.108.216.210:9000/vue-router/-/vue-router-4.3.2.tgz#08096c7765dacc6832f58e35f7a081a8b34116a7"
-  integrity sha512-hKQJ1vDAZ5LVkKEnHhmm1f9pMiWIBNGF5AwU67PdH7TyXCj/a4hTccuUuYCAMgJK6rO/NVYtQIEN3yL8CECa7Q==
+vue-router@^4.3.3:
+  version "4.3.3"
+  resolved "http://39.108.216.210:9000/vue-router/-/vue-router-4.3.3.tgz#7505509d429a36694b12ba1f6530016c5ce5f6bf"
+  integrity sha512-8Q+u+WP4N2SXY38FDcF2H1dUEbYVHVPtPCPZj/GTZx8RCbiB8AtJP9+YIxn4Vs0svMTNQcLIzka4GH7Utkx9xQ==
   dependencies:
     "@vue/devtools-api" "^6.5.1"
 

Some files were not shown because too many files changed in this diff