From 61515d8da4b90131a4cae9e5bc1013cb0288573c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 10 十一月 2023 16:58:17 +0800
Subject: [PATCH] 	modified:   src/views/basic/template/index.vue 	modified:   src/views/common/param-mergeTemplate.vue 	modified:   src/views/common/rich-text.vue 	modified:   src/views/technology/routing/routing-form.vue

---
 src/views/common/param-mergeTemplate.vue |   29 ++++++++++++++++++++++-------
 1 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/views/common/param-mergeTemplate.vue b/src/views/common/param-mergeTemplate.vue
index 209593c..796737f 100644
--- a/src/views/common/param-mergeTemplate.vue
+++ b/src/views/common/param-mergeTemplate.vue
@@ -1,7 +1,14 @@
 <template>
     <div>
-        <avue-crud ref="crud" class="l-mes" rowKey="oneId" :data="tableData" :option="option" :span-method="spanMethod"
-            :page="page" :table-loading="loading">
+        <avue-crud 
+        ref="crud" 
+        class="l-mes" 
+        rowKey="oneId" 
+        :data="tableData" 
+        :option="option" 
+        :span-method="spanMethod"
+        :page="page" 
+        :table-loading="loading">
             <template slot="code" slot-scope="scope">
                 <avue-text-ellipsis use-tooltip :text="scope.row.code" :height="textEllipsisHeight" :width="textEllipsisWidth">
                     <small slot="more">...</small>
@@ -106,7 +113,7 @@
                                 message: "鍗曚綅涓嶈兘涓虹┖",
                                 trigger: "blur"
                             }]
-                        },]
+                    },]
                 }
             }
         },
@@ -116,10 +123,6 @@
                 return []
             },
             required: true
-        },
-        loading: {
-            type: Boolean,
-            default: false
         },
         page: {
             type: Object,
@@ -168,21 +171,28 @@
     watch:{
         tableTreeData:{
             handler(old,newval){
+                this.loading = true
                 this.tableData=JSON.parse(JSON.stringify(this.tableTreeData))
                 this.rowSort()
                 this.rowCalc()
+                this.loading = false
             },
             deep: true
         }
     },
     created() {
+        this.loading = true
         this.tableData=JSON.parse(JSON.stringify(this.tableTreeData))
         this.rowSort()
         this.rowCalc()
+        setTimeout(()=>{
+            this.loading = false
+        },3000)
     },
     data(){
         return {
             tableData: [],
+            loading: false,
         }
     },
     methods:{
@@ -268,4 +278,9 @@
 .avue-crud__menu {
     display: none;
 }
+.avue-crud .el-table th {
+    word-break: break-word;
+    color: rgba(102,102,102,1);
+    background-color: white;
+}
 </style>
\ No newline at end of file

--
Gitblit v1.9.3