cloud-web-corejs 1.0.54-dev.243 → 1.0.54-dev.245

package/package.json

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

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

@@ -104,12 +104,6 @@
               {{ row.serveName }}
             </template>
           </el-table-column>
-          <el-table-column :label="i18nt('加密公式')" width="150">
-            <template slot-scope="{row}">
-              <el-input v-model="row.encryptFormula" 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>
@@ -118,14 +112,17 @@
 
           <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>
@@ -213,14 +210,14 @@ export default {
     },
     addItem() {
       let newItem = {
-        type: null,
+        type: 2,
         serveType: null,
         serveName: null,
         // loginAccounts: null,
         roleCodes: null,
         // saleOrgCodes: null,
         companyCodes: null,
-        encryptFormula:null
+        encryptFormula: null
       }
       this.tableData.push(newItem);
     },
@@ -248,7 +245,14 @@ export default {
         if (!item.encryptFormula) {
           this.$message({
             type: "error",
-            message: "加密公式不能为空",
+            message: "加密规则不能为空",
+          });
+          return
+        }
+        if (!item.type) {
+          this.$message({
+            type: "error",
+            message: "设置不能为空",
           });
           return
         }
@@ -265,10 +269,10 @@ export default {
           });
           return;
         }
-        if(!pattern.test(item.encryptFormula)){
+        if (!pattern.test(item.encryptFormula)) {
           this.$message({
             type: "error",
-            message: `第${i}行的加密公式格式错误`,
+            message: `第${i}行的加密规则格式错误`,
           });
           return;
         }

package/src/views/bd/setting/bd_company_env/edit.vue

@@ -26,7 +26,11 @@
               </th>
               <td>
                 <el-form-item prop="bdService" :rules="[{ required: true, trigger: 'blur' }]">
-                  <el-input type="text" autocomplete="off" v-model="bdCompanyEnv.bdService" clearable/>
+                  <el-select v-model="bdCompanyEnv.bdService">
+                    <el-option value="dev" label="DEV"></el-option>
+                    <el-option value="uat" label="UAT"></el-option>
+                    <el-option value="prod" label="PROD"></el-option>
+                  </el-select>
                 </el-form-item>
               </td>
               <th>

package/src/views/bd/setting/bd_company_env/list.vue

@@ -141,11 +141,18 @@ export default {
           }
         ],
         searchColumns: [
-          {
+          /*{
             title: this.$t1("服务"),
             field: "bdService",
             type: "input",
             common: true,
+          },*/
+          {
+            title: this.$t1('服务'), field: "bdService", type: "select", common: true, itemOption: [
+              {label: "DEV", value: "dev"},
+              {label: "UAT", value: "uat"},
+              {label: "PROD", value: "prod"}
+            ]
           },
           {
             title: this.$t1("组织编码"),