cloud-web-corejs 1.0.54-dev.242 → 1.0.54-dev.244

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.242",
+  "version": "1.0.54-dev.244",
   "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,7 +104,7 @@
               {{ row.serveName }}
             </template>
           </el-table-column>
-          <el-table-column :label="i18nt('加密公式')" width="150">
+          <el-table-column label='加密规则（格式：“3*3”，“3*”，“*3”，“*”，“-”，数值表示明文位数）' width="400">
             <template slot-scope="{row}">
               <el-input v-model="row.encryptFormula" clearable></el-input>
             </template>
@@ -119,7 +119,7 @@
           <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="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>-->
@@ -213,14 +213,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 +248,14 @@ export default {
         if (!item.encryptFormula) {
           this.$message({
             type: "error",
-            message: "加密公式不能为空",
+            message: "加密规则不能为空",
+          });
+          return
+        }
+        if (!item.type) {
+          this.$message({
+            type: "error",
+            message: "设置不能为空",
           });
           return
         }
@@ -265,10 +272,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/components/xform/form-render/indexMixin.js

@@ -2391,13 +2391,13 @@ modules = {
     },
     validate(callback) {
       this.$refs['renderForm'].$baseValidate(valid => {
-        if(!valid){
-          // this.scrollToFirstError();
-        }
+        /*if(!valid){
+          this.scrollToFirstError();
+        }*/
         callback && callback(valid);
       })
     },
-    scrollToFirstError() {
+    /*scrollToFirstError() {
       // 获取第一个验证失败的字段
       let formTarget = this.$refs['renderForm'];
       const firstErrorField = Object.keys(formTarget.fields).find(key => {
@@ -2405,7 +2405,7 @@ modules = {
       });
 
       if (firstErrorField) {
-        const field = this.$refs.form.fields[firstErrorField];
+        const field = formTarget.fields[firstErrorField];
 
         // 滚动到该字段位置
         field.$el.scrollIntoView({
@@ -2421,7 +2421,7 @@ modules = {
           field.$el.classList.remove('highlight');
         }, 3000);
       }
-    },
+    },*/
     openSearchDialog(option) {
       this.searchDialogOption = option;
       this.showSearchDialog = true;