Ver Fonte

Merge remote-tracking branch 'origin/master'

ZaiZai há 1 ano atrás
pai
commit
b0ebcec680

+ 1 - 1
package.json

@@ -18,7 +18,7 @@
         "dayjs": "^1.11.10",
         "echarts": "^5.5.0",
         "element-plus": "^2.6.1",
-        "hc-vue3-ui": "^3.4.7",
+        "hc-vue3-ui": "^3.5.2",
         "js-base64": "^3.7.7",
         "js-cookie": "^3.0.5",
         "js-fast-way": "^0.4.6",

+ 2 - 4
src/components/tree/hc-tree.vue

@@ -493,16 +493,14 @@ const sortDialogHide = ()=>{
 
 //删除节点
 const delNodeMoadl = (node) => {
-    HcDelMsg({}, async (instance, resolve) => {
-        instance.confirmButtonLoading = true
-        instance.confirmButtonText = '删除中...'
+    HcDelMsg(async (resolve) => {
+        await remove({ id: node.data.id })
         const { code } = await remove({ id: node.data.id })
         if (code === 200) {
             window.$message?.success('删除成功')
             ElTreeRef.value.remove(node)
         }
         resolve() //关闭弹窗的回调
-        instance.confirmButtonLoading = false
     })
 }
 

+ 2 - 8
src/views/file/collection.vue

@@ -891,9 +891,7 @@ const sortingDelData = (row, index) => {
     //过滤掉当前选择的文件
     checkList.value = checkList.value.filter(e => e.tableindex !== index)
     if (row.boxNumber) {
-        HcDelMsg({}, async (instance, resolve) => {
-            instance.confirmButtonLoading = true
-            instance.confirmButtonText = '删除中...'
+        HcDelMsg( async ( resolve) => {
             const { error, code } = await archiveFileApi.removeAllocation({
                 boxName: row.boxName,
                 boxNumber:row.boxNumber,
@@ -903,7 +901,6 @@ const sortingDelData = (row, index) => {
                 sortingClick()
             }
             resolve() //关闭弹窗的回调
-            instance.confirmButtonLoading = false
         })
     }
 }
@@ -1022,9 +1019,7 @@ const delModalClick = () => {
     if (rows.length <= 0) {
         window.$message?.error('请选择需要删除的数据')
     } else {
-        HcDelMsg({}, async (instance, resolve) => {
-            instance.confirmButtonLoading = true
-            instance.confirmButtonText = '删除中...'
+        HcDelMsg( async (resolve) => {
             const keys = arrToId(rows)
             const { error, code } = await archiveFileApi.removeFile({
                 ids: keys,
@@ -1034,7 +1029,6 @@ const delModalClick = () => {
                 searchClick()
             }
             resolve() //关闭弹窗的回调
-            instance.confirmButtonLoading = false
         })
     }
 }

+ 1 - 4
src/views/tasks/message-data.vue

@@ -233,12 +233,9 @@ const tableContent = (row) => {
 const delClick = () => {
     const rows = tableCheckedKeys.value
     if (rows.length > 0) {
-        HcDelMsg({}, async (instance, resolve) => {
-            instance.confirmButtonLoading = true
-            instance.confirmButtonText = '删除中...'
+        HcDelMsg(async ( resolve) => {
             await removeData(rows)
             resolve() //关闭弹窗的回调
-            instance.confirmButtonLoading = false
         })
     } else {
         window.$message?.warning('请先勾选要删除的消息')

+ 4 - 4
yarn.lock

@@ -1371,10 +1371,10 @@ hasown@^2.0.0:
   dependencies:
     function-bind "^1.1.2"
 
-hc-vue3-ui@^3.4.7:
-  version "3.4.7"
-  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-3.4.7.tgz#1955dc75684030a87dd79b7611d1e545ae6a2f99"
-  integrity sha512-lBOkk9tWt1Kw8YxMlAnOIaD10YfdCzjlDdboNUZdwhIxorFxFkyp1XDS1lBl/GaryyZRmUed4lFmnBUYvVxy8Q==
+hc-vue3-ui@^3.5.2:
+  version "3.5.2"
+  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-3.5.2.tgz#22da583fa64e709cf03c8d846fe50f04e6d2f542"
+  integrity sha512-GL/nj+DfDgTtVkFGpcAC+k/s8JnLxUikMPsOW6xHUigQLYq/q5Yx7G8xQanR/2ftqvTc3r23RLgnj9ZsxyRTkA==
   dependencies:
     axios "^1.6.7"
     dayjs "^1.11.10"