From fce9d4e89a50c0b53faee6f6bfd2c385531fbc4b Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 21 三月 2024 13:45:16 +0800
Subject: [PATCH] 解决冲突代码(原始数据判空)

---
 Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue  |   60 +++++++-----
 Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue |  198 ---------------------------------------
 2 files changed, 37 insertions(+), 221 deletions(-)

diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue
index 65e77a0..0af4863 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-form.vue
@@ -62,41 +62,51 @@
         submitBtn: false,
         emptyBtn: false,
         height: 300,
-        column: this.formColumn(this.componentVO.tableDefineVO.cols[0])
+        column: this.getColumnData(0)
       }
     },
     slotData() {
-      return this.formColumn(this.componentVO.tableDefineVO.cols[0])
+      return this.getColumnData(0)
     }
   },
   methods: {
     //杞寲鏁版嵁
     formColumn(formList) {
-      return formList.map(item => {
-        const typeValue = item.type === 'text' ? 'input' : item.type === 'combox' ? 'select' : item.type;
+        return formList.map(item => {
+          const typeValue = item.type === 'text' ? 'input' : item.type === 'combox' ? 'select' : item.type;
 
-        return {
-          label: item.text,
-          prop: item.field,
-          type: typeValue,
-          value: item.defaultValue,
-          dicData: item.type === 'combox' ? item.dicData : item.dicUrl,
-          readonly: item.readOnly,
-          disabled: item.disabled,
-          labelSuffix: item.suffix,
-          suffixIcon: item.prefix,
-          placeholder: item.placeholder,
-          clearable: item.clearable,
-          tip: item.tooltips,
-          keyAttr: item.keyAttr,
-          rules: [{
-            required: item.required,
-            message: `璇疯緭鍏�${item.text}!`,
-            trigger: "blur"
-          }]
-        }
-      })
+          return {
+            label: item.text,
+            prop: item.field,
+            type: typeValue,
+            value: item.defaultValue,
+            dicData: item.type === 'combox' ? item.dicData : item.dicUrl,
+            readonly: item.readOnly,
+            disabled: item.disabled,
+            labelSuffix: item.suffix,
+            suffixIcon: item.prefix,
+            placeholder: item.placeholder,
+            clearable: item.clearable,
+            tip: item.tooltips,
+            keyAttr: item.keyAttr,
+            rules: [{
+              required: item.required,
+              message: `璇疯緭鍏�${item.text}!`,
+              trigger: "blur"
+            }]
+          };
+        });
     },
+
+    //鏁版嵁鍒ょ┖
+    getColumnData(index) {
+      if (this.componentVO && this.componentVO.tableDefineVO && this.componentVO.tableDefineVO.cols && this.componentVO.tableDefineVO.cols.length > 0) {
+        return this.formColumn(this.componentVO.tableDefineVO.cols[index])
+      } else {
+        return null;
+      }
+    },
+
     buttonClick(item) {
       console.log(item.id)
     },
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
index 60a97c6..8da8fb6 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table.vue
@@ -8,17 +8,14 @@
                :table-loading="loading">
       <!--top鍖哄煙鎸夐挳-->
       <template slot="menuLeft" slot-scope="scope">
-        <dynamic-button LocationType="top" type="table":butttonList="componentVO.buttons" @buttonClick="buttonClick" ></dynamic-button>
+        <dynamic-button LocationType="top" type="table":butttonList="componentVO.buttons" ></dynamic-button>
       </template>
 
       <!--menu鍖哄煙鎸夐挳-->
       <template slot="menu" slot-scope="scope">
-        <dynamic-button :scope="scope" LocationType="menu" type="table":butttonList="componentVO.buttons" @buttonClick="buttonClick" ></dynamic-button>
+        <dynamic-button :scope="scope" LocationType="menu" type="table":butttonList="componentVO.buttons" ></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>
 
@@ -460,167 +457,6 @@
           ts: "2022-02-18 14:35:53.177"
         },
       ],
-      // 琛ㄥ崟鏁版嵁
-      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,
@@ -684,36 +520,6 @@
     }
   },
   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