cloud-web-corejs 1.0.54-dev.192 → 1.0.54-dev.194

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.192",
+  "version": "1.0.54-dev.194",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js

@@ -243,6 +243,33 @@ modules = {
         } else {
           if (!dataId) {
             //新增
+            // targetType: "vabsearch",
+            if (this.field.type == "vabsearch" && !this.field.options.multipleChoices) {
+              let searchDialogConfig = this.field.options.searchDialogConfig || {};
+              if (this.field.options.userDefaultVabSearch) {
+                let userInfo = this.getFormRef().getUserInfo();
+                let valueSourceField = "id";
+                let labelSourceField = "nick_name";
+                if (this.field.options.clickBindEvent == "1") {
+                  if (searchDialogConfig.valueSourceField) valueSourceField = searchDialogConfig.valueSourceField
+                  if (searchDialogConfig.labelSourceField) labelSourceField = searchDialogConfig.labelSourceField
+                }
+                this.setValue(userInfo[valueSourceField] ?? null);
+                this.setShowValue(userInfo[labelSourceField] ?? null);
+              } else if (this.field.options.saleOrgDefaultVabSearch) {
+                let saleOrgDTO = this.getFormRef().getDefaultSaleOrgDTO();
+                if (saleOrgDTO) {
+                  let valueSourceField = "id";
+                  let labelSourceField = "name";
+                  if (this.field.options.clickBindEvent == "1") {
+                    if (searchDialogConfig.valueSourceField) valueSourceField = searchDialogConfig.valueSourceField
+                    if (searchDialogConfig.labelSourceField) labelSourceField = searchDialogConfig.labelSourceField
+                  }
+                  this.setValue(saleOrgDTO[valueSourceField] ?? null);
+                  this.setShowValue(saleOrgDTO[valueSourceField] ?? null);
+                }
+              }
+            }
             if (!this.tableParam) {
               //主表
               if (this.isNotNullVal(defaultValue)) {
@@ -910,7 +937,7 @@ modules = {
 
       // dialogQueryParam.
       let queryParam = null;
-      if(searchDialogConfig.dialogQueryParam){
+      if (searchDialogConfig.dialogQueryParam) {
         queryParam = this.handleCustomEvent(searchDialogConfig.dialogQueryParam)
       }
       this.getFormRef().openSearchDialog({

package/src/components/xform/form-designer/form-widget/field-widget/select-widget.vue

@@ -12,6 +12,7 @@
                :default-first-option="allowDefaultFirstOption"
                :automatic-dropdown="field.options.automaticDropdown"
                :multiple="field.options.multiple" :multiple-limit="field.options.multipleLimit"
+               :collapse-tags="!!field.options.multiple"
                :placeholder="getI18nLabel(field.options.placeholder || '请选择')"
                :remote="field.options.remote" :remote-method="remoteQuery"
                @focus="handleFocusCustomEvent" @blur="handleBlurCustomEvent"

package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/table-column-dialog.vue

@@ -501,7 +501,7 @@ import i18n from "../../../../../../components/xform/utils/i18n";
 import Sortable from "sortablejs";
 import {generateId} from "../../../../../../components/xform/utils/util";
 import columnRenderDialog from "./columnRenderDialog.vue"
-import {businessFields} from "@/components/xform/form-designer/widget-panel/widgetsConfig";
+import {businessFields} from "@base/components/xform/form-designer/widget-panel/widgetsConfig";
 
 let businessOptions = [
   {

package/src/components/xform/form-designer/setting-panel/property-editor/field-vabSearch/vabSearchName-editor.vue

@@ -9,6 +9,16 @@
     <el-form-item label="展示字段">
       <el-input type="text" v-model="optionModel.vabSearchName"></el-input>
     </el-form-item>
+    <template v-if="!optionModel.multipleChoices">
+      <el-form-item label="默认用户">
+        <el-switch v-model="optionModel.userDefaultVabSearch"
+                   @change="optionModel.saleOrgDefaultVabSearch=false"></el-switch>
+      </el-form-item>
+      <el-form-item label="默认机构">
+        <el-switch v-model="optionModel.saleOrgDefaultVabSearch"
+                   @change="optionModel.userDefaultVabSearch=false"></el-switch>
+      </el-form-item>
+    </template>
   </div>
 </template>
 

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -2579,6 +2579,8 @@ export const advancedFields = [
       keyNameEnabled: !1,
       keyName: "",
       vabSearchName: "",
+      userDefaultVabSearch:false,
+      saleOrgDefaultVabSearch:false,
       label: "",
       submitFlag: true,
       disabled: !1,
@@ -3313,6 +3315,155 @@ export const businessFields = [
       ...defaultTextFlagConfig
     }
   },
+
+  {
+    type: "user-vabsearch",
+    targetType: "vabsearch",
+    icon: "searchbox",
+    commonFlag: !0,
+    columnFlag: true,
+    formItemFlag: !0,
+    tableField: null,
+    options: {
+      name: "",
+      keyNameEnabled: !1,
+      keyName: "",
+      vabSearchName: "nick_name",
+      userDefaultVabSearch:false,
+      saleOrgDefaultVabSearch:false,
+      label: "用户",
+      submitFlag: true,
+      disabled: !1,
+      hidden: !1,
+      required: !1,
+      labelWidth: null,
+      labelHidden: !1,
+      readonly: true,
+      onSearchClear: "",
+      dialogModel: '1',
+      systemDialogUrl: null,
+      accessType: "1",
+      onCreated: "",
+      onMounted: "",
+      onChange: "",
+      onAppendButtonClick: "",
+      clickBindEvent: '1',
+      searchDialogConfig: {
+        ...defaultSearchDialogConfig,
+        multipleChoices: false,
+        formCode: "user_dialog",
+        valueSourceField: "id",
+        labelSourceField: "nick_name",
+      },
+      ...defaultWfConfig,
+      valueField: null,
+      multipleChoices: false,
+
+      showRuleFlag: 1,
+      showRuleEnabled: 1,
+      showRules: []
+
+    }
+  },
+  {
+    type: "saleOrg-vabsearch",
+    targetType: "vabsearch",
+    icon: "searchbox",
+    commonFlag: !0,
+    columnFlag: true,
+    formItemFlag: !0,
+    tableField: null,
+    options: {
+      name: "",
+      keyNameEnabled: !1,
+      keyName: "",
+      vabSearchName: "sale_org_name",
+      userDefaultVabSearch:false,
+      saleOrgDefaultVabSearch:false,
+      label: "机构",
+      submitFlag: true,
+      disabled: !1,
+      hidden: !1,
+      required: !1,
+      labelWidth: null,
+      labelHidden: !1,
+      readonly: true,
+      onSearchClear: "",
+      dialogModel: '1',
+      systemDialogUrl: null,
+      accessType: "1",
+      onCreated: "",
+      onMounted: "",
+      onChange: "",
+      onAppendButtonClick: "",
+      clickBindEvent: '1',
+      searchDialogConfig: {
+        ...defaultSearchDialogConfig,
+        multipleChoices: false,
+        formCode: "sale_org_dialog",
+        valueSourceField: "id",
+        labelSourceField: "name"
+      },
+      ...defaultWfConfig,
+      valueField: null,
+      multipleChoices: false,
+
+      showRuleFlag: 1,
+      showRuleEnabled: 1,
+      showRules: []
+
+    }
+  },
+  {
+    type: "role-vabsearch",
+    targetType: "vabsearch",
+    icon: "searchbox",
+    commonFlag: !0,
+    columnFlag: true,
+    formItemFlag: !0,
+    tableField: null,
+    options: {
+      name: "",
+      keyNameEnabled: !1,
+      keyName: "",
+      vabSearchName: "role_name",
+      userDefaultVabSearch:false,
+      saleOrgDefaultVabSearch:false,
+      label: "角色",
+      submitFlag: true,
+      disabled: !1,
+      hidden: !1,
+      required: !1,
+      labelWidth: null,
+      labelHidden: !1,
+      readonly: true,
+      onSearchClear: "",
+      dialogModel: '1',
+      systemDialogUrl: null,
+      accessType: "1",
+      onCreated: "",
+      onMounted: "",
+      onChange: "",
+      onAppendButtonClick: "",
+      clickBindEvent: '1',
+      searchDialogConfig: {
+        ...defaultSearchDialogConfig,
+        multipleChoices: false,
+        formCode: "role_dialog",
+        valueSourceField: "id",
+        labelSourceField: "name"
+      },
+      ...defaultWfConfig,
+      valueField: null,
+      multipleChoices: false,
+
+      showRuleFlag: 1,
+      showRuleEnabled: 1,
+      showRules: []
+
+    }
+  },
+
 ]
 
 export const keyNamePrefixMap = {

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;

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

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