cloud-web-corejs-haier 1.0.43 → 1.0.44

package/src/views/bd/setting/table_model/mixins/list.js

@@ -7,7 +7,10 @@ import MenuKindDialog from "@base/views/bd/setting/menu_kind/dialog.vue";
 import projectTagDialog from "@base/views/user/project_tag/dialog.vue";
 import {treeScollx} from "@base/utils/global";
 import {getBdFlag} from "@base/api/user";
-import {getJsxBtn, getJsxStatus} from "@base/views/bd/setting/utils";
+import {getJsxEditLink, getJsxStatus} from "@base/views/bd/setting/utils";
+import { mapGetters } from "vuex";
+import formVersionButton from "@base/views/bd/setting/formVersion/link.vue";
+import settingConfig from "@/settings";
 
 let modules = {};
 modules = {
@@ -18,7 +21,8 @@ modules = {
     tableForm,
     editView,
     MenuKindDialog,
-    projectTagDialog
+    projectTagDialog,
+    formVersionButton
   },
   created() {
   },
@@ -95,8 +99,18 @@ modules = {
       return this.currentFormType?.name || null
     },
     otherFlag() {
-      return this.currentFormType?.menuKindCode == "other"
-    }
+      return this.currentFormType?.menuKindCode === "other"
+    },
+    ...mapGetters([
+      "userFlag",
+    ]),
+    exportArchiveEnabled() {
+      return settingConfig.exportArchiveEnabled === true;
+    },
+    operationColumnWidth() {
+      const btnWidth = 47;
+      return this.exportArchiveEnabled ? btnWidth * 2 : btnWidth;
+    },
   },
   methods: {
     searchEvent() {
@@ -108,7 +122,7 @@ modules = {
       this.$refs['table-m1'].commitProxy('reload');
     },
     openEditDialog(row) {
-      /*this.dataId = !id || typeof id == 'object' ? 0 : id;
+      /*this.dataId = !id || typeof id === 'object' ? 0 : id;
       this.activeName = 'first';
       this.$openEditView('showEdit');*/
 
@@ -151,7 +165,22 @@ modules = {
         },
         columns: [
           {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
-          {title: this.$t1('实体名称'), field: 'taEn', width: 150, fixed: 'left'},
+          {
+            title: this.$t1('实体名称'),
+            field: 'taEn',
+            width: 150,
+            fixed: 'left',
+            slots: {
+              default: ({row}) => {
+                return getJsxEditLink({
+                  content: row.taEn,
+                  onclick: () => {
+                    this.openEditDialog(row);
+                  },
+                });
+              },
+            },
+          },
           {
             title: this.$t1('项目标签'), field: 'tag', width: 250, slots: {default: "tag"}, params: {
               exportVal: ({row}) => {
@@ -167,7 +196,7 @@ modules = {
             title: this.$t1('表类型'), field: 'taType', width: 150,
             slots: {
               default: ({row}) => {
-                return row.taType == 0 ? this.$t1('主表') : this.$t1('明细表')
+                return row.taType === 0 ? this.$t1('主表') : this.$t1('明细表')
               }
             }
           },
@@ -175,7 +204,7 @@ modules = {
             title: this.$t1('是否树结构'), field: 'taRule', width: 150,
             slots: {
               default: ({row}) => {
-                return row.taRule == 1 ? this.$t1('是') : this.$t1('否')
+                return row.taRule === 1 ? this.$t1('是') : this.$t1('否')
               }
             }
           },
@@ -183,7 +212,7 @@ modules = {
             title: this.$t1('数据范围'), field: 'dataRange', width: 150,
             slots: {
               default: ({row}) => {
-                return row.dataRange == 1 ? this.$t1('集团') : this.$t1('当前组织')
+                return row.dataRange === 1 ? this.$t1('集团') : this.$t1('当前组织')
               }
             }
           },
@@ -204,7 +233,9 @@ modules = {
           },
           {title: this.$t1('表编码'), field: 'taCode', width: 150},
           {field: 'serviceName', title: this.$t1('服务名'), width: 150},
+          {field: 'version', title: this.$t1('版本号'), width: 150},
           {title: this.$t1('唯一标识'), field: 'sid', width: 280},
+          // {field: 'sszstEn', title: this.$t1('所属主实体'), width: 150},
           {
             field: 'createBy',
             title: this.$t1('创建人'),
@@ -226,20 +257,12 @@ modules = {
             width: 150
           },
           {
-            width: 47,
+            width: this.operationColumnWidth,
             fixed: 'right',
             title: '',
             sortable: false,
             slots: {
-              default: ({row}) => {
-                return getJsxBtn({
-                  iconName: "el-icon-edit",
-                  content: this.$t1('查看'),
-                  onclick: () => {
-                    this.openEditDialog(row);
-                  }
-                });
-              }
+              default: "operation"
             }
           }
         ],
@@ -269,6 +292,7 @@ modules = {
           {title: this.$t1('项目标签'), field: "tag", type: "input", common: true, slot: "tag"},
           {title: this.$t1('创建人'), field: "createBy", type: "input", common: false},
           {title: this.$t1('更新人'), field: "modifyBy", type: "input", common: false},
+          {title: this.$t1('操作日志'), field: "logContent", type: "input", common: false},
           {
             title: this.$t1('创建时间'),
             field: "startCreateDate",
@@ -428,10 +452,21 @@ modules = {
         selectTypeAuth: this.currentFormType.selectTypeAuth
       })
     },
+    jsonExportArchive(row) {
+      this.$jsonExport({
+        title: "数据表",
+        data: [row.id],
+        url: USER_PREFIX + "/form_develop/exportSzTaMb",
+        plaintext: 1,
+        abcEnabled: true,
+        editAuth: this.currentFormType.editAuth,
+        selectTypeAuth: this.currentFormType.selectTypeAuth,
+      });
+    },
     getBdEnv() {
       getBdFlag({
         success: res => {
-          this.isDev = res.objx == 1
+          this.isDev = res.objx === 1
         }
       });
     }

package/src/views/bd/setting/table_model/mixins/otherAuthDialog.js

@@ -59,7 +59,7 @@ modules = {
     initBdEnv() {
       return getBdEnv({
         success: res => {
-          this.isDev = res.objx == "dev"
+          this.isDev = res.objx === "dev"
         }
       });
     },

package/src/views/bd/setting/table_model/mixins/zdDialog.js

@@ -1,9 +1,9 @@
-import {selectDialogMixins} from "@base/mixins/selectDialog";
+import { selectDialogMixins } from "@base/mixins/selectDialog";
 
 let modules = {};
 modules = {
-  name: 'zdDialog',
-  props: ['visiable', 'multi', 'rows', 'param', 'taBm'],
+  name: "zdDialog",
+  props: ["visiable", "multi", "rows", "param", "taBm"],
   mixins: [selectDialogMixins],
   components: {},
   created() {
@@ -20,7 +20,7 @@ modules = {
       formData: {},
       vxeOption: {},
       showSaleOrgDialog: false,
-      fieldKey: "taZdMc"
+      fieldKey: "taZdMc",
     };
   },
   methods: {
@@ -28,85 +28,89 @@ modules = {
       let that = this;
 
       let zdTypeMap = {
-        Boolean: this.$t1('布尔'),
-        Integer: this.$t1('整数'),
-        Long: this.$t1('长整数'),
-        Decimal: this.$t1('精度小数'),
-        Money: this.$t1('金额'),
-        Text: this.$t1('文本'),
-        TextArea: this.$t1('长文本'),
-        DateTime: this.$t1('日期时间'),
-        Reference: this.$t1('关联表')
-      }
+        Boolean: this.$t1("布尔"),
+        Integer: this.$t1("整数"),
+        Long: this.$t1("长整数"),
+        Decimal: this.$t1("精度小数"),
+        Money: this.$t1("金额"),
+        Text: this.$t1("文本"),
+        TextArea: this.$t1("长文本"),
+        DateTime: this.$t1("日期时间"),
+        Reference: this.$t1("关联表(文本)"),
+        ReferenceLong: this.$t1("关联表(长整型)"),
+      };
 
       let tableOption = {
         vue: that,
-        tableRef: 'table-m1',
-        tableName: 'bd_table_model_field_dialog-m1',
-        path: USER_PREFIX + '/szTaMb/getSzTaZdMbsByTaBm',
+        tableRef: "table-m1",
+        tableName: "bd_table_model_field_dialog-m1",
+        path: USER_PREFIX + "/szTaMb/getSzTaZdMbsByTaBm",
         param: () => {
           return {
             taBm: this.taBm,
             enabled: true,
             searchDb: true,
             ...this.formData,
-            ...this.param
+            ...this.param,
           };
         },
         columns: [
-          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          { type: "checkbox", width: 48, resizable: false, fixed: "left" },
           {
-            title: this.$t1('实体字段名称'),
-            field: 'zdEn',
-            width: 150
+            title: this.$t1("实体字段名称"),
+            field: "zdEn",
+            width: 150,
           },
           {
-            title: this.$t1('数据库表字段名'),
-            field: 'taZdMc',
-            width: 150
+            title: this.$t1("数据库表字段名"),
+            field: "taZdMc",
+            width: 150,
           },
           {
-            title: this.$t1('字段描述'),
-            field: 'zdCh',
-            width: 150
+            title: this.$t1("字段描述"),
+            field: "zdCh",
+            width: 150,
           },
           {
-            title: this.$t1('字段类型'), field: 'zdType', width: 150, slots: {
-              default: ({row, rowIndex, $table}) => {
+            title: this.$t1("字段类型"),
+            field: "zdType",
+            width: 150,
+            slots: {
+              default: ({ row, rowIndex, $table }) => {
                 return zdTypeMap[row.zdType];
-              }
-            }
+              },
+            },
           },
           {
-            title: this.$t1('关联字段'),
-            field: 'referenceZd',
-            width: 150
+            title: this.$t1("关联字段"),
+            field: "referenceZd",
+            width: 150,
           },
           {
             width: 47,
-            fixed: 'right',
-            title: '',
-            sortable: false
-          }
+            fixed: "right",
+            title: "",
+            sortable: false,
+          },
         ],
         config: {
           checkboxConfig: {
             checkStrictly: true,
             showHeader: this.selectMulti,
-            trigger: 'row'
+            trigger: "row",
           },
           proxyConfig: {
             props: {
               result: "objx", // 配置响应结果列表字段
               total: "objx.length", // 配置响应结果总页数字段
-            }
-          }
-        }
+            },
+          },
+        },
       };
-      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+      this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
         that.vxeOption = opts;
       });
     },
-  }
+  },
 };
-export default modules
+export default modules;

package/src/views/bd/setting/utils/index.js

@@ -48,6 +48,21 @@ export function getJsxLink({content, onclick}) {
   }, content)]
 }
 
+export function getJsxEditLink({content, onclick}) {
+  let h = window.$vueRoot.$createElement;
+  return [h("a", {
+    staticClass: "a-link",
+    on: {
+      click: (event) => {
+        onclick && onclick(event);
+      }
+    }
+  }, [
+    h("i", {staticClass: "el-icon-edit"}),
+    h("span", {}, content)
+  ])]
+}
+
 export function getJsxBtnList(list) {
   let arr = [];
   list.forEach(item => {