更新依赖

package.json

@@ -18,7 +18,7 @@
         "dayjs": "^1.11.9",
         "echarts": "^5.4.3",
         "element-plus": "2.3.9",
-        "hc-vue3-ui": "^1.8.2",
+        "hc-vue3-ui": "^1.8.5",
         "js-base64": "^3.7.5",
         "js-fast-way": "0.2.5",
         "js-md5": "^0.7.3",
@@ -26,7 +26,7 @@
         "nprogress": "^0.2.0",
         "pinia": "^2.1.6",
         "split.js": "^1.6.5",
-        "vue": "^3.3.4",
+        "vue": "3.3.2",
         "vue-router": "^4.2.4",
         "vuedraggable": "^4.1.0"
     },

src/api/request/httpApi.js

@@ -26,7 +26,7 @@ const getResData = async (response, error = false) => {
         const httpData = {
             response, res: data, data: resData?.data,
             code: resData?.code, msg: resData?.msg, status: response?.status,
-            disposition: headers['content-disposition'],
+            headers: headers, disposition: getDisposition(headers),
             message: getMsgVal(response), error: error,
         }
         //处理延迟响应
@@ -60,3 +60,12 @@ const getMsgVal = (response) => {
         return msg || error_description || '未知错误'
     }
 }
+
+//响应头中获取content-disposition
+const getDisposition = (headers) => {
+    try {
+        return headers['content-disposition']
+    } catch {
+        return ''
+    }
+}

src/components/message/index.vue

@@ -59,11 +59,11 @@ const texts = ref(props.text)
     .title {
         position: relative;
         font-size: 20px;
-        color: #101010;
+        color: var(--hc-text-color);
         margin-bottom: 20px;
     }
     .text {
-        color: #878a99;
+        color: var(--hc-label-color);
         font-size: 14px;
         margin-bottom: 10px;
     }

src/config/index.json

@@ -1,6 +1,6 @@
 {
     "version": "20230607160059",
-    "target": "http://192.168.0.109:8090",
+    "target": "http://47.110.251.215:8090",
     "smsPhone": "",
     "vite": {
         "port": 5174,

src/styles/view/login.dark.scss

@@ -1,6 +1,7 @@
 html.dark {
     .login-body {
         color-scheme: light;
+        --el-input-text-color: #000000;
         --el-color-white: #ffffff;
         --el-color-black: #000000;
         --el-color-success: #67c23a;

src/views/data-fill/collapse-form/formula.vue

@@ -19,7 +19,7 @@
 <script setup>
 import { onMounted, ref, watch } from 'vue'
 import wbsApi from '~api/data-fill/wbs'
-import { getObjVal } from 'js-fast-way'
+import { getObjValue } from 'js-fast-way'
 
 const props = defineProps({
     projectId: [String, Number],
@@ -76,32 +76,29 @@ const formulaModalinfo = ref({
 const getPanel = async () => {
     const pkeyIds = pkey_id.value
     if (pkeyIds) {
-        const { error, code, data } = await wbsApi.queryPanel({
+        const { data } = await wbsApi.queryPanel({
             key: key_name.value,
             contractId: contractId.value,
             parentId: formparent_id.value,
             pkeyId: pkeyIds,
         }, false)
-        if (!error && code === 200) {
-            componentDetail.value = getObjVal(data)
-            formulaModalinfo.value.type = componentDetail?.value.info?.data || ''
-        } else {
-            componentDetail.value = []
-        }
+        const res = getObjValue(data)
+        componentDetail.value = res
+        formulaModalinfo.value.type = res?.info?.data ?? ''
     } else {
         window?.$message?.warning('pkeyId为空')
     }
 }
 
 const panelSave = async () => {
-    const { res, error, code } = await wbsApi.savePanel({
+    const { error, code } = await wbsApi.savePanel({
         parentId: formparent_id.value,
         key: key_name.value,
         contractId: contractId.value,
-        value: formulaModalinfo?.value?.type,
+        value: formulaModalinfo.value?.type,
         pkeyId: pkey_id.value,
-        scope: componentDetail?.value['scope'],
-        code: componentDetail?.value?.info['code'],
+        scope: componentDetail.value?.scope,
+        code: componentDetail.value?.info?.code,
     })
     if (!error && code === 200) {
         window?.$message?.success('操作成功')

src/views/data-fill/collapse-form/index.vue

@@ -307,7 +307,7 @@
     <!-- 公式参数配置 -->
     <HcDialog
         :loading="formulaModalLoading" :show="formulaModal" is-to-body save-text="保存" title="公式参数配置"
-        widths="84%" @close="formulaModalClose"
+        widths="340px" @close="formulaModalClose"
         @save="formulaSaveClick"
     >
         <HcFormula
@@ -318,7 +318,7 @@
     </HcDialog>
 
     <!-- 查看表单 -->
-    <template v-for="(item, index) in DragModalTableForm">
+    <template v-for="(item, index) in DragModalTableForm" :key="index">
         <HcDragModal
             :close-icon-arr="closeIconArr" :eid="item.pkeyId" :height="DragModalHeight" :is-show="item.isShow"
             :loading="item.loading" :loading-text="item.loadingText" :title="item.title"
@@ -683,8 +683,8 @@ const handleMenuSelect = async ({ key }) => {
                 done()
             }
         })
-        
-     
+
+
     }
 }
 
@@ -725,8 +725,7 @@ const designModalSave = async () => {
                     itemFormData[key] = data[key]
                 })
                 refs?.setFormData(itemFormData)
-            } catch {
-            }
+            } catch { /* empty */ }
             designModalLoading.value = false
             designModal.value = false
         } else {
@@ -767,6 +766,7 @@ const specialNodeClick = async () => {
     try {
         const refs = await getFormRef(pkeyId)
         const itemFormData = refs?.getFormData()
+        // eslint-disable-next-line no-unsafe-optional-chaining
         const { code, val, posVal } = await specialRef.value?.getSpecialNode(itemNode, itemFormData[KeyName])
         if (code === 200 && val) {
             itemFormData[KeyName] = val
@@ -823,6 +823,7 @@ const submitinsertData = async () => {
     try {
         const refs = await getFormRef(pkeyId)
         const itemFormData = refs?.getFormData()
+        // eslint-disable-next-line no-unsafe-optional-chaining
         const { code, val, posVal } = await insertDataRef.value?.submitinsertData(itemNode, itemFormData[KeyName])
         if (code === 200 && val) {
             itemFormData[KeyName] = val
@@ -1278,9 +1279,12 @@ const setDragModalLoading = (dragItem, text = '保存中...', show = false) => {
 
 //获取表单的ref
 const getFormRef = async (pkeyId) => {
-    const itemRef = itemRefs.value
+    const itemRef = getArrValue(itemRefs.value)
+    if (itemRef.length <= 0) return ''
     const index = arrIndex(itemRef, 'pkeyId', pkeyId)
-    return itemRef[index].ref
+    if (index === -1) return ''
+    const obj = getObjValue(itemRef[index])
+    return obj?.ref
 }
 
 //删除打开的窗口

src/views/data-fill/query.vue

@@ -364,7 +364,7 @@ const treeLoadNode = async ({ node, item, level }, resolve) => {
         // classifyType: contractTypeTabKey.value,
          classifyType: classType.value,
          tableOwner:contractTypeTabKey.value,
-        
+
     })
     resolve(getArrValue(data))
 }

src/views/data-fill/wbs.vue

@@ -776,7 +776,7 @@ watch(() => [
     if (search.length == 0) {
         isSearchTree.value = false
     }
-    
+
 })
 
 //加载树需要的classType
@@ -791,7 +791,7 @@ watch(() => [
             isShowLeft.value = true
         }, 500)
  }
-    
+
 })
 //渲染完成
 onMounted(() => {
@@ -1893,7 +1893,7 @@ const getAttachmentList = async ()=>{
     attachmentListLoaing.value = false
     if (!error && code === 200) {
         attachmentList.value = getArrValue(data)
-    
+
 
     } else {
         attachmentList.value = []

yarn.lock

@@ -290,6 +290,16 @@
   resolved "http://47.110.251.215:9000/@vitejs/plugin-vue/-/plugin-vue-4.2.3.tgz#ee0b6dfcc62fe65364e6395bf38fa2ba10bb44b6"
   integrity sha512-R6JDUfiZbJA9cMiguQ7jxALsgiprjBeHL5ikpXfJCH62pPHtI+JdJ5xWj6Ev73yXSlYl86+blXn1kZHQ7uElxw==
 
+"@vue/compiler-core@3.3.2":
+  version "3.3.2"
+  resolved "http://47.110.251.215:9000/@vue/compiler-core/-/compiler-core-3.3.2.tgz#39567bd15c7f97add97bfc4d44e814df36eb797b"
+  integrity sha512-CKZWo1dzsQYTNTft7whzjL0HsrEpMfiK7pjZ2WFE3bC1NA7caUjWioHSK+49y/LK7Bsm4poJZzAMnvZMQ7OTeg==
+  dependencies:
+    "@babel/parser" "^7.21.3"
+    "@vue/shared" "3.3.2"
+    estree-walker "^2.0.2"
+    source-map-js "^1.0.2"
+
 "@vue/compiler-core@3.3.4":
   version "3.3.4"
   resolved "http://47.110.251.215:9000/@vue/compiler-core/-/compiler-core-3.3.4.tgz#7fbf591c1c19e1acd28ffd284526e98b4f581128"
@@ -300,6 +310,14 @@
     estree-walker "^2.0.2"
     source-map-js "^1.0.2"
 
+"@vue/compiler-dom@3.3.2":
+  version "3.3.2"
+  resolved "http://47.110.251.215:9000/@vue/compiler-dom/-/compiler-dom-3.3.2.tgz#2012ef4879375a4ca4ee68012a9256398b848af2"
+  integrity sha512-6gS3auANuKXLw0XH6QxkWqyPYPunziS2xb6VRenM3JY7gVfZcJvkCBHkb5RuNY1FCbBO3lkIi0CdXUCW1c7SXw==
+  dependencies:
+    "@vue/compiler-core" "3.3.2"
+    "@vue/shared" "3.3.2"
+
 "@vue/compiler-dom@3.3.4":
   version "3.3.4"
   resolved "http://47.110.251.215:9000/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz#f56e09b5f4d7dc350f981784de9713d823341151"
@@ -308,7 +326,23 @@
     "@vue/compiler-core" "3.3.4"
     "@vue/shared" "3.3.4"
 
-"@vue/compiler-sfc@3.3.4", "@vue/compiler-sfc@^3.3.4":
+"@vue/compiler-sfc@3.3.2":
+  version "3.3.2"
+  resolved "http://47.110.251.215:9000/@vue/compiler-sfc/-/compiler-sfc-3.3.2.tgz#d6467acba8446655bcee7e751441232e5ddebcbf"
+  integrity sha512-jG4jQy28H4BqzEKsQqqW65BZgmo3vzdLHTBjF+35RwtDdlFE+Fk1VWJYUnDMMqkFBo6Ye1ltSKVOMPgkzYj7SQ==
+  dependencies:
+    "@babel/parser" "^7.20.15"
+    "@vue/compiler-core" "3.3.2"
+    "@vue/compiler-dom" "3.3.2"
+    "@vue/compiler-ssr" "3.3.2"
+    "@vue/reactivity-transform" "3.3.2"
+    "@vue/shared" "3.3.2"
+    estree-walker "^2.0.2"
+    magic-string "^0.30.0"
+    postcss "^8.1.10"
+    source-map-js "^1.0.2"
+
+"@vue/compiler-sfc@^3.3.4":
   version "3.3.4"
   resolved "http://47.110.251.215:9000/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz#b19d942c71938893535b46226d602720593001df"
   integrity sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==
@@ -324,6 +358,14 @@
     postcss "^8.1.10"
     source-map-js "^1.0.2"
 
+"@vue/compiler-ssr@3.3.2":
+  version "3.3.2"
+  resolved "http://47.110.251.215:9000/@vue/compiler-ssr/-/compiler-ssr-3.3.2.tgz#75ac4ccafa2d78c91d2e257ad243c86409493cc4"
+  integrity sha512-K8OfY5FQtZaSOJHHe8xhEfIfLrefL/Y9frv4k4NsyQL3+0lRKxr9QuJhfdBDjkl7Fhz8CzKh63mULvmOfx3l2w==
+  dependencies:
+    "@vue/compiler-dom" "3.3.2"
+    "@vue/shared" "3.3.2"
+
 "@vue/compiler-ssr@3.3.4":
   version "3.3.4"
   resolved "http://47.110.251.215:9000/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz#9d1379abffa4f2b0cd844174ceec4a9721138777"
@@ -337,6 +379,17 @@
   resolved "https://registry.yarnpkg.com/@vue/devtools-api/-/devtools-api-6.5.0.tgz#98b99425edee70b4c992692628fa1ea2c1e57d07"
   integrity sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q==
 
+"@vue/reactivity-transform@3.3.2":
+  version "3.3.2"
+  resolved "http://47.110.251.215:9000/@vue/reactivity-transform/-/reactivity-transform-3.3.2.tgz#e1991d52d7ecefb65b214d8a3385a9dbe2cca74c"
+  integrity sha512-iu2WaQvlJHdnONrsyv4ibIEnSsuKF+aHFngGj/y1lwpHQtalpVhKg9wsKMoiKXS9zPNjG9mNKzJS9vudvjzvyg==
+  dependencies:
+    "@babel/parser" "^7.20.15"
+    "@vue/compiler-core" "3.3.2"
+    "@vue/shared" "3.3.2"
+    estree-walker "^2.0.2"
+    magic-string "^0.30.0"
+
 "@vue/reactivity-transform@3.3.4":
   version "3.3.4"
   resolved "http://47.110.251.215:9000/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz#52908476e34d6a65c6c21cd2722d41ed8ae51929"
@@ -348,37 +401,42 @@
     estree-walker "^2.0.2"
     magic-string "^0.30.0"
 
-"@vue/reactivity@3.3.4":
-  version "3.3.4"
-  resolved "http://47.110.251.215:9000/@vue/reactivity/-/reactivity-3.3.4.tgz#a27a29c6cd17faba5a0e99fbb86ee951653e2253"
-  integrity sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==
+"@vue/reactivity@3.3.2":
+  version "3.3.2"
+  resolved "http://47.110.251.215:9000/@vue/reactivity/-/reactivity-3.3.2.tgz#c4ddc5087039070c0c11810f6bc1aa59c99f0cb5"
+  integrity sha512-yX8C4uTgg2Tdj+512EEMnMKbLveoITl7YdQX35AYgx8vBvQGszKiiCN46g4RY6/deeo/5DLbeUUGxCq1qWMf5g==
   dependencies:
-    "@vue/shared" "3.3.4"
+    "@vue/shared" "3.3.2"
 
-"@vue/runtime-core@3.3.4":
-  version "3.3.4"
-  resolved "http://47.110.251.215:9000/@vue/runtime-core/-/runtime-core-3.3.4.tgz#4bb33872bbb583721b340f3088888394195967d1"
-  integrity sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==
+"@vue/runtime-core@3.3.2":
+  version "3.3.2"
+  resolved "http://47.110.251.215:9000/@vue/runtime-core/-/runtime-core-3.3.2.tgz#7c89b30c44ad42a3256806a1e37c3cd18500d6d5"
+  integrity sha512-qSl95qj0BvKfcsO+hICqFEoLhJn6++HtsPxmTkkadFbuhe3uQfJ8HmQwvEr7xbxBd2rcJB6XOJg7nWAn/ymC5A==
   dependencies:
-    "@vue/reactivity" "3.3.4"
-    "@vue/shared" "3.3.4"
+    "@vue/reactivity" "3.3.2"
+    "@vue/shared" "3.3.2"
 
-"@vue/runtime-dom@3.3.4":
-  version "3.3.4"
-  resolved "http://47.110.251.215:9000/@vue/runtime-dom/-/runtime-dom-3.3.4.tgz#992f2579d0ed6ce961f47bbe9bfe4b6791251566"
-  integrity sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==
+"@vue/runtime-dom@3.3.2":
+  version "3.3.2"
+  resolved "http://47.110.251.215:9000/@vue/runtime-dom/-/runtime-dom-3.3.2.tgz#b0bf7ce3fa9c181049ce783a0e13480a4f350c4b"
+  integrity sha512-+drStsJT+0mtgHdarT7cXZReCcTFfm6ptxMrz0kAW5hms6UNBd8Q1pi4JKlncAhu+Ld/TevsSp7pqAZxBBoGng==
   dependencies:
-    "@vue/runtime-core" "3.3.4"
-    "@vue/shared" "3.3.4"
+    "@vue/runtime-core" "3.3.2"
+    "@vue/shared" "3.3.2"
     csstype "^3.1.1"
 
-"@vue/server-renderer@3.3.4":
-  version "3.3.4"
-  resolved "http://47.110.251.215:9000/@vue/server-renderer/-/server-renderer-3.3.4.tgz#ea46594b795d1536f29bc592dd0f6655f7ea4c4c"
-  integrity sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==
+"@vue/server-renderer@3.3.2":
+  version "3.3.2"
+  resolved "http://47.110.251.215:9000/@vue/server-renderer/-/server-renderer-3.3.2.tgz#31dce9f76380762fc42df77f6f974c4098f179e6"
+  integrity sha512-QCwh6OGwJg6GDLE0fbQhRTR6tnU+XDJ1iCsTYHXBiezCXAhqMygFRij7BiLF4ytvvHcg5kX9joX5R5vP85++wg==
   dependencies:
-    "@vue/compiler-ssr" "3.3.4"
-    "@vue/shared" "3.3.4"
+    "@vue/compiler-ssr" "3.3.2"
+    "@vue/shared" "3.3.2"
+
+"@vue/shared@3.3.2":
+  version "3.3.2"
+  resolved "http://47.110.251.215:9000/@vue/shared/-/shared-3.3.2.tgz#774cd9b4635ce801b70a3fc3713779a5ef5d77c3"
+  integrity sha512-0rFu3h8JbclbnvvKrs7Fe5FNGV9/5X2rPD7KmOzhLSUAiQH5//Hq437Gv0fR5Mev3u/nbtvmLl8XgwCU20/ZfQ==
 
 "@vue/shared@3.3.4":
   version "3.3.4"
@@ -1330,10 +1388,10 @@ has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-hc-vue3-ui@^1.8.2:
-  version "1.8.2"
-  resolved "http://47.110.251.215:9000/hc-vue3-ui/-/hc-vue3-ui-1.8.2.tgz#ee248805595193dcc5ac462fbf028cb82d0e8d63"
-  integrity sha512-Ct6eU9zY0KhI0kqkstxCGJuPpOBos2MG3YIgHeOKnRlFKByKdHrLCWJY/CL9IPFbhDzpOWKHB/ktzRSTphGvyQ==
+hc-vue3-ui@^1.8.5:
+  version "1.8.5"
+  resolved "http://47.110.251.215:9000/hc-vue3-ui/-/hc-vue3-ui-1.8.5.tgz#5e8dce0f2396fa3bc24c2fa8448a0a34feddc3ae"
+  integrity sha512-y/UVibCl7+CoKVc/VnjvsZyJgo7Z2RNk+3riCsSH0d5fq1MtiBaKZ/CuiloI/lymIx7WneafLSifQR15i83XpA==
   dependencies:
     axios "^1.4.0"
     dayjs "^1.11.9"
@@ -1343,7 +1401,7 @@ hc-vue3-ui@^1.8.2:
     lottie-web "^5.12.2"
     simple-uploader.js "^0.6.0"
     sortablejs "^1.15.0"
-    vue "^3.3.4"
+    vue "3.3.2"
     vuedraggable "^2.24.3"
 
 html2canvas@1.4.1:
@@ -2488,16 +2546,16 @@ vue-router@^4.2.4:
   dependencies:
     "@vue/devtools-api" "^6.5.0"
 
-vue@^3.3.4:
-  version "3.3.4"
-  resolved "http://47.110.251.215:9000/vue/-/vue-3.3.4.tgz#8ed945d3873667df1d0fcf3b2463ada028f88bd6"
-  integrity sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==
+vue@3.3.2:
+  version "3.3.2"
+  resolved "http://47.110.251.215:9000/vue/-/vue-3.3.2.tgz#407f0057a7a154d836b66f94ce81779d0c2cafbc"
+  integrity sha512-98hJcAhyDwZoOo2flAQBSPVYG/o0HA9ivIy2ktHshjE+6/q8IMQ+kvDKQzOZTFPxvnNMcGM+zS2A00xeZMA7tA==
   dependencies:
-    "@vue/compiler-dom" "3.3.4"
-    "@vue/compiler-sfc" "3.3.4"
-    "@vue/runtime-dom" "3.3.4"
-    "@vue/server-renderer" "3.3.4"
-    "@vue/shared" "3.3.4"
+    "@vue/compiler-dom" "3.3.2"
+    "@vue/compiler-sfc" "3.3.2"
+    "@vue/runtime-dom" "3.3.2"
+    "@vue/server-renderer" "3.3.2"
+    "@vue/shared" "3.3.2"
 
 vuedraggable@^2.24.3:
   version "2.24.3"