cloud-web-corejs 1.0.54-dev.193 → 1.0.54-dev.195

package/src/components/xform/form-render/container-item/list-h5-item.vue

@@ -811,14 +811,6 @@ export default {
       let columnEditFields = null;
 
       let type = this.columnFormatMap[row.formatS];
-      /*if (type == 'date') {
-        columnEditFields = ['type', 'format', 'valueFormat']
-      } else if (type == 'select') {
-
-      }
-      if (type == 'vabsearch') {
-        columnEditFields = ['vabSearchField', 'formCode', 'formVersion', 'required', 'showFormField', 'onSearchConfirm', 'onSearchClear']
-      }*/
 
       if (type) {
         columnSelectedWidget = this.$baseLodash.cloneDeep(formRef.getFieldWidgetByType(type));
@@ -845,7 +837,7 @@ export default {
         return "false";
       } else {
         let propName = this.getFieldKeyName(widget) + '.' + obj.rowIndex + '.' + obj.column.field
-        if (obj.column.params.widget == 'vabsearch') {
+        if (this.isVabsearchFlagWidget(widget)) {
           let vabSearchName = obj.column.params.widget.options.vabSearchName;
           propName = this.getFieldKeyName(widget) + '.' + obj.rowIndex + '.' + vabSearchName;
         }

package/src/components/xform/form-render/container-item/list-h5-item2.vue

@@ -1247,14 +1247,7 @@ export default {
       let columnEditFields = null;
 
       let type = this.columnFormatMap[row.formatS];
-      /*if (type == 'date') {
-        columnEditFields = ['type', 'format', 'valueFormat']
-      } else if (type == 'select') {
 
-      }
-      if (type == 'vabsearch') {
-        columnEditFields = ['vabSearchField', 'formCode', 'formVersion', 'required', 'showFormField', 'onSearchConfirm', 'onSearchClear']
-      }*/
 
       if (type) {
         columnSelectedWidget = this.$baseLodash.cloneDeep(formRef.getFieldWidgetByType(type));
@@ -1281,7 +1274,7 @@ export default {
         return "false";
       } else {
         let propName = this.getFieldKeyName(widget) + '.' + obj.rowIndex + '.' + obj.column.field
-        if (obj.column.params.widget == 'vabsearch') {
+        if (this.isVabsearchFlagWidget(widget)) {
           let vabSearchName = obj.column.params.widget.options.vabSearchName;
           propName = this.getFieldKeyName(widget) + '.' + obj.rowIndex + '.' + vabSearchName;
         }

package/src/components/xform/form-render/indexMixin.js

@@ -175,8 +175,13 @@ modules = {
       importDialogOption: {},
       formDrawerOption: {},
       showFormDrawer: false,
+      userInfo: null,
       userSaleOrgDTOs: [],
       userRoleDTOs: [],
+
+      userSaleOrgDTO2s: [],
+      userRoleDTO2s: [],
+      defaultUserSaleOrgDTO: null,
       bdService: null,
       globalParam: {}
     };
@@ -225,9 +230,10 @@ modules = {
     this.registerFormToRefList()
     this.currentFormData = this.formData;
     let formConfig = this.formConfig;
-    await this.getSaleOrgData();
-    await this.getUserRoleData();
-    await this.getBdService();
+    await this.initUserInfo();
+    await this.initSaleOrgData();
+    await this.initUserRoleData();
+    await this.initBdService();
     this.buildFormModel(!this.formJsonObj ? null : this.formJsonObj.widgetList);
     this.hanldeCommonWidget();//处理组件显隐规则
     if (formConfig.isLoadEntity) {
@@ -246,7 +252,64 @@ modules = {
     this.handleOnMounted();
   },
   methods: {
-    getSaleOrgData() {
+    /**
+     * 数据对象key 驼峰下划线相互转化
+     * @param {Object} data - 原始对象 支持-数组、key-value对象、字符串
+     * @param {String} type hump-转驼峰 toLine-转下划线
+     */
+    formatHumpLineTransfer(data, type = 'hump') {
+      let hump = ''
+      // 转换对象中的每一个键值为驼峰的递归
+      let formatTransferKey = (data) => {
+        if (data instanceof Array) {
+          data.forEach(item => formatTransferKey(item))
+        } else if (data instanceof Object) {
+          for (let key in data) {
+            hump = type === 'hump' ? this.formatToHump(key) : this.formatToLine(key)
+            data[hump] = data[key]
+            if (key !== hump) {
+              delete data[key]
+            }
+            if (data[hump] instanceof Object) {
+              formatTransferKey(data[hump])
+            }
+          }
+        } else if (typeof data === 'string') {
+          data = type === 'hump' ? this.formatToHump(data) : this.formatToLine(data)
+        }
+      }
+      formatTransferKey(data)
+      return data
+    },
+
+    /**
+     * 字符串下划线转驼峰
+     * @param {String} value 需要转换的值
+     */
+    formatToHump(value) {
+      return value.replace(/\_(\w)/g, (_, letter) => letter.toUpperCase())
+    },
+
+    /**
+     * 字符串驼峰转下划线
+     * @param {String} value
+     */
+    formatToLine(value) {
+      return value.replace(/([A-Z])/g, "_$1").toLowerCase()
+    },
+
+    initUserInfo() {
+      return this.$http({
+        url: USER_PREFIX + '/user/currentUser',
+        method: 'post',
+        success: res => {
+          let userInfo = res.objx;
+          let row = this.formatHumpLineTransfer(userInfo, "toLine")
+          this.userInfo = row;
+        }
+      });
+    },
+    initSaleOrgData() {
       if (this.$store.getters.userId) {
         return this.$http({
           url: USER_PREFIX + '/user/getUserSaleOrg',
@@ -258,11 +321,16 @@ modules = {
           success: res => {
             let rows = res.objx || [];
             this.userSaleOrgDTOs = rows;
+
+            let companyCode = this.$store.getters.companyCode;
+            let row2s = rows.filter(row => row.companyCode === companyCode)
+            this.userSaleOrgDTO2s = row2s;
+            this.defaultUserSaleOrgDTO = row2s.find(item => item.defaults)
           }
         });
       }
     },
-    getUserRoleData() {
+    initUserRoleData() {
       if (this.$store.getters.userId) {
         return this.$http({
           url: USER_PREFIX + '/user/getUserRole',
@@ -274,11 +342,14 @@ modules = {
           success: res => {
             let rows = res.objx || [];
             this.userRoleDTOs = rows;
+
+            let companyCode = this.$store.getters.companyCode;
+            this.userRoleDTO2s = rows.filter(row => row.companyCode === companyCode)
           }
         });
       }
     },
-    getBdService() {
+    initBdService() {
       return this.$http({
         url: USER_PREFIX + '/form_develop/getBdService',
         method: `post`,
@@ -291,6 +362,50 @@ modules = {
         }
       });
     },
+    getUserInfo() {
+      return this.userInfo;
+    },
+    getUserSaleOrgDTOs() {
+      return this.userSaleOrgDTO2s;
+    },
+    getUserRoleDTOs() {
+      return this.userRoleDTO2s;
+    },
+    getDefaultUserSaleOrgDTO() {
+      return this.defaultUserSaleOrgDTO;
+    },
+    getSaleOrgDTOs() {
+      return this.userSaleOrgDTO2s.map(item => {
+        return {
+          id: item.saleOrgId,
+          sn: item.sn,
+          name: item.saleOrgName,
+          companyCode: item.companyCode,
+          companyName: item.companyName
+        }
+      });
+    },
+    getRoleDTOs() {
+      return this.userRoleDTO2s.map(item => {
+        return {
+          id: item.roleId,
+          code: item.roleCode,
+          name: item.roleName,
+          companyCode: item.companyCode,
+          companyName: item.companyName
+        }
+      });
+    },
+    getDefaultSaleOrgDTO() {
+      let item = this.defaultUserSaleOrgDTO;
+      return item ? {
+        id: item.saleOrgId,
+        sn: item.sn,
+        name: item.saleOrgName,
+        companyCode: item.companyCode,
+        companyName: item.companyName
+      } : null;
+    },
     handleShowContent(callback) {
       // this.buildFormModel(!this.formJsonObj ? null : this.formJsonObj.widgetList);
       this.showFormContent = true;
@@ -1365,7 +1480,7 @@ modules = {
               fieldMap[fieldKeyName] = widget;
             } else {
               fieldMap[fieldKeyName] = fieldKeyName;
-              if (widget.type == 'vabsearch') {
+              if (this.isVabsearchFlagWidget(widget)) {
                 let vabSearchName = widget.options.vabSearchName;
                 if (vabSearchName) fieldMap[vabSearchName] = vabSearchName;
               }
@@ -1401,6 +1516,10 @@ modules = {
         || o
       );
     },
+    isVabsearchFlagWidget(widget) {
+      let type = widget?.type;
+      return type == "vabsearch" || type == "singerSearch" || type == "multiSearch";
+    },
     getFormTemplateTableDTOs() {
       let formTemplateTableDTOs = [];
       let formCode = this.reportTemplate.formCode;
@@ -1511,7 +1630,7 @@ modules = {
               };
               formTemplateTableDTOs.push(formTemplateTable);
             }
-          } else if (widget.tableField && widget.type == 'vabsearch') {
+          } else if (widget.tableField && this.isVabsearchFlagWidget(widget)) {
             if (submitFlag) {
               fields.push({
                 fieldDesc: widget.options.label + "ID",

package/src/components/xform/lang/zh-CN.js

@@ -100,11 +100,14 @@ export default {
       'project-tag': '标签',
       'dropdown-menu': '下拉菜单',
 
-
       "create_by-text": "创建人",
       "modify_by-text": "更新人",
       "create_date-text": "创建时间",
       "modfiy_date-text": "更新时间",
+      "user-vabsearch": "用户（单选）",
+      "saleOrg-vabsearch": "机构（单选）",
+      "user-project-tag": "用户（多选）",
+      "saleOrg-project-tag": "机构（多选）",
     },
     hint: {
       formulaSetting: "公式设置",
@@ -595,7 +598,7 @@ export default {
       enterForQuery: "输入关键字进行过滤",
       add: "添加",
       delete: "删除",
-      censusClass:'统计样式'
+      censusClass: '统计样式'
     }
   }
 }