cloud-web-corejs 1.0.109 → 1.0.111

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

@@ -12,12 +12,6 @@
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>
-    <el-form-item :label="i18nt('仅显示明文文本')">
-      <el-switch v-model="optionModel.showTextEnabled" @change="optionModel.showEncryptTextEnabled=false;optionModel.showLinkTextEnabled=false;"></el-switch>
-    </el-form-item>
-    <el-form-item :label="i18nt('仅显示密文文本')">
-      <el-switch v-model="optionModel.showEncryptTextEnabled" @change="optionModel.showTextEnabled=false;optionModel.showLinkTextEnabled=false;"></el-switch>
-    </el-form-item>
     <el-form-item :label="i18nt('启用特定用户显示规则设置')">
       <el-switch v-model="optionModel.userTextRuleEnabled"></el-switch>
     </el-form-item>
@@ -27,30 +21,38 @@
         <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-form-item :label="i18nt('仅显示明文文本')">
+          <el-switch v-model="optionModel.showTextEnabled" @change="optionModel.showEncryptTextEnabled=false;optionModel.showLinkTextEnabled=false;"></el-switch>
+        </el-form-item>
+        <el-form-item :label="i18nt('仅显示密文文本')">
+          <el-switch v-model="optionModel.showEncryptTextEnabled" @change="optionModel.showTextEnabled=false;optionModel.showLinkTextEnabled=false;"></el-switch>
+        </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"
@@ -79,51 +81,48 @@
           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>
+          <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="250">
-            <template slot-scope="{row,$index}">
-              <el-input v-model="row.companyCodes" clearable></el-input>
+          <el-table-column :label="i18nt('服务名称')" width="150">
+            <template slot-scope="{ row }">
+              {{ row.serveName }}
             </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-option :value="3" label="超链接显示"></el-option>
+              <el-select v-model="row.type">
+                <el-option :value="1" label="明文"></el-option>
+                <el-option :value="2" label="密文"></el-option>
               </el-select>
             </template>
           </el-table-column>
+          <el-table-column label='加密规则（格式：“3*3”，“3*”，“*3”，“*”，“-”，数值表示明文位数）' width="400">
+            <template slot-scope="{row}">
+              <el-input v-model="row.encryptFormula" clearable></el-input>
+            </template>
+          </el-table-column>
           <el-table-column :label="i18nt('designer.setting.actionColumn')" width="100" align="center">
             <template #header>
               <span>{{ i18nt('designer.setting.actionColumn') }}</span>
@@ -153,14 +152,22 @@
         </el-button>
       </div>
     </el-dialog>
+    <bdCompanyEnvDialog
+      v-if="showBdCompanyEnvDialog"
+      :visiable.sync="showBdCompanyEnvDialog"
+      @confirm="confirmBdCompanyEnvDialog"
+      :multi="false"
+    />
   </div>
 </template>
 
 <script>
 import i18n from "../../../../../components/xform/utils/i18n"
+import bdCompanyEnvDialog from "@base/views/bd/setting/bd_company_env/dialog";
 
 export default {
   name: "textFlag-editor",
+  components: {bdCompanyEnvDialog},
   mixins: [i18n],
   props: {
     designer: Object,
@@ -172,6 +179,9 @@ export default {
     return {
       dialogVisible: false,
       tableData: [],
+
+      operateIndex: 0,
+      showBdCompanyEnvDialog: false,
     }
   },
   methods: {
@@ -200,37 +210,96 @@ export default {
     },
     addItem() {
       let newItem = {
-        type: null,
+        type: 2,
         serveType: null,
         serveName: null,
         // loginAccounts: null,
         roleCodes: null,
         // saleOrgCodes: null,
-        companyCodes: null
+        companyCodes: null,
+        encryptFormula: null
       }
       this.tableData.push(newItem);
     },
     colSubmit() {
+      // 定义正则表达式
+      const pattern = /^(?:\d*\*\d*|-)$/;
+      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.encryptFormula) {
+          this.$message({
+            type: "error",
+            message: "加密规则不能为空",
+          });
+          return
+        }
+        if (!item.type) {
+          this.$message({
+            type: "error",
+            message: "设置不能为空",
+          });
+          return
+        }
+
+        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;
+        }
+        if (!pattern.test(item.encryptFormula)) {
+          this.$message({
+            type: "error",
+            message: `第${i}行的加密规则格式错误`,
+          });
+          return;
+        }
+
+      }
+
       this.dialogVisible = !1;
       this.optionModel.userTextRuleConfig = this.tableData;
     },
-    changeShowLinkTextEnabled(val){
-      this.optionModel.widgetTextLinkConfig = null;''
-      this.optionModel.showEncryptTextEnabled=false;
-      this.optionModel.showTextEnabled=false;
-      if(val){
+    changeShowLinkTextEnabled(val) {
+      this.optionModel.widgetTextLinkConfig = null;
+      ''
+      this.optionModel.showEncryptTextEnabled = false;
+      this.optionModel.showTextEnabled = false;
+      if (val) {
         this.initLinkWidget();
       }
     },
-    initLinkWidget(){
+    initLinkWidget() {
       let widget = null
       let keyName = this.optionModel.keyName;
       let label = this.optionModel.label;
-      if(!this.optionModel.widgetTextLinkConfig){
+      if (!this.optionModel.widgetTextLinkConfig) {
         widget = this.designer.copyNewFieldWidget(this.designer.getFieldWidgetByType("a-link2"));
-        this.$set(this.optionModel,'widgetTextLinkConfig',widget)
+        this.$set(this.optionModel, 'widgetTextLinkConfig', widget)
         widget.options.underline = true;
-      }else{
+      } else {
         widget = this.optionModel.widgetTextLinkConfig
       }
       // widget.options.label = label;
@@ -239,7 +308,7 @@ export default {
       // widget.options.isFormLabel = true
       return widget;
     },
-    openLinkConfig(){
+    openLinkConfig() {
       let widget = this.initLinkWidget();
       this.openWidgetPropertyDialog({
         // row: row,
@@ -251,7 +320,25 @@ export default {
           // this.confirmFormatConfigDialog(columnOption, row);
         },
       });
-    }
+    },
+
+    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/property-editor/validation-editor.vue

@@ -15,9 +15,9 @@
 </template>
 
 <script>
-  import i18n from "../../../../../components/xform/utils/i18n"
+import i18n from "../../../../../components/xform/utils/i18n"
 
-  export default {
+export default {
     name: "validation-editor",
     mixins: [i18n],
     props: {

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

@@ -5,9 +5,9 @@
 </template>
 
 <script>
-  import i18n from "../../../../../components/xform/utils/i18n"
+import i18n from "../../../../../components/xform/utils/i18n"
 
-  export default {
+export default {
     name: "validationHint-editor",
     mixins: [i18n],
     props: {