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

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

@@ -801,6 +801,94 @@ export const defaultWidgetShowRuleConfig = {
   widgetShowRuleConfig: [],
 }
 
+const vabsearchConfig = {
+  name: "",
+  keyNameEnabled: !1,
+  keyName: "",
+  vabSearchName: "",
+  userDefaultVabSearch: false,
+  saleOrgDefaultVabSearch: false,
+  label: "",
+  submitFlag: true,
+  disabled: !1,
+  hidden: !1,
+  required: !1,
+  labelWidth: null,
+  labelHidden: !1,
+  readonly: true,
+  /*formCode: null,
+  formName: null,
+  formVersion: null,
+  showFormField: null,*/
+  /* gridConfig: {
+     tableColumns: [],
+     searchFields: [],
+     searchParams: ""
+   },*/
+  // vabSearchField: null,
+  vabsearchFlag: 1,
+  onSearchClear: "",
+  dialogModel: '1',
+  systemDialogUrl: null,
+  accessType: "1",
+  onCreated: "",
+  onMounted: "",
+  onChange: "",
+  onAppendButtonClick: "",
+  clickBindEvent: '1',
+  searchDialogConfig: {
+    ...defaultSearchDialogConfig,
+    multipleChoices: false
+  },
+  ...defaultWfConfig,
+  valueField: null,
+  multipleChoices: false,
+
+  showRuleFlag: 1,
+  showRuleEnabled: 1,
+  showRules: []
+}
+
+const projectTagConfig = {
+  name: "",
+  keyNameEnabled: !1,
+  keyName: "",
+  // keyNameSuffix: "",
+  label: "",
+  submitFlag: true,
+  disabled: !1,
+  readonly: false,
+  hidden: !1,
+  required: !1,
+  labelWidth: null,
+  labelHidden: !1,
+  onCreated: "if(this.dataId)this.loadDataDefaultHandle();",
+  onMounted: "",
+  onClick: "",
+  // vabUpload: 1,
+  formScriptEnabled: true,
+  formScriptCode: "getList",
+  formScriptParam: null,
+  formScriptSuccess: null,
+  ...defaultWfConfig,
+
+  showRuleFlag: 1,
+  showRuleEnabled: 1,
+  showRules: [],
+
+  tagFormCode: null,
+  tagFormParam: null,
+  tagLabelField: null,
+  tagUniqueField: null,
+  tagFormLabelField: null,
+  tagFormUniqueField: null,
+  tagFillConfig: [],
+  tagConfirmCallback: null,
+  tagDeleteCallback: null,
+  tabDeleteEnabled: true,
+
+}
+
 export const basicFields = [
   {
     type: "input",
@@ -2575,51 +2663,29 @@ export const advancedFields = [
     formItemFlag: !0,
     tableField: null,
     options: {
-      name: "",
-      keyNameEnabled: !1,
-      keyName: "",
-      vabSearchName: "",
-      userDefaultVabSearch:false,
-      saleOrgDefaultVabSearch:false,
-      label: "",
-      submitFlag: true,
-      disabled: !1,
-      hidden: !1,
-      required: !1,
-      labelWidth: null,
-      labelHidden: !1,
-      readonly: true,
-      /*formCode: null,
-      formName: null,
-      formVersion: null,
-      showFormField: null,*/
-      /* gridConfig: {
-         tableColumns: [],
-         searchFields: [],
-         searchParams: ""
-       },*/
-      // vabSearchField: null,
-      onSearchClear: "",
-      dialogModel: '1',
-      systemDialogUrl: null,
-      accessType: "1",
-      onCreated: "",
-      onMounted: "",
-      onChange: "",
-      onAppendButtonClick: "",
-      clickBindEvent: '1',
-      searchDialogConfig: {
-        ...defaultSearchDialogConfig,
-        multipleChoices: false
-      },
-      ...defaultWfConfig,
-      valueField: null,
-      multipleChoices: false,
-
-      showRuleFlag: 1,
-      showRuleEnabled: 1,
-      showRules: []
-
+      ...vabsearchConfig
+    }
+  },
+  {
+    type: "singerSearch",
+    icon: "searchbox",
+    // commonFlag: !0,
+    // columnFlag: true,
+    formItemFlag: !0,
+    tableField: null,
+    options: {
+      ...vabsearchConfig
+    }
+  },
+  {
+    type: "multiSearch",
+    icon: "searchbox",
+    // commonFlag: !0,
+    // columnFlag: true,
+    formItemFlag: !0,
+    tableField: null,
+    options: {
+      ...vabsearchConfig
     }
   },
   {
@@ -3039,6 +3105,7 @@ export const advancedFields = [
       showRules: []
     }
   },
+
   {
     type: "project-tag",
     icon: "uploadbox",
@@ -3047,43 +3114,7 @@ export const advancedFields = [
     formItemFlag: !0,
     tableField: null,
     options: {
-      name: "",
-      keyNameEnabled: !1,
-      keyName: "",
-      // keyNameSuffix: "",
-      label: "",
-      submitFlag: true,
-      disabled: !1,
-      readonly: false,
-      hidden: !1,
-      required: !1,
-      labelWidth: null,
-      labelHidden: !1,
-      onCreated: "if(this.dataId)this.loadDataDefaultHandle();",
-      onMounted: "",
-      onClick: "",
-      // vabUpload: 1,
-      formScriptEnabled: true,
-      formScriptCode: "getList",
-      formScriptParam: null,
-      formScriptSuccess: null,
-      ...defaultWfConfig,
-
-      showRuleFlag: 1,
-      showRuleEnabled: 1,
-      showRules: [],
-
-      tagFormCode: null,
-      tagFormParam: null,
-      tagLabelField: null,
-      tagUniqueField: null,
-      tagFormLabelField: null,
-      tagFormUniqueField: null,
-      tagFillConfig: [],
-      tagConfirmCallback: null,
-      tagDeleteCallback: null,
-      tabDeleteEnabled: false,
-
+      ...projectTagConfig
     }
   },
   {
@@ -3318,36 +3349,17 @@ export const businessFields = [
 
   {
     type: "user-vabsearch",
-    targetType: "vabsearch",
+    targetType: "singerSearch",
     icon: "searchbox",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !0,
     tableField: null,
     options: {
-      name: "",
-      keyNameEnabled: !1,
-      keyName: "",
+      ...vabsearchConfig,
       vabSearchName: "nick_name",
-      userDefaultVabSearch:false,
-      saleOrgDefaultVabSearch:false,
+      userDefaultVabSearch: true,
       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,
@@ -3355,48 +3367,21 @@ export const businessFields = [
         valueSourceField: "id",
         labelSourceField: "nick_name",
       },
-      ...defaultWfConfig,
-      valueField: null,
-      multipleChoices: false,
-
-      showRuleFlag: 1,
-      showRuleEnabled: 1,
-      showRules: []
-
     }
   },
   {
     type: "saleOrg-vabsearch",
-    targetType: "vabsearch",
+    targetType: "singerSearch",
     icon: "searchbox",
     commonFlag: !0,
     columnFlag: true,
     formItemFlag: !0,
     tableField: null,
     options: {
-      name: "",
-      keyNameEnabled: !1,
-      keyName: "",
+      ...vabsearchConfig,
       vabSearchName: "sale_org_name",
-      userDefaultVabSearch:false,
-      saleOrgDefaultVabSearch:false,
+      saleOrgDefaultVabSearch: true,
       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,
@@ -3404,66 +3389,50 @@ export const businessFields = [
         valueSourceField: "id",
         labelSourceField: "name"
       },
-      ...defaultWfConfig,
-      valueField: null,
-      multipleChoices: false,
-
-      showRuleFlag: 1,
-      showRuleEnabled: 1,
-      showRules: []
+    }
+  },
 
+  {
+    type: "user-project-tag",
+    targetType: "project-tag",
+    icon: "uploadbox",
+    commonFlag: !0,
+    columnFlag: true,
+    formItemFlag: !0,
+    tableField: null,
+    options: {
+      ...projectTagConfig,
+      label: "用户",
+      tagFormCode: "user_dialog",
+      tagLabelField: "nick_name",
+      tagUniqueField: "id",
+      tagFormLabelField: "nick_name",
+      tagFormUniqueField: "id",
+      tabDeleteEnabled: true,
     }
   },
   {
-    type: "role-vabsearch",
-    targetType: "vabsearch",
-    icon: "searchbox",
+    type: "saleOrg-project-tag",
+    targetType: "project-tag",
+    icon: "uploadbox",
     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: []
+      ...projectTagConfig,
+      label: "机构",
+      tagFormCode: "sale_org_dialog",
+      tagLabelField: "name",
+      tagUniqueField: "id",
+      tagFormLabelField: "name",
+      tagFormUniqueField: "id",
+      tabDeleteEnabled: true,
 
     }
   },
 
+
 ]
 
 export const keyNamePrefixMap = {

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -881,7 +881,7 @@ modules = {
 
               // let formRef = that.getFormRef();
               // let dataTableConfig = formRef.$attrs.dataTableOption || {};
-              if(that.dataTableConfig.queryParam){
+              if (that.dataTableConfig.queryParam) {
                 Object.assign(queryParams, that.dataTableConfig.queryParam);
               }
 
@@ -1394,14 +1394,6 @@ modules = {
       let columnEditFields = null;
 
       let type = this.columnFormatMap[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(
@@ -1512,7 +1504,7 @@ modules = {
         if (!lineWidget) {
           return "false";
         }
-        if (lineWidget?.type == "vabsearch") {
+        if (this.isVabsearchFlagWidget(lineWidget)) {
           let fieldName =
             lineWidget.options.vabSearchName ||
             this.getFieldKeyName(lineWidget);
@@ -1524,6 +1516,10 @@ modules = {
         return "false";
       }
     },
+    isVabsearchFlagWidget(widget) {
+      let type = widget?.type;
+      return type == "vabsearch" || type == "singerSearch" || type == "multiSearch";
+    },
     getColumnWidgetName(e) {
       if (e && e.type) {
         if (e.category == "container") {

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

@@ -257,7 +257,7 @@ modules = {
      * @param {Object} data - 原始对象 支持-数组、key-value对象、字符串
      * @param {String} type hump-转驼峰 toLine-转下划线
      */
-    formatHumpLineTransfer (data, type = 'hump') {
+    formatHumpLineTransfer(data, type = 'hump') {
       let hump = ''
       // 转换对象中的每一个键值为驼峰的递归
       let formatTransferKey = (data) => {
@@ -295,7 +295,7 @@ modules = {
      * @param {String} value
      */
     formatToLine(value) {
-      return value.replace(/([A-Z])/g,"_$1").toLowerCase()
+      return value.replace(/([A-Z])/g, "_$1").toLowerCase()
     },
 
     initUserInfo() {
@@ -304,7 +304,7 @@ modules = {
         method: 'post',
         success: res => {
           let userInfo = res.objx;
-          let row = this.formatHumpLineTransfer(userInfo,"toLine")
+          let row = this.formatHumpLineTransfer(userInfo, "toLine")
           this.userInfo = row;
         }
       });
@@ -1480,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;
               }
@@ -1516,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;
@@ -1626,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

@@ -104,9 +104,10 @@ export default {
       "modify_by-text": "更新人",
       "create_date-text": "创建时间",
       "modfiy_date-text": "更新时间",
-      "user-vabsearch": "用户搜索框",
-      "saleOrg-vabsearch": "机构搜索框",
-      "role-vabsearch": "角色搜索框",
+      "user-vabsearch": "用户（单选）",
+      "saleOrg-vabsearch": "机构（单选）",
+      "user-project-tag": "用户（多选）",
+      "saleOrg-project-tag": "机构（多选）",
     },
     hint: {
       formulaSetting: "公式设置",