更新依赖

package.json

@@ -21,14 +21,14 @@
         "crypto-js": "^4.2.0",
         "dayjs": "^1.11.13",
         "echarts": "^5.5.1",
-        "element-plus": "2.8.7",
+        "element-plus": "2.8.8",
         "hc-vue3-ui": "^4.4.3",
         "js-base64": "^3.7.7",
-        "js-fast-way": "^0.5.6",
+        "js-fast-way": "^0.5.7",
         "js-md5": "^0.8.3",
         "nprogress": "^0.2.0",
         "pinia": "^2.2.6",
-        "vue": "3.5.12",
+        "vue": "3.5.13",
         "vue-router": "^4.4.5",
         "vuedraggable": "^4.1.0"
     },
@@ -36,9 +36,9 @@
         "@iconify-json/iconoir": "^1.2.4",
         "@iconify-json/ri": "^1.2.3",
         "@unocss/eslint-config": "^0.58.9",
-        "@vitejs/plugin-vue": "^5.1.5",
+        "@vitejs/plugin-vue": "^5.2.0",
         "@vojtechlanka/vue-tags-input": "^3",
-        "@vue/compiler-sfc": "^3.5.12",
+        "@vue/compiler-sfc": "^3.5.13",
         "archiver": "^7.0.1",
         "bignumber.js": "^9.1.2",
         "eslint": "^8.56.0",

public/plugins/element-plus/theme-chalk/src/mixins/mixins.scss

@@ -6,7 +6,10 @@
 @forward '_var';
 @use 'config' as *;
 @use 'sass:string';
-@use "sass:map";
+@use 'sass:map';
+
+$B: null;
+$E: null;
 
 // Break-points
 @mixin res($key, $map: $breakpoints) {

src/views/project/list/edit-formula.vue

@@ -370,8 +370,8 @@
 import { computed, nextTick, ref, watch } from 'vue'
 import { useClick } from 'hc-vue3-ui'
 import {
-    arrIndex, deepClone, getArrValue, getObjVal, getObjValue,
-    getRandom, isArray, isNullES, isString,
+    arrIndex, deepClone, getArrValue, getObjVal,
+    getObjValue, getRandom, isArray, isNullES, isString,
 } from 'js-fast-way'
 import { ElMessageBox } from 'element-plus'
 import { VueTagsInput } from '@vojtechlanka/vue-tags-input'
@@ -557,7 +557,8 @@ const getTypeMapApi = async () => {
 }
 
 //菜单被选择
-const handleFormulaMenu = (index, path) => {
+const equationSelectEleCopy = ref({})
+const handleFormulaMenu = async (index, path) => {
     if (isResetFun.value) {
         //重置函数
         if (path[0] !== '基础运算') {
@@ -573,19 +574,21 @@ const handleFormulaMenu = (index, path) => {
             console.error(e)
         }
     } else {
-        equationSelect(path)
+       await equationSelect(path)
+        //深拷贝数据
+        equationSelectEleCopy.value = deepClone(equationSelectEle.value)
+        console.log(equationSelectEleCopy.value)
     }
 }
 
 //在等式模式下点选计算式
 const equationSelectIndex = ref(-1)
-const equationSelect = (path) => {
+const equationSelect = async (path) => {
     const selectEle = getObjVal(equationSelectEle.value)
     if (!selectEle || !['Element', 'ParamData'].includes(selectEle.type)) {
         window?.$message.warning('请先选中元素')
         return
     }
-    console.log(selectEle)
     let obj = {}
     try {
         const index = Number(path[1].split('-')[1]) - 1
@@ -618,7 +621,6 @@ const equationSelect = (path) => {
     let tg = obj.template.args.findIndex(x => x.m !== '常量')
     obj.arguments[tg] = ele
     equationSelectEle.value.children.push(obj)
-    console.log(equationSelectEle.value.children)
     //跳转到最新的标签
     equationSelectIndex.value = equationSelectEle.value.children.length - 1
 }
@@ -1355,9 +1357,10 @@ const selectingElements = (item, indexs) => {
 
 //当前元素
 const setCurElement = (item, index, indexs) => {
-    let tmp = deepClone(equationSelectEle.value)
-    tmp['tableElementKey'] = tmp['tableElementKey'].replace('_key', ':key')
-    item.arguments[indexs] = tmp.children[index].arguments[indexs]
+    let tmp = deepClone(equationSelectEleCopy.value)
+    console.log(tmp)
+    //tmp['tableElementKey'] = tmp['tableElementKey'].replace('_key', ':key')
+    //item.arguments[indexs] = tmp.children[index].arguments[indexs]
 }
 
 //保存

yarn.lock

@@ -1074,10 +1074,10 @@
     fast-glob "^3.3.2"
     magic-string "^0.30.8"
 
-"@vitejs/plugin-vue@^5.1.5":
-  version "5.1.5"
-  resolved "http://39.108.216.210:9000/@vitejs/plugin-vue/-/plugin-vue-5.1.5.tgz#ef1d7e19f8cecb0d1301c987dc0bdf8b778e3c82"
-  integrity sha512-dlnib73G05CDBAUR/YpuZcQQ47fpjihnnNouAAqN62z+oqSsWJ+kh52GRzIxpkgFG3q11eXK7Di7RMmoCwISZA==
+"@vitejs/plugin-vue@^5.2.0":
+  version "5.2.0"
+  resolved "http://39.108.216.210:9000/@vitejs/plugin-vue/-/plugin-vue-5.2.0.tgz#994f3b4f12d3590c5a6895df4cbd270d9a6d5e17"
+  integrity sha512-7n7KdUEtx/7Yl7I/WVAMZ1bEb0eVvXF3ummWTeLcs/9gvo9pJhuLdouSXGjdZ/MKD1acf1I272+X0RMua4/R3g==
 
 "@vojtechlanka/vue-tags-input@^3":
   version "3.1.1"
@@ -1099,6 +1099,17 @@
     estree-walker "^2.0.2"
     source-map-js "^1.2.0"
 
+"@vue/compiler-core@3.5.13":
+  version "3.5.13"
+  resolved "http://39.108.216.210:9000/@vue/compiler-core/-/compiler-core-3.5.13.tgz#b0ae6c4347f60c03e849a05d34e5bf747c9bda05"
+  integrity sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==
+  dependencies:
+    "@babel/parser" "^7.25.3"
+    "@vue/shared" "3.5.13"
+    entities "^4.5.0"
+    estree-walker "^2.0.2"
+    source-map-js "^1.2.0"
+
 "@vue/compiler-dom@3.5.12":
   version "3.5.12"
   resolved "http://39.108.216.210:9000/@vue/compiler-dom/-/compiler-dom-3.5.12.tgz#456d631d11102535b7ee6fd954cf2c93158d0354"
@@ -1107,7 +1118,15 @@
     "@vue/compiler-core" "3.5.12"
     "@vue/shared" "3.5.12"
 
-"@vue/compiler-sfc@3.5.12", "@vue/compiler-sfc@^3.5.12":
+"@vue/compiler-dom@3.5.13":
+  version "3.5.13"
+  resolved "http://39.108.216.210:9000/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz#bb1b8758dbc542b3658dda973b98a1c9311a8a58"
+  integrity sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==
+  dependencies:
+    "@vue/compiler-core" "3.5.13"
+    "@vue/shared" "3.5.13"
+
+"@vue/compiler-sfc@3.5.12":
   version "3.5.12"
   resolved "http://39.108.216.210:9000/@vue/compiler-sfc/-/compiler-sfc-3.5.12.tgz#6688120d905fcf22f7e44d3cb90f8dabc4dd3cc8"
   integrity sha512-2k973OGo2JuAa5+ZlekuQJtitI5CgLMOwgl94BzMCsKZCX/xiqzJYzapl4opFogKHqwJk34vfsaKpfEhd1k5nw==
@@ -1122,6 +1141,21 @@
     postcss "^8.4.47"
     source-map-js "^1.2.0"
 
+"@vue/compiler-sfc@3.5.13", "@vue/compiler-sfc@^3.5.13":
+  version "3.5.13"
+  resolved "http://39.108.216.210:9000/@vue/compiler-sfc/-/compiler-sfc-3.5.13.tgz#461f8bd343b5c06fac4189c4fef8af32dea82b46"
+  integrity sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==
+  dependencies:
+    "@babel/parser" "^7.25.3"
+    "@vue/compiler-core" "3.5.13"
+    "@vue/compiler-dom" "3.5.13"
+    "@vue/compiler-ssr" "3.5.13"
+    "@vue/shared" "3.5.13"
+    estree-walker "^2.0.2"
+    magic-string "^0.30.11"
+    postcss "^8.4.48"
+    source-map-js "^1.2.0"
+
 "@vue/compiler-ssr@3.5.12":
   version "3.5.12"
   resolved "http://39.108.216.210:9000/@vue/compiler-ssr/-/compiler-ssr-3.5.12.tgz#5f1a3fbd5c44b79a6dbe88729f7801d9c9218bde"
@@ -1130,6 +1164,14 @@
     "@vue/compiler-dom" "3.5.12"
     "@vue/shared" "3.5.12"
 
+"@vue/compiler-ssr@3.5.13":
+  version "3.5.13"
+  resolved "http://39.108.216.210:9000/@vue/compiler-ssr/-/compiler-ssr-3.5.13.tgz#e771adcca6d3d000f91a4277c972a996d07f43ba"
+  integrity sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==
+  dependencies:
+    "@vue/compiler-dom" "3.5.13"
+    "@vue/shared" "3.5.13"
+
 "@vue/devtools-api@^6.6.3":
   version "6.6.3"
   resolved "http://39.108.216.210:9000/@vue/devtools-api/-/devtools-api-6.6.3.tgz#b23a588154cba8986bba82b6e1d0248bde3fd1a0"
@@ -1147,6 +1189,13 @@
   dependencies:
     "@vue/shared" "3.5.12"
 
+"@vue/reactivity@3.5.13":
+  version "3.5.13"
+  resolved "http://39.108.216.210:9000/@vue/reactivity/-/reactivity-3.5.13.tgz#b41ff2bb865e093899a22219f5b25f97b6fe155f"
+  integrity sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==
+  dependencies:
+    "@vue/shared" "3.5.13"
+
 "@vue/runtime-core@3.5.12":
   version "3.5.12"
   resolved "http://39.108.216.210:9000/@vue/runtime-core/-/runtime-core-3.5.12.tgz#849207f203d0fd82971f19574d30dbe7134c78c7"
@@ -1155,6 +1204,14 @@
     "@vue/reactivity" "3.5.12"
     "@vue/shared" "3.5.12"
 
+"@vue/runtime-core@3.5.13":
+  version "3.5.13"
+  resolved "http://39.108.216.210:9000/@vue/runtime-core/-/runtime-core-3.5.13.tgz#1fafa4bf0b97af0ebdd9dbfe98cd630da363a455"
+  integrity sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==
+  dependencies:
+    "@vue/reactivity" "3.5.13"
+    "@vue/shared" "3.5.13"
+
 "@vue/runtime-dom@3.5.12":
   version "3.5.12"
   resolved "http://39.108.216.210:9000/@vue/runtime-dom/-/runtime-dom-3.5.12.tgz#6d4de3df49a90a460b311b1100baa5e2d0d1c8c9"
@@ -1165,6 +1222,16 @@
     "@vue/shared" "3.5.12"
     csstype "^3.1.3"
 
+"@vue/runtime-dom@3.5.13":
+  version "3.5.13"
+  resolved "http://39.108.216.210:9000/@vue/runtime-dom/-/runtime-dom-3.5.13.tgz#610fc795de9246300e8ae8865930d534e1246215"
+  integrity sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==
+  dependencies:
+    "@vue/reactivity" "3.5.13"
+    "@vue/runtime-core" "3.5.13"
+    "@vue/shared" "3.5.13"
+    csstype "^3.1.3"
+
 "@vue/server-renderer@3.5.12":
   version "3.5.12"
   resolved "http://39.108.216.210:9000/@vue/server-renderer/-/server-renderer-3.5.12.tgz#79c6bc3860e4e4ef80d85653c5d03fd94b26574e"
@@ -1173,11 +1240,24 @@
     "@vue/compiler-ssr" "3.5.12"
     "@vue/shared" "3.5.12"
 
+"@vue/server-renderer@3.5.13":
+  version "3.5.13"
+  resolved "http://39.108.216.210:9000/@vue/server-renderer/-/server-renderer-3.5.13.tgz#429ead62ee51de789646c22efe908e489aad46f7"
+  integrity sha512-wAi4IRJV/2SAW3htkTlB+dHeRmpTiVIK1OGLWV1yeStVSebSQQOwGwIq0D3ZIoBj2C2qpgz5+vX9iEBkTdk5YA==
+  dependencies:
+    "@vue/compiler-ssr" "3.5.13"
+    "@vue/shared" "3.5.13"
+
 "@vue/shared@3.5.12":
   version "3.5.12"
   resolved "http://39.108.216.210:9000/@vue/shared/-/shared-3.5.12.tgz#f9e45b7f63f2c3f40d84237b1194b7f67de192e3"
   integrity sha512-L2RPSAwUFbgZH20etwrXyVyCBu9OxRSi8T/38QsvnkJyvq2LufW2lDCOzm7t/U9C1mkhJGWYfCuFBCmIuNivrg==
 
+"@vue/shared@3.5.13":
+  version "3.5.13"
+  resolved "http://39.108.216.210:9000/@vue/shared/-/shared-3.5.13.tgz#87b309a6379c22b926e696893237826f64339b6f"
+  integrity sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==
+
 "@vueuse/core@^9.1.0":
   version "9.13.0"
   resolved "http://39.108.216.210:9000/@vueuse/core/-/core-9.13.0.tgz#2f69e66d1905c1e4eebc249a01759cf88ea00cf4"
@@ -1580,11 +1660,6 @@ dayjs@^1.11.13:
   resolved "http://39.108.216.210:9000/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c"
   integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==
 
-dayjs@^1.11.3:
-  version "1.11.10"
-  resolved "http://39.108.216.210:9000/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0"
-  integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==
-
 debug@^4.1.0, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
   version "4.3.4"
   resolved "http://39.108.216.210:9000/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
@@ -1649,10 +1724,10 @@ electron-to-chromium@^1.4.668:
   resolved "http://39.108.216.210:9000/electron-to-chromium/-/electron-to-chromium-1.4.685.tgz#3ce988e4dfbb3aa984840394b1d7064c01ad74c1"
   integrity sha512-yDYeobbTEe4TNooEzOQO6xFqg9XnAkVy2Lod1C1B2it8u47JNLYvl9nLDWBamqUakWB8Jc1hhS1uHUNYTNQdfw==
 
-element-plus@2.8.7:
-  version "2.8.7"
-  resolved "http://39.108.216.210:9000/element-plus/-/element-plus-2.8.7.tgz#34770466c65ec2089cf1db805b432f479910fb51"
-  integrity sha512-oGQyFRufFOgjd872tZc+T4xQAYLlX4hj6d3ixeY13L4fFNUuc1N49JHAqJGPda0tdx3qCnjceZoh1kqqj2+tXQ==
+element-plus@2.8.8:
+  version "2.8.8"
+  resolved "http://39.108.216.210:9000/element-plus/-/element-plus-2.8.8.tgz#3f32377f40fa8878e81ae34aed035fdedbcbe128"
+  integrity sha512-MLAH1x2PGTnOT7Iwqh9ASgfZhvgqQqrdbxuJH0w2fGjzE4ZjryyLQj24HXoQO7Zon66U3lrYxbdLI57M6OX0qw==
   dependencies:
     "@ctrl/tinycolor" "^3.4.1"
     "@element-plus/icons-vue" "^2.3.1"
@@ -1662,7 +1737,7 @@ element-plus@2.8.7:
     "@types/lodash-es" "^4.17.6"
     "@vueuse/core" "^9.1.0"
     async-validator "^4.2.5"
-    dayjs "^1.11.3"
+    dayjs "^1.11.13"
     escape-html "^1.0.3"
     lodash "^4.17.21"
     lodash-es "^4.17.21"
@@ -2205,6 +2280,11 @@ js-fast-way@^0.5.6:
   resolved "http://39.108.216.210:9000/js-fast-way/-/js-fast-way-0.5.6.tgz#58bbb5621f60543bde37df9308a633410d87f473"
   integrity sha512-r1BH7xAU4R5vR4LzA2VLK9slgtN5VjCA65UJZN81QUZFNCr7vY9EMrF55gJzJ5O3sQOXbczDxPWwl2Xi8XoUNw==
 
+js-fast-way@^0.5.7:
+  version "0.5.7"
+  resolved "http://39.108.216.210:9000/js-fast-way/-/js-fast-way-0.5.7.tgz#d5095a80a5a8b5a5d9e28c7339961d2482aea658"
+  integrity sha512-OI3Pyq+jXQY/CL5Slk+E4gKsHPHIFxX2Pzd25ZrMeGt+qMpnPA5qTsHk2QKjgDPEPqY21ui6/BCSFQ59kBUfZg==
+
 js-md5@^0.8.3:
   version "0.8.3"
   resolved "http://39.108.216.210:9000/js-md5/-/js-md5-0.8.3.tgz#921bab7efa95bfc9d62b87ee08a57f8fe4305b69"
@@ -2603,6 +2683,11 @@ picocolors@^1.1.0:
   resolved "http://39.108.216.210:9000/picocolors/-/picocolors-1.1.0.tgz#5358b76a78cde483ba5cef6a9dc9671440b27d59"
   integrity sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==
 
+picocolors@^1.1.1:
+  version "1.1.1"
+  resolved "http://39.108.216.210:9000/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
+  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
+
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   version "2.3.1"
   resolved "http://39.108.216.210:9000/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
@@ -2660,6 +2745,15 @@ postcss@^8.4.47:
     picocolors "^1.1.0"
     source-map-js "^1.2.1"
 
+postcss@^8.4.48:
+  version "8.4.49"
+  resolved "http://39.108.216.210:9000/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19"
+  integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
+  dependencies:
+    nanoid "^3.3.7"
+    picocolors "^1.1.1"
+    source-map-js "^1.2.1"
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "http://39.108.216.210:9000/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -3182,6 +3276,17 @@ vue@3.5.12, vue@3.x:
     "@vue/server-renderer" "3.5.12"
     "@vue/shared" "3.5.12"
 
+vue@3.5.13:
+  version "3.5.13"
+  resolved "http://39.108.216.210:9000/vue/-/vue-3.5.13.tgz#9f760a1a982b09c0c04a867903fc339c9f29ec0a"
+  integrity sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==
+  dependencies:
+    "@vue/compiler-dom" "3.5.13"
+    "@vue/compiler-sfc" "3.5.13"
+    "@vue/runtime-dom" "3.5.13"
+    "@vue/server-renderer" "3.5.13"
+    "@vue/shared" "3.5.13"
+
 vuedraggable@^4.1.0:
   version "4.1.0"
   resolved "http://39.108.216.210:9000/vuedraggable/-/vuedraggable-4.1.0.tgz#edece68adb8a4d9e06accff9dfc9040e66852270"