From c83e5706898ca1d479d4d078157e16a73c4eaba2 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 21 三月 2024 11:41:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue |  291 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 253 insertions(+), 38 deletions(-)

diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
index 2ac2f71..60a97c6 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
@@ -1,22 +1,24 @@
 <template>
-  <div :id="'UI-dynamic-'+areasName+componentVO.oid" class="UI-dynamic">
-    <div>
-      <avue-crud v-model="form"
-                 :data="tableList"
-                 :option="option"
-                 :page.sync="page"
-                 :table-loading="loading">
-        <!--top鍖哄煙鎸夐挳-->
-        <template slot="menuLeft" slot-scope="scope">
-          <dynamic-button :butttonList="componentVO.buttons" LocationType="top" type="table"></dynamic-button>
-        </template>
+  <div class="UI-dynamic" :id="'UI-dynamic-'+areasName+componentVO.oid">
+    <avue-crud v-model="form"
+               ref="dataTable"
+               :data="tableList"
+               :option="option"
+               :page.sync="page"
+               :table-loading="loading">
+      <!--top鍖哄煙鎸夐挳-->
+      <template slot="menuLeft" slot-scope="scope">
+        <dynamic-button LocationType="top" type="table":butttonList="componentVO.buttons" @buttonClick="buttonClick" ></dynamic-button>
+      </template>
 
-        <!--menu鍖哄煙鎸夐挳-->
-        <template slot="menu" slot-scope="scope">
-          <dynamic-button :butttonList="componentVO.buttons" :scope="scope" LocationType="menu" type="table"></dynamic-button>
-        </template>
-      </avue-crud>
-    </div>
+      <!--menu鍖哄煙鎸夐挳-->
+      <template slot="menu" slot-scope="scope">
+        <dynamic-button :scope="scope" LocationType="menu" type="table":butttonList="componentVO.buttons" @buttonClick="buttonClick" ></dynamic-button>
+      </template>
+    </avue-crud>
+    <!-- 琛ㄦ牸鍐呮寜閽搷浣滃璇濇琛ㄥ崟   -->
+    <dynamic-table-form ref="dynamicForm" :formList="formList" :title="formName" :visible.sync="visible"
+                  style="display: none"></dynamic-table-form>
   </div>
 </template>
 
@@ -44,14 +46,20 @@
     paramVOS: {
       type: Object,
       default: {}
-    }
+    },
+    isShow: {
+      //鎵�鍦ㄥ尯鍩熸槸鍚﹀凡鏄剧ず锛岄拡瀵箃ab鍜宑ollapse
+      type: Boolean,
+      default: true
+    },
   },
   data() {
     return {
-      clientHeight: 0,
-      parentHeight: '100%',//褰撳墠缁勪欢鏍硅妭鐐瑰厓绱犻珮搴�
+      parentHeight:'100%',//褰撳墠缁勪欢鏍硅妭鐐瑰厓绱犻珮搴�
       form: {},
+      formName: '',
       loading: false,
+      visible: false,
       page: {
         pageSize: 10,
         currentPage: 1,
@@ -452,23 +460,181 @@
           ts: "2022-02-18 14:35:53.177"
         },
       ],
-    }
-  },
-  computed: {
-    option() {
-      return {
+      // 琛ㄥ崟鏁版嵁
+      formList: [
+        {
+          comboxKey: null,
+          customClass: null,
+          data: null,
+          dateFormate: null,
+          defaultValue: "",
+          displayExtension: "",
+          extendAttrMap: null,
+          extendAttrString: null,
+          field: "name",
+          hidden: false,
+          keyAttr: true,
+          prefix: null,
+          readOnly: false,
+          referConfig: null,
+          required: true,
+          selectLibFlag: null,
+          showField: null,
+          suffix: '$',
+          text: "鍚嶇О",
+          tooltips: '鍚嶇О',
+          type: "text",
+          unique: false,
+          verify: ""
+        },
+        {
+          comboxKey: null,
+          customClass: null,
+          data: null,
+          dateFormate: null,
+          defaultValue: "",
+          displayExtension: "",
+          extendAttrMap: null,
+          extendAttrString: null,
+          field: "code",
+          hidden: false,
+          keyAttr: false,
+          prefix: null,
+          readOnly: false,
+          referConfig: null,
+          required: false,
+          selectLibFlag: null,
+          showField: null,
+          suffix: null,
+          disabled:true,
+          text: "缂栫爜",
+          tooltips: null,
+          type: "text",
+          unique: false,
+          verify: ""
+        },
+        {
+          comboxKey: "EnumReviewType",
+          customClass: null,
+          data: null,
+          dateFormate: null,
+          defaultValue: "department",
+          displayExtension: "",
+          extendAttrMap: null,
+          extendAttrString: null,
+          field: "reviewtype",
+          hidden: false,
+          keyAttr: false,
+          prefix: null,
+          readOnly: false,
+          referConfig: null,
+          required: false,
+          selectLibFlag: null,
+          showField: null,
+          suffix: null,
+          text: "绫诲瀷",
+          tooltips: null,
+          type: "combox",
+          unique: false,
+          verify: "",
+          dicData: [{
+            label: '娴嬭瘯1',
+            value: 'department'
+          }, {
+            label: '娴嬭瘯2',
+            value: 'departments'
+          }]
+        },
+        {
+          comboxKey: null,
+          customClass: null,
+          data: null,
+          dateFormate: null,
+          defaultValue: "",
+          displayExtension: "",
+          extendAttrMap: null,
+          extendAttrString: null,
+          field: "creator",
+          hidden: true,
+          keyAttr: false,
+          prefix: null,
+          readOnly: true,
+          referConfig: null,
+          required: false,
+          selectLibFlag: null,
+          showField: null,
+          suffix: null,
+          text: "鍒涘缓浜�",
+          tooltips: null,
+          type: "text",
+          unique: false,
+          verify: ""
+        },
+        {
+          comboxKey: null,
+          customClass: null,
+          data: null,
+          dateFormate: "yyyy-MM-dd HH:mm:ss",
+          defaultValue: "",
+          displayExtension: "",
+          extendAttrMap: null,
+          extendAttrString: null,
+          field: "createtime",
+          hidden: true,
+          keyAttr: false,
+          prefix: null,
+          readOnly: false,
+          referConfig: null,
+          required: false,
+          selectLibFlag: null,
+          showField: null,
+          suffix: null,
+          text: "鍒涘缓鏃堕棿",
+          tooltips: null,
+          type: "datetime",
+          unique: false,
+          verify: ""
+        },
+        {
+          comboxKey: null,
+          customClass: null,
+          data: null,
+          dateFormate: null,
+          defaultValue: "",
+          displayExtension: "",
+          extendAttrMap: null,
+          extendAttrString: null,
+          field: "content",
+          hidden: false,
+          keyAttr: false,
+          prefix: null,
+          readOnly: false,
+          referConfig: null,
+          required: false,
+          selectLibFlag: null,
+          showField: null,
+          suffix: null,
+          text: "澶囨敞",
+          tooltips: null,
+          type: "textarea",
+          unique: false,
+          verify: ""
+        },
+      ],
+      option: {
         index: true,
         addBtn: false,
         editBtn: false,
         delBtn: false,
-        selection:true,
-        height: this.parentHeight,
+        height: '100%',
         calcHeight: 15,
         indexFixed: false,
         menuFixed: false,
-        column: this.updatedColumns,
-      };
-    },
+        column: [],
+      },
+    }
+  },
+  computed: {
     updatedColumns() {
       return this.componentVO.tableDefineVO.cols[0].map(item => {
         const typeValue = item.fieldType === 'text' || item.fieldType === 'combox' ? 'input' : item.fieldType; // 琛ㄥ崟Type绫诲瀷
@@ -485,21 +651,70 @@
       });
     },
   },
-  watch: {
-    clientHeight: {
+  watch:{
+    parentHeight:{
       handler(newval) {
-        if (newval > 50) {
-          //鐖跺厓绱犻珮搴�-鎸夐挳楂樺害-鍒嗛〉楂樺害
-          this.parentHeight = this.$el.clientHeight - this.$children[0].$children[1].$children[0].$el.clientHeight - this.$children[0].$children[2].$el.clientHeight - 5;
-          console.log(this.parentHeight)
+        if(newval >50){
+          this.option.height=newval;
+          //doLayout涓嶇敓鏁堬紝鎵嬪姩璁剧疆琛ㄦ牸楂樺害
+          this.$children[0].$children[1].$children[1].$children[0].$el.style.height=newval+'px';
+          /*this.$nextTick(() => {
+            if (this.$refs.dataTable && this.$refs.dataTable.doLayout) {
+              this.$refs.dataTable.doLayout();
+            }
+          })*/
         }
       }
     },
+    isShow:{
+      handler(newval) {
+        if(newval && this.$el.clientHeight>50) {
+          this.parentHeight = this.$el.clientHeight - this.$children[0].$children[1].$children[0].$el.clientHeight - this.$children[0].$children[2].$el.clientHeight - 5;
+        }
+      }
+    }
+  },
+  created() {
+    this.option.column=this.updatedColumns;
   },
   mounted() {
-    this.clientHeight = this.$el.clientHeight;
+    if(this.$el.clientHeight>50) {
+      //鐖跺厓绱犻珮搴�-鎸夐挳楂樺害-鍒嗛〉楂樺害
+      this.parentHeight = this.$el.clientHeight - this.$children[0].$children[1].$children[0].$el.clientHeight - this.$children[0].$children[2].$el.clientHeight - 5;
+    }
   },
-  methods: {}
+  methods: {
+    buttonClick(scope, item) {
+      this.formName = item.name;
+
+      function handleAdd() {
+        this.visible = true;
+      }
+
+      function handleEdit() {
+        this.visible = true;
+        this.$refs.dynamicForm.form = scope.row;
+      }
+
+      function handleDelete() {
+        this.$message.success('鍒犻櫎鎴愬姛锛�');
+      }
+
+      const methodHandlers = {
+        add: handleAdd.bind(this),
+        edit: handleEdit.bind(this),
+        delete: handleDelete.bind(this),
+      };
+
+      const method = item.paramVOS.buttonMethods;
+      const handler = methodHandlers[method];
+      if (handler) {
+        handler();
+      } else {
+        this.$message.error('璇烽噸鏂伴厤缃寜閽紒')
+      }
+    }
+  }
 }
 </script>
 

--
Gitblit v1.9.3