Merge branch 'dev' of http://94.191.100.41/tfmom/tf-mom-web into dev

applications/architecture-dee/src/commonComponents/components/DeeUploadTable/config.js

@@ -48,6 +48,14 @@ export default {
       activeValue: 'edit',
       inactiveValue: 'view'
     }
+  }, {
+    'dynamicProp': true,
+    'key': 'component.checkRemoveFn',
+    'title': '删除校验方法',
+    'prop': 'component',
+    'component': {
+      name: 'btnCodeEdit'
+    }
   }, {
     'dynamicProp': true,
     'key': 'isSupportSecret',

applications/architecture-dee/src/commonComponents/components/DeeUploadTable/index.vue

@@ -9,7 +9,7 @@
       :data="tableData"
       :state="isViews"
       :link="true"
-      :remove-check-fn="removeCheckFn"
+      :remove-check-fn="removeCheckJudgeFn"
       :filter-key="filterKey"
       :upload-fiter="uploadFiter"
       @uploadData="update"
@@ -23,7 +23,7 @@
       :data="tableData"
       :state="isViews"
       :link="true"
-      :remove-check-fn="removeCheckFn"
+      :remove-check-fn="removeCheckJudgeFn"
       :parent-key="parentKey"
       @uploadData="update"
     />
@@ -179,6 +179,17 @@ export default {
     uploadFiter() {
       return this.showTableConfig && this.showTableConfig.uploadFilter
     },
+    // 删除校验方法的选择
+    removeCheckJudgeFn() {
+      if (this.showTableConfig && this.showTableConfig.checkRemoveFn) {
+        let fun1
+        // eslint-disable-next-line no-eval
+        eval(`fun1=${this.showTableConfig.checkRemoveFn}`)
+        return fun1
+      } else {
+        return this.removeCheckFn
+      }
+    },
     // filterKey() {
     //   if (!this.tableConfig || !this.tableConfig.filterKey) {
     //     return ''