cloud-web-corejs 1.0.54-dev.150 → 1.0.54-dev.152

package/package.json

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

package/src/components/baseAttachment/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <span>
+  <span class="p10">
     <template v-if="edit || !!imageUrl">
       <el-tooltip :enterable="false" effect="dark" :content="fileName" placement="top"
                   popper-class="tooltip-skin" :disabled="!fileName">
@@ -45,5 +45,5 @@ export default {
 </script>
 
 <style scoped>
-
+.p10 .a-link{padding-right:10px;margin-right:10px;}
 </style>

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

@@ -129,7 +129,6 @@ export default {
   },
   methods: {
     initOption(){
-      debugger
       this.option = {
         title: '附件',
         edit: !this.field.options.disabled,

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

@@ -350,7 +350,7 @@ modules = {
             this.subFormRowId === c &&
             this.setValue(u, !0);
         }),
-        /*this.$on("calculate-formula", (o) => {
+        this.$on("calculate-formula", (o) => {
           if (
             !!this.field.options.formulaEnabled
             && !!this.field.options.formula
@@ -383,7 +383,7 @@ modules = {
               this.getFormRef()
             );
           }
-        }),*/
+        }),
         this.$on("loadOptionItemsFromDataSet", (o) => {
           this.loadOptionItemsFromDataSet(o), (this.dataSetLoadedFlag = !0);
         }),

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

@@ -9,11 +9,17 @@
 -->
 
 <template>
-  <div class="field-wrapper" :class="{'design-time-bottom-margin': !!this.designer}" v-show="!field.options.hidden || (designState === true)">
+  <div class="field-wrapper" :class="{'design-time-bottom-margin': !!this.designer}"
+       v-show="!field.options.hidden || (designState === true)">
     <div>
       <template v-if="formItemProp=='false'">
         <template v-if="!field.options.hidden">
-          <slot></slot>
+          <template v-if="showType === 0">
+            <slot></slot>
+          </template>
+          <template v-else>
+            <span>{{ getShowValue() }}</span>
+          </template>
         </template>
       </template>
       <template v-else>
@@ -24,7 +30,8 @@
                       :class="[selected ? 'selected' : '', labelAlign, customClass, field.options.required ? 'required' : '']"
                       @click.native.stop="selectField(field)">
 
-          <span v-if="!!field.options.labelIconClass" slot="label" class="custom-label" :style="{'color':field.options.labelColor}">
+          <span v-if="!!field.options.labelIconClass" slot="label" class="custom-label"
+                :style="{'color':field.options.labelColor}">
             <template v-if="field.options.labelIconPosition === 'front'">
               <template v-if="!!field.options.labelTooltip">
                 <el-tooltip :content="field.options.labelTooltip" effect="light">
@@ -40,10 +47,15 @@
                 {{ label }}<i :class="field.options.labelIconClass"></i></template>
             </template>
           </span>
-          <span v-if="!!field.options.labelColor" slot="label"  :style="{'color':field.options.labelColor}">
+          <span v-if="!!field.options.labelColor" slot="label" :style="{'color':field.options.labelColor}">
             {{ label }}
           </span>
-          <slot></slot>
+          <template v-if="showType === 0">
+            <slot></slot>
+          </template>
+          <template v-else>
+            <span>{{ getShowValue() }}</span>
+          </template>
         </el-form-item>
       </template>
     </div>
@@ -162,8 +174,14 @@ export default {
     },
 
   },
+  data() {
+    return {
+      showType: 0
+    }
+  },
   created() {
     //
+    this.initShowType();
   },
   methods: {
     isSubFormItem() {
@@ -254,7 +272,118 @@ export default {
     },
     getI18nLabel(label, path, param) {
       return !this.designState && label ? this.$t2(label, path, param) : label;
-    }
+    },
+    initShowType() {
+      let that = this.$parent
+      let formRef = that.getFormRef();
+      let bdService = formRef.bdService;
+      let companyCode = this.$store.getters.companyCode;
+      let loginAccount = this.$store.getters.loginAccount;
+
+      let userSaleOrgDTOs = formRef.userSaleOrgDTOs;
+      let userRoleDTOs = formRef.userRoleDTOs;
+
+      let saleOrgCodeList = userSaleOrgDTOs.map(item => item.sn);
+      let roleCodeList = userRoleDTOs.map(item => item.roleCode);
+
+      let optionModel = this.field.options;
+
+      let flag = 0;//0 原本组件，1明文文本，2密文文本
+      if (optionModel.showTextEnabled) {
+        flag = 1;
+      } else if (optionModel.showEncryptTextEnabled) {
+        flag = 2;
+      }
+      if (optionModel.userTextRuleEnabled) {
+        let userTextRuleConfig = optionModel.userTextRuleConfig || [];
+        userTextRuleConfig.forEach(item => {
+          let type = item.type ?? null;
+          if (type !== null && type !== "") {
+            let companyCodeStr = item.companyCodes;
+            let companyCodes = companyCodeStr ? companyCodeStr.split(",").filter(item => !!item) : [];
+/*
+
+            let loginAccountStr = item.loginAccounts;
+            let loginAccounts = loginAccountStr ? loginAccountStr.split(",").filter(item => !!item) : [];
+
+            let saleOrgCodeStr = item.saleOrgCodes;
+            let saleOrgCodes = saleOrgCodeStr ? saleOrgCodeStr.split(",").filter(item => !!item) : [];
+*/
+
+            let roleCodeStr = item.roleCodes;
+            let roleCodes = roleCodeStr ? roleCodeStr.split(",").filter(item => !!item) : [];
+
+            let flag1 = !item.serveName || item.serveName == bdService;
+            let flag2 = !companyCodes.length || companyCodes.includes(companyCode)
+            // let flag3 = !loginAccounts.length || loginAccounts.includes(loginAccount)
+            // let flag4 = this.compareToList(saleOrgCodes, saleOrgCodeList)
+            let flag5 = this.compareToList(roleCodes, roleCodeList)
+            let result = flag1 && flag2 && flag5 ;
+            if (result) {
+              flag = type;
+            }
+          }
+        })
+      }
+      this.showType = flag;
+    },
+    compareToList(list1, list2) {
+      if (!list1.length) {
+        return true;
+      }
+      if (!list2.length) {
+        return false;
+      }
+      return list1.some(item => {
+        return list2.some(item2 => item == item2)
+      });
+    },
+    getShowValue() {
+      let fieldModel = this.$parent.fieldModel;
+      let showValue = fieldModel
+      if (this.showType == 2) {
+        let optionModel = this.field.options;
+        showValue = "*******";
+        if ((optionModel.textRule1 || optionModel.textRule2 || optionModel.textRule3)) {
+          if (fieldModel && !optionModel.textRule1) {
+            let size = fieldModel.length;
+            let optionModel = this.field.options;
+
+            let str1 = "";
+            let str2 = "";
+            let flag2 = optionModel.textRule2 && optionModel.textRule2Number;
+            let flag3 = optionModel.textRule3 && optionModel.textRule3Number;
+            if (flag2) {
+              if (size >= optionModel.textRule2Number) {
+                str1 = fieldModel.slice(0, optionModel.textRule2Number)
+              }
+            }
+            if (flag3) {
+              if (size >= optionModel.textRule3Number) {
+                str2 = fieldModel.slice(0, optionModel.textRule3Number)
+              }
+            }
+            if (flag2 && flag3) {
+              if (size >= optionModel.textRule2Number + optionModel.textRule3Number) {
+                showValue = str1 + "*****" + str2;
+              }
+            } else if (flag2) {
+              if (str1) {
+                showValue = str1 + "*****"
+              }
+            } else if (flag3) {
+              if (str2) {
+                showValue = "*****" + str2
+              }
+            }
+
+          }
+        }
+
+      }
+
+      return showValue;
+    },
 
   }
 }

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

@@ -672,7 +672,6 @@ modules = {
       this.$emit("customConfirm",fJson)
     },
     saveReportTemplate() {
-      debugger
       if(this.columnFlag){
         this.handleColumnConfirm();
         return

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

@@ -48,14 +48,13 @@ export default {
   },
   created() {
     let zIndex = PopupManager.nextZIndex();
-    debugger
     this.zIndex = zIndex;
 
     let formTemplate = this.getReportTemplate();
     this.formTemplate = formTemplate;
     this.formCode = formTemplate.formCode
     this.formName = formTemplate.formName
-    debugger
+
     this.widgetList = this.$baseLodash.cloneDeep(this.column.widgetList || [])
     this.showDesingerDialog = true
 
@@ -82,7 +81,6 @@ export default {
       this.$emit('reflushTemplateList')
     },
     customConfirm(formJson) {
-      debugger
       let widgetList = formJson.widgetList;
       this.handleFormDesignClose();
       this.$emit('confirm', widgetList)

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

@@ -552,6 +552,14 @@ export default {
               value: "editSelect",
               label: "下拉框",
             },
+            {
+              value: "checkbox",
+              label: "复选框",
+            },
+            {
+              value: "radio",
+              label: "单选框",
+            },
             {
               value: "editAttachment",
               label: "附件",
@@ -564,6 +572,10 @@ export default {
               value: "editStatus",
               label: "状态",
             },
+            {
+              value: "text",
+              label: "文本",
+            },
             {
               value: "editDelete",
               label: "删除按钮",
@@ -731,6 +743,9 @@ export default {
         moveUpRow: "a-link",
         moveDownRow: "a-link",
         removeTreeRow: "a-link",
+        text: "text",
+        checkbox: "checkbox",
+        radio: "radio",
       },
 
       showFormEventDialogFlag: false,

package/src/components/xform/form-designer/setting-panel/property-editor/container-grid-col/grid-col-offset-editor.vue

@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.colOffsetTitle')">
-    <el-input-number v-model.number="optionModel.offset" :min="0" :max="24"
+    <el-input-number v-model.number="optionModel.offset" :max="24"
                      style="width: 100%"></el-input-number>
   </el-form-item>
 </template>

package/src/components/xform/form-designer/setting-panel/property-editor/container-grid-col/grid-col-pull-editor.vue

@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.colPullTitle')">
-    <el-input-number v-model.number="optionModel.pull" :min="0" :max="24"
+    <el-input-number v-model.number="optionModel.pull" :max="24"
                      style="width: 100%"></el-input-number>
   </el-form-item>
 </template>

package/src/components/xform/form-designer/setting-panel/property-editor/container-grid-col/grid-col-push-editor.vue

@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.colPushTitle')">
-    <el-input-number v-model.number="optionModel.push" :min="0" :max="24"
+    <el-input-number v-model.number="optionModel.push" :max="24"
                      style="width: 100%"></el-input-number>
   </el-form-item>
 </template>

package/src/components/xform/form-designer/setting-panel/property-editor/field-rate/rate-defaultValue-editor.vue

@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.defaultValue')">
-    <el-input-number v-model="optionModel.defaultValue" :min="0" :max="optionModel.max" style="width: 100%"
+    <el-input-number v-model="optionModel.defaultValue" :max="optionModel.max" style="width: 100%"
                      @change="emitDefaultValueChange">
     </el-input-number>
   </el-form-item>

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

@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.multipleLimit')">
-    <el-input-number v-model="optionModel.multipleLimit" :min="0"
+    <el-input-number v-model="optionModel.multipleLimit"
                      class="hide-spin-button" style="width: 100%"></el-input-number>
   </el-form-item>
 </template>

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

@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.precision')">
-    <el-input-number v-model="optionModel.precision" :min="0" class="hide-spin-button" style="width: 100%"></el-input-number>
+    <el-input-number v-model="optionModel.precision" class="hide-spin-button" style="width: 100%"></el-input-number>
   </el-form-item>
 </template>
 

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

@@ -1,26 +1,148 @@
 <template>
-  <div v-show="false">
+  <div v-show="true">
     <el-form-item label-width="0">
-      <el-divider class="custom-divider-margin-top">文本显示设置</el-divider>
+      <el-divider class="custom-divider-margin-top">显示设置</el-divider>
     </el-form-item>
-    <el-form-item :label="i18nt('全部显示为*')">
-      <el-switch v-model="optionModel.textRule1" @change="changeTextRule1"></el-switch>
+    <el-form-item :label="i18nt('仅显示明文文本')">
+      <el-switch v-model="optionModel.showTextEnabled" @change="optionModel.showEncryptTextEnabled=false"></el-switch>
     </el-form-item>
-    <el-form-item :label="i18nt('前面明文，其他为*')">
-      <el-switch v-model="optionModel.textRule2" @change="changeTextRule2"></el-switch>
+    <el-form-item :label="i18nt('仅显示密文文本')">
+      <el-switch v-model="optionModel.showEncryptTextEnabled" @change="optionModel.showTextEnabled=false"></el-switch>
     </el-form-item>
-    <el-form-item :label="i18nt('前面明文位数')">
-      <base-input-number v-model="optionModel.textRule2Number" :scale="0"></base-input-number>
+    <el-form-item :label="i18nt('启用特定用户显示规则设置')">
+      <el-switch v-model="optionModel.userTextRuleEnabled"></el-switch>
     </el-form-item>
-    <el-form-item :label="i18nt('后面明文，其他为*')">
-      <el-switch v-model="optionModel.textRule3" @change="changeTextRule3"></el-switch>
-    </el-form-item>
-    <el-form-item :label="i18nt('后面明文位数')">
-      <base-input-number v-model="optionModel.textRule3Number" :scale="0"></base-input-number>
-    </el-form-item>
-    <el-form-item label-width="0">
-      <el-divider class="custom-divider-margin-top"></el-divider>
+    <el-form-item :label="i18nt('特定用户显示规则设置')" v-if="optionModel.userTextRuleEnabled">
+      <a href="javascript:void(0);" class="a-link link-oneLind" @click="openDialog">
+        <span>{{ optionModel.userTextRuleConfig && optionModel.userTextRuleConfig.length ? "已维护" : "" }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
     </el-form-item>
+    <template v-if="optionModel.showEncryptTextEnabled || optionModel.userTextRuleEnabled">
+      <el-form-item label-width="0">
+        <el-divider class="custom-divider-margin-top">密文显示规则</el-divider>
+      </el-form-item>
+      <el-form-item :label="i18nt('全部显示为*')">
+        <el-switch v-model="optionModel.textRule1" @change="changeTextRule1"
+                   :disabled="optionModel.textRule1 && !optionModel.textRule2 && !optionModel.textRule3"></el-switch>
+      </el-form-item>
+      <el-form-item :label="i18nt('前面明文，其他为*')">
+        <el-switch v-model="optionModel.textRule2" @change="changeTextRule2"></el-switch>
+      </el-form-item>
+      <el-form-item :label="i18nt('前面明文位数')">
+        <base-input-number v-model="optionModel.textRule2Number" :scale="0"></base-input-number>
+      </el-form-item>
+      <el-form-item :label="i18nt('后面明文，其他为*')">
+        <el-switch v-model="optionModel.textRule3" @change="changeTextRule3"></el-switch>
+      </el-form-item>
+      <el-form-item :label="i18nt('后面明文位数')">
+        <base-input-number v-model="optionModel.textRule3Number" :scale="0"></base-input-number>
+      </el-form-item>
+      <el-form-item label-width="0">
+        <el-divider class="custom-divider-margin-top"></el-divider>
+      </el-form-item>
+    </template>
+    <el-dialog
+      v-if="dialogVisible"
+      custom-class="dialog-style list-dialog"
+      :title="i18nt('特定用户显示规则设置')"
+      :visible.sync="dialogVisible"
+      :show-close="!0"
+      :append-to-body="true"
+      :modal="false"
+      :close-on-click-modal="!1"
+      :close-on-press-escape="!1"
+      :destroy-on-close="!0"
+      width="1220px"
+      top="5vh"
+      v-dialog-drag
+      :fullscreen="true"
+    >
+      <div class="cont" style="padding-bottom: 8px;">
+        <el-table
+          ref="singleTable"
+          width="100%"
+          :data="tableData"
+          height="100%"
+          border=""
+          row-key="columnId"
+          stripe=""
+          style="margin-bottom: 0px;"
+        >
+          <el-table-column type="index" width="35" fixed="left"></el-table-column>
+          <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>
+                <el-option :value="2" label="UAT"></el-option>
+                <el-option :value="3" label="测试"></el-option>
+                <el-option :value="4" label="自定义"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('自定义服务')" width="150">
+            <template slot-scope="{row}">
+              <el-input v-model="row.serveName" clearable :disabled="row.serveType!==4"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('组织编码')" width="250">
+            <template slot-scope="{row,$index}">
+              <el-input v-model="row.companyCodes" clearable></el-input>
+            </template>
+          </el-table-column>
+          <!--          <el-table-column :label="i18nt('登录名')" width="150">
+                      <template slot-scope="{row}">
+                        <el-input v-model="row.loginAccounts" clearable></el-input>
+                      </template>
+                    </el-table-column>-->
+          <el-table-column :label="i18nt('角色编码')" width="250">
+            <template slot-scope="{row}">
+              <el-input v-model="row.roleCodes" clearable></el-input>
+            </template>
+          </el-table-column>
+          <!--          <el-table-column :label="i18nt('机构编码')" width="150">
+                      <template slot-scope="{row}">
+                        <el-input v-model="row.saleOrgCodes" clearable></el-input>
+                      </template>
+                    </el-table-column>-->
+          <el-table-column :label="i18nt('设置')" width="150">
+            <template slot-scope="{row}">
+              <el-select v-model="row.type" clearable>
+                <el-option :value="1" label="明文文本显示"></el-option>
+                <el-option :value="2" label="密文文本显示"></el-option>
+                <el-option :value="0" label="组件显示"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('designer.setting.actionColumn')" width="100" align="center">
+            <template #header>
+              <span>{{ i18nt('designer.setting.actionColumn') }}</span>
+              <el-button :title="i18nt('designer.setting.addTableColumn')" size="mini" type="" circle=""
+                         icon="el-icon-plus" @click="addItem"></el-button>
+            </template>
+            <template slot-scope="scope">
+              <el-button
+                :title="i18nt('designer.setting.deleteTableColumn')"
+                size="mini"
+                type=""
+                circle=""
+                icon="el-icon-minus"
+                @click="tableData.splice(scope.$index,1)"
+              ></el-button>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </div>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="dialogVisible = false" class="button-sty" icon="el-icon-close">
+          {{ i18nt('designer.hint.cancel') }}
+        </el-button>
+        <el-button type="primary" @click="colSubmit" class="button-sty" icon="el-icon-check">
+          {{ i18nt('designer.hint.confirm') }}
+        </el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -37,7 +159,8 @@ export default {
   },
   data() {
     return {
-
+      dialogVisible: false,
+      tableData: [],
     }
   },
   methods: {
@@ -46,13 +169,40 @@ export default {
       this.optionModel.textRule3 = false;
       this.optionModel.textRule2Number = null;
       this.optionModel.textRule3Number = null;
+      this.$forceUpdate()
     },
     changeTextRule2(val) {
-      this.optionModel.textRule1 = false;
+      let textRule1 = !this.optionModel.textRule2 && !this.optionModel.textRule3;
+      this.optionModel.textRule1 = textRule1;
+      this.$forceUpdate()
     },
     changeTextRule3(val) {
-      this.optionModel.textRule1 = false;
-    }
+      let textRule1 = !this.optionModel.textRule2 && !this.optionModel.textRule3;
+      this.optionModel.textRule1 = textRule1;
+      this.$forceUpdate()
+    },
+    openDialog() {
+      let userTextRuleConfig = this.optionModel.userTextRuleConfig || [];
+      this.tableData = this.$baseLodash.cloneDeep(userTextRuleConfig)
+      this.dialogVisible = true;
+
+    },
+    addItem() {
+      let newItem = {
+        type: null,
+        serveType: null,
+        serveName: null,
+        // loginAccounts: null,
+        roleCodes: null,
+        // saleOrgCodes: null,
+        companyCodes: null
+      }
+      this.tableData.push(newItem);
+    },
+    colSubmit() {
+      this.dialogVisible = !1;
+      this.optionModel.userTextRuleConfig = this.tableData;
+    },
   }
 }
 </script>