cloud-web-corejs 1.0.108 → 1.0.110

package/src/components/xform/form-designer/setting-panel/property-editor/widgetShowRuleFlag-editor.vue

@@ -42,7 +42,7 @@
           style="margin-bottom: 0px;"
         >
           <el-table-column type="index" width="35" fixed="left"></el-table-column>
-          <el-table-column :label="i18nt('服务类型')" width="150">
+          <!-- <el-table-column :label="i18nt('服务类型')" width="150">
             <template slot-scope="{row}">
               <el-select v-model="row.serveType" @change="changeServeType(row)">
                 <el-option :value="1" label="正式"></el-option>
@@ -62,7 +62,29 @@
             <template slot-scope="{row,$index}">
               <el-input v-model="row.companyCodes" clearable :disabled="row.serveType==5"></el-input>
             </template>
+          </el-table-column> -->
+
+          <el-table-column :label="i18nt('组织编码')" width="250">
+            <template slot-scope="{row,$index}">
+              <el-input
+                class="search-input"
+                max="200"
+                v-model="row.companyCodes"
+                @clear="clearBdCompanyEnv(row)"
+                v-el-readonly
+                clearable
+              >
+                <i slot="suffix" class="el-input__icon el-icon-search" @click="openBdCompanyEnvDialog($index)"></i>
+              </el-input>
+            </template>
           </el-table-column>
+          <el-table-column :label="i18nt('服务名称')" width="150">
+            <template slot-scope="{row}">
+              {{ row.serveName }}
+            </template>
+          </el-table-column>
+
+
           <el-table-column :label="i18nt('角色编码')" width="250">
             <template slot-scope="{row}">
               <el-input v-model="row.roleCodes" clearable></el-input>
@@ -105,13 +127,17 @@
         </el-button>
       </div>
     </el-dialog>
+    <bdCompanyEnvDialog v-if="showBdCompanyEnvDialog" :visiable.sync="showBdCompanyEnvDialog"
+                        @confirm="confirmBdCompanyEnvDialog" :multi="false"/>
   </div>
 </template>
 <script>
 import i18n from "@base/components/xform/utils/i18n";
+import bdCompanyEnvDialog from "@base/views/bd/setting/bd_company_env/dialog"
 
 export default {
   name: "widgetShowRuleFlag-editor",
+  components: {bdCompanyEnvDialog},
   mixins: [i18n],
   props: {
     designer: Object,
@@ -122,6 +148,7 @@ export default {
     return {
       dialogVisible: false,
       tableData: [],
+      showBdCompanyEnvDialog: false
     }
   },
   methods: {
@@ -134,7 +161,7 @@ export default {
       let newItem = {
         type: 1,
         serveType: 3,
-        serveName: "dev",
+        serveName: null,
         roleCodes: null,
         companyCodes: null
       }
@@ -142,19 +169,25 @@ export default {
     },
     colSubmit() {
 
-      /*if(this.tableData.some(item=>!item.roleCodes)){
-        this.$message({
-          type:"error",
-          content:"角色编码不能为空"
-        })
-        return
-      }*/
-
-      let searveNameList = ["prod", "uat", "dev"];
       let tableData = this.tableData;
       let map = {}
+
       for (let i = 0; i < tableData.length; i++) {
         let item = tableData[i];
+        if (!item.serveName) {
+          this.$message({
+            type: "error",
+            message: "服务名称不能为空",
+          });
+          return
+        }
+        if (!item.companyCodes) {
+          this.$message({
+            type: "error",
+            message: "组织编码不能为空",
+          });
+          return
+        }
         if (!item.roleCodes) {
           this.$message({
             type: "error",
@@ -162,33 +195,25 @@ export default {
           })
           return
         }
-        if (item.serveType === 4) {
-          if (!item.serveName) {
-            this.$message({
-              type: "error",
-              message: "自定义服务的服务名称不能为空"
-            })
-            return
-          } else if(searveNameList.includes(item.serveName)){
-            this.$message({
-              type: "error",
-              message: "自定义服务的服务名称不能为`prod,uat,dev`"
-            })
-            return
-          }
+        if (!item.type) {
+          this.$message({
+            type: "error",
+            message: "设置不能为空"
+          })
+          return
         }
-        let serveName = item.serveName || "";
-        if (item.serveType === 5) serveName = "_all";
-        let companyCodes = item.companyCodes || "";
+
+        let serveName = item.serveName;
+        let companyCodes = item.companyCodes;
         let key = serveName + "_" + companyCodes;
         if (!map[key]) {
           map[key] = true;
         } else {
           this.$message({
             type: "error",
-            message: "[服务+组织]不能重复"
-          })
-          return
+            message: "[服务+组织]不能重复",
+          });
+          return;
         }
       }
 
@@ -212,6 +237,24 @@ export default {
       }
       row.serveName = serveName;
     },
+
+    clearBdCompanyEnv(row) {
+      row.serveName = null;
+      row.companyCodes = null;
+    },
+    openBdCompanyEnvDialog(rowIndex) {
+      this.operateIndex = rowIndex;
+      this.showBdCompanyEnvDialog = true;
+    },
+    confirmBdCompanyEnvDialog(rows) {
+      if (rows.length) {
+        let row = rows[0];
+        let item = this.tableData[this.operateIndex]
+        item.serveName = row.bdService;
+        item.companyCodes = row.bdCompanyCode;
+      }
+    }
+
   }
 }
 </script>

package/src/components/xform/form-designer/setting-panel/propertyRegister.js

@@ -30,8 +30,8 @@ const COMMON_PROPERTIES = {
   'rows': 'rows-editor',
   'required': 'required-editor',
   // 'requiredHint': 'requiredHint-editor',
-  // 'validation': 'validation-editor',
-  // 'validationHint': 'validationHint-editor',
+  'validation': 'validation-editor',
+  'validationHint': 'validationHint-editor',
   'readonly': 'readonly-editor',
   'disabled': 'disabled-editor',
   'hidden': 'hidden-editor',
@@ -157,6 +157,7 @@ const COMMON_PROPERTIES = {
   "tagFormCode": "project-tag-editor",
   "autoValueEnabled": "autoValueEnabled-editor",
   // "commonAttributeEnabled": "commonAttributeEnabled-editor"
+  "colorClass": "colorClass-editor",
 }
 
 const ADVANCED_PROPERTIES = {
@@ -168,7 +169,7 @@ const ADVANCED_PROPERTIES = {
   'controlsPosition': 'controlsPosition-editor',
   'minLength': 'minLength-editor',
   'maxLength': 'maxLength-editor',
-  'showWordLimit': 'showWordLimit-editor',
+  // 'showWordLimit': 'showWordLimit-editor',
   'prefixIcon': 'prefixIcon-editor',
   'suffixIcon': 'suffixIcon-editor',
   'switchWidth': 'switchWidth-editor',
@@ -188,12 +189,12 @@ const ADVANCED_PROPERTIES = {
   'round': 'round-editor',
   'circle': 'circle-editor',
   'icon': 'icon-editor',
-  'labelIconClass': 'labelIconClass-editor',
-  'labelIconPosition': 'labelIconPosition-editor',
-  'labelTooltip': 'labelTooltip-editor',
-  'appendButton': 'appendButton-editor',
-  'appendButtonDisabled': 'appendButtonDisabled-editor',
-  'buttonIcon': 'buttonIcon-editor',
+  // 'labelIconClass': 'labelIconClass-editor',
+  // 'labelIconPosition': 'labelIconPosition-editor',
+  // 'labelTooltip': 'labelTooltip-editor',
+  // 'appendButton': 'appendButton-editor',
+  // 'appendButtonDisabled': 'appendButtonDisabled-editor',
+  // 'buttonIcon': 'buttonIcon-editor',
 
 
 }

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

@@ -441,8 +441,9 @@ export const containers = [
       customClass: "",
       tableRef: "",
       detailPaneContainer: true,
-      onCreated: "",
-      onMounted: "",
+      defaultCollapse: false,
+      /*onCreated: "",
+      onMounted: "",*/
     }
   },
   {
@@ -816,6 +817,7 @@ const vabsearchConfig = {
   userDefaultVabSearch: false,
   saleOrgDefaultVabSearch: false,
   label: "",
+  labelColor: '',
   submitFlag: true,
   disabled: !1,
   hidden: !1,
@@ -843,6 +845,7 @@ const vabsearchConfig = {
   onChange: "",
   onAppendButtonClick: "",
   clickBindEvent: '1',
+  onBeforeClickButton:null,
   searchDialogConfig: {
     ...defaultSearchDialogConfig,
     multipleChoices: false
@@ -862,6 +865,7 @@ const projectTagConfig = {
   keyName: "",
   // keyNameSuffix: "",
   label: "",
+  labelColor: '',
   submitFlag: true,
   disabled: !1,
   readonly: false,
@@ -921,6 +925,7 @@ export const basicFields = [
       keyNameEnabled: !1,
       keyName: "",
       label: "",
+      labelColor: '',
       submitFlag: true,
       /**showText: false,*/
       formField: "",
@@ -950,9 +955,9 @@ export const basicFields = [
       showWordLimit: !1,
       prefixIcon: "",
       suffixIcon: "",
-      appendButton: !1,
+      /*appendButton: !1,
       appendButtonDisabled: !1,
-      buttonIcon: "el-icon-search",
+      buttonIcon: "el-icon-search",*/
       onCreated: "",
       onMounted: "",
       onInput: "",
@@ -984,6 +989,7 @@ export const basicFields = [
       keyNameEnabled: !1,
       keyName: "",
       label: "",
+      labelColor: '',
       submitFlag: true,
       formField: "",
       labelAlign: "",
@@ -1004,7 +1010,7 @@ export const basicFields = [
       validation: "",
       validationHint: "",
       customClass: "",
-      labelIconClass: null,
+      /*labelIconClass: null,
       labelIconPosition: "rear",
       labelTooltip: null,
       minLength: null,
@@ -1014,7 +1020,7 @@ export const basicFields = [
       suffixIcon: "",
       appendButton: !1,
       appendButtonDisabled: !1,
-      buttonIcon: "el-icon-search",
+      buttonIcon: "el-icon-search",*/
       onCreated: "",
       onMounted: "",
       onInput: "",
@@ -1022,7 +1028,7 @@ export const basicFields = [
       onFocus: "",
       onBlur: "",
       onValidate: "",
-      onAppendButtonClick: "",
+      // onAppendButtonClick: "",
       widgetWidth: "",
       accessType: "1",
       ...defaultWfConfig,
@@ -1046,6 +1052,7 @@ export const basicFields = [
       keyNameEnabled: !1,
       keyName: "",
       label: "",
+      labelColor: '',
       submitFlag: true,
       /**showText: false,*/
       labelAlign: "",
@@ -1099,6 +1106,7 @@ export const basicFields = [
       keyNameEnabled: !1,
       keyName: "",
       label: "",
+      labelColor: '',
       submitFlag: true,
       /**showText: false,*/
       formField: "",
@@ -1155,6 +1163,7 @@ export const basicFields = [
       keyNameEnabled: !1,
       keyName: "",
       label: "",
+      labelColor: '',
       submitFlag: true,
       /**showText: false,*/
       labelAlign: "",
@@ -1225,6 +1234,7 @@ export const basicFields = [
       keyNameEnabled: !1,
       keyName: "",
       label: "",
+      labelColor: '',
       submitFlag: true,
       /**showText: false,*/
       labelAlign: "",
@@ -1296,6 +1306,7 @@ export const basicFields = [
       keyNameEnabled: !1,
       keyName: "",
       label: "",
+      labelColor: '',
       submitFlag: true,
       /**showText: false,*/
       formField: "",
@@ -1378,6 +1389,7 @@ export const basicFields = [
       keyNameEnabled: !1,
       keyName: "",
       label: "",
+      labelColor: '',
       submitFlag: true,
       /**showText: false,*/
       formField: "",
@@ -1431,6 +1443,7 @@ export const basicFields = [
       keyNameEnabled: !1,
       keyName: "",
       label: "",
+      labelColor: '',
       submitFlag: true,
       formField: "",
       labelAlign: "",
@@ -1483,6 +1496,7 @@ export const basicFields = [
       keyNameEnabled: !1,
       keyName: "",
       label: "",
+      labelColor: '',
       submitFlag: true,
       /**showText: false,*/
       formField: "",
@@ -1538,6 +1552,7 @@ export const basicFields = [
       keyNameEnabled: !1,
       keyName: "",
       label: "",
+      labelColor: '',
       submitFlag: true,
       formField: "",
       labelAlign: "",
@@ -1733,9 +1748,9 @@ export const basicFields = [
   {
     type: "html-text",
     icon: "html-text",
-    commonFlag: !0,
+    commonFlag: !1,
     formItemFlag: !1,
-    columnFlag: true,
+    columnFlag: false,
     options: {
       name: "",
       columnWidth: "200px",
@@ -1796,6 +1811,7 @@ export const basicFields = [
       onClick: "",
       accessType: "1",
       clickBindEvent: null,
+      onBeforeClickButton:null,
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
@@ -1898,11 +1914,13 @@ export const basicFields = [
       keyNameEnabled: !1,
       keyName: "",
       label: "",
+      labelColor: '',
       submitFlag: true,
       formField: "",
       hidden: !1,
       required: !1,
       customClass: "",
+      colorClass: "",
       defaultValue: "",
       labelAlign: "",
       labelWidth: null,
@@ -1910,7 +1928,6 @@ export const basicFields = [
       onCreated: "",
       onMounted: "",
       accessType: "1",
-      labelColor: '#555555',
       ...defaultWfConfig,
 
       autoValueEnabled: false,
@@ -1935,6 +1952,7 @@ export const basicFields = [
       keyNameEnabled: !1,
       keyName: "",
       label: "",
+      labelColor: '',
       displayStyle: "block",
       submitFlag: true,
       /**showText: false,*/
@@ -1954,7 +1972,7 @@ export const basicFields = [
       aTextFlag: 1,
       underline: false,
       href: "",
-      coloClass: "f-red",
+      colorClass: "f-red",
 
       onCreated: "",
       onMounted: "",
@@ -1994,12 +2012,13 @@ export const basicFields = [
       aLinkFlag: 1,
       underline: false,
       href: "",
-      coloClass: "f-blue",
+      colorClass: "f-blue",
       isFormLabel: false,
       onCreated: "",
       onMounted: "",
       onClick: "",
       clickBindEvent: null,
+      onBeforeClickButton:null,
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
@@ -2030,10 +2049,11 @@ export const basicFields = [
       aLinkFlag: 1,
       underline: false,
       href: "",
-      coloClass: "f-blue",
+      colorClass: "f-blue",
 
       onClick: "",
       clickBindEvent: null,
+      onBeforeClickButton:null,
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
@@ -2645,6 +2665,7 @@ export const advancedFields = [
       keyName: "",
       keyNameSuffix: "",
       label: "",
+      labelColor: '',
       submitFlag: true,
       disabled: !1,
       hidden: !1,
@@ -2742,6 +2763,7 @@ export const advancedFields = [
       onCreated: "",
       onMounted: "",
       clickBindEvent: '1',
+      onBeforeClickButton:null,
       searchDialogConfig: {
         ...defaultSearchDialogConfig,
         tableEnabled: true
@@ -2781,6 +2803,7 @@ export const advancedFields = [
       accessType: "1",
       saveButton: true,
       clickBindEvent: null,
+      onBeforeClickButton:null,
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
@@ -2820,6 +2843,7 @@ export const advancedFields = [
       onClick: "this.getFormRef().$baseReload()",
       accessType: "1",
       clickBindEvent: null,
+      onBeforeClickButton:null,
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
@@ -2883,6 +2907,7 @@ export const advancedFields = [
       onMounted: "",
       onClick: "",
       clickBindEvent: null,
+      onBeforeClickButton:null,
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
@@ -2919,6 +2944,7 @@ export const advancedFields = [
       onCreated: "",
       onMounted: "",
       // clickBindEvent: null,
+      onBeforeClickButton:null,
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
@@ -2965,6 +2991,7 @@ export const advancedFields = [
       onCreated: "",
       onMounted: "",
       // clickBindEvent: null,
+      onBeforeClickButton:null,
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
@@ -3008,6 +3035,7 @@ export const advancedFields = [
       onCreated: "",
       onMounted: "",
       // clickBindEvent: null,
+      onBeforeClickButton:null,
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
@@ -3033,6 +3061,7 @@ export const advancedFields = [
       keyName: "",
       keyNameSuffix: "",
       label: "",
+      labelColor: '',
       submitFlag: true,
       disabled: !1,
       hidden: !1,
@@ -3065,6 +3094,7 @@ export const advancedFields = [
       keyNameEnabled: !1,
       keyName: "",
       label: "",
+      labelColor: '',
       submitFlag: true,
       disabled: !1,
       hidden: !1,
@@ -3206,6 +3236,7 @@ export const advancedFields = [
 
       onClick: "",
       clickBindEvent: null,
+      onBeforeClickButton:null,
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
@@ -3244,7 +3275,7 @@ export const businessFields = [
       onCreated: "",
       onMounted: "",
       accessType: "1",
-      labelColor: '#555555',
+      labelColor: '',
       ...defaultWfConfig,
 
       autoValueEnabled: false,
@@ -3282,7 +3313,7 @@ export const businessFields = [
       onCreated: "",
       onMounted: "",
       accessType: "1",
-      labelColor: '#555555',
+      labelColor: '',
       ...defaultWfConfig,
 
       autoValueEnabled: false,
@@ -3320,7 +3351,7 @@ export const businessFields = [
       onCreated: "",
       onMounted: "",
       accessType: "1",
-      labelColor: '#555555',
+      labelColor: '',
       ...defaultWfConfig,
 
       autoValueEnabled: false,
@@ -3358,7 +3389,7 @@ export const businessFields = [
       onCreated: "",
       onMounted: "",
       accessType: "1",
-      labelColor: '#555555',
+      labelColor: '',
       ...defaultWfConfig,
 
       autoValueEnabled: false,
@@ -3385,6 +3416,7 @@ export const businessFields = [
       vabSearchName: "nick_name",
       userDefaultVabSearch: true,
       label: "用户",
+      labelColor: '',
       searchDialogConfig: {
         ...defaultSearchDialogConfig,
         multipleChoices: false,
@@ -3407,6 +3439,7 @@ export const businessFields = [
       vabSearchName: "sale_org_name",
       saleOrgDefaultVabSearch: true,
       label: "机构",
+      labelColor: '',
       searchDialogConfig: {
         ...defaultSearchDialogConfig,
         multipleChoices: false,
@@ -3428,6 +3461,7 @@ export const businessFields = [
     options: {
       ...projectTagConfig,
       label: "用户",
+      labelColor: '',
       tagFormCode: "user_dialog",
       tagLabelField: "nick_name",
       tagUniqueField: "id",
@@ -3447,6 +3481,7 @@ export const businessFields = [
     options: {
       ...projectTagConfig,
       label: "机构",
+      labelColor: '',
       tagFormCode: "sale_org_dialog",
       tagLabelField: "name",
       tagUniqueField: "id",

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

@@ -3,7 +3,7 @@
             @resizable-change="$vxeTableUtil.onColumnWitchChange" @custom="$vxeTableUtil.customHandle"
             @checkbox-change="handleCheckboxChange" @checkbox-all="handleCheckboxAll"
             @cell-dblclick="handleCellDblclick" :class="dataTableConfig.class"
-            :data="Object.freeze(fieldModel)"
+            :data="fieldModel"
   >
     <template #form>
       <!--            <div v-if="widget.options.showSearchArea" class="clearfix screen-btns">