@lambo-design/variant-form 2.2.9-beta.1 → 2.2.9-beta.2

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@lambo-design/variant-form",
-  "version": "2.2.9-beta.1",
+  "version": "2.2.9-beta.2",
   "description": "VForm Online Form Designer",
-  "main": "dist/VFormDesigner.umd.min.js",
+  "main": "src/index.js",
   "author": "lambo",
   "license": "ISC",
   "publishConfig": {
@@ -60,7 +60,7 @@
     "release-minor": "standard-version --release-as minor",
     "release-patch": "standard-version --release-as patch",
     "release-beta": "standard-version --prerelease beta",
-    "re-publish": "pnpm lib && pnpm publish --access public --no-git-checks",
+    "re-publish": "pnpm publish --access public --no-git-checks",
     "serve": "vue-cli-service serve --open src/main.js",
     "build": "vue-cli-service build --report --dest dist/build",
     "lib": "vue-cli-service build --report --target lib --dest dist/lib --name VFormDesigner install.js",

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

@@ -9,7 +9,7 @@
         @focus="handleClickCustomEvent">
       <i slot="suffix" class="el-input__icon el-icon-s-grid" @click="handleClickCustomEvent"></i>
     </el-input>
-    <el-dialog title="组织" :visible.sync="dialogVisible" class="organ-dialog">
+    <el-dialog title="组织" :visible.sync="dialogVisible" class="organ-dialog" append-to-body>
       <el-form label-width="120px">
         <el-row>
           <el-col :span="12" v-if="userCenterType === 'sc'">
@@ -175,9 +175,6 @@ export default {
 
     async loadNode(node, resolve) {
       if (node){
-        // if (node.level === 0 && this.treeDataList.length > 0) {
-        //   return resolve(this.treeDataList);
-        // }
         const params = {
           parentId: node.data.bizOrganId,
           organTreeType: this.optionModel.organTreeType || (this.userCenterType === 'sc' ? 'default' : '00'),
@@ -210,7 +207,11 @@ export default {
 
     onOk() {
       if (!this.optionModel.rootOrgan && !this.selectedRootOrgan){
-        this.$Message.error('请选择根组织');
+        this.$message({
+          message: '请选择根组织',
+          customClass: 'messageClass',
+          type: 'error'
+        });
         return;
       }
       this.dialogVisible = false;
@@ -244,5 +245,8 @@ export default {
     text-align: right;
     border-top: 1px solid #eee;
   }
+  .messageClass{
+    z-index: 2005;
+  }
 }
 </style>

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

@@ -1,10 +1,7 @@
 <template>
   <el-form-item>
-    <span slot="label">{{i18nt('designer.setting.validation')}}
-      <el-tooltip effect="light" :content="i18nt('designer.setting.validationHelp')">
-        <i class="el-icon-info"></i></el-tooltip>
-    </span>
-    <el-select v-model="optionModel.validation" filterable clearable allow-create default-first-option>
+    <span slot="label">{{i18nt('designer.setting.validation')}}</span>
+    <el-select v-model="optionModel.validation" filterable clearable allow-create default-first-option @change="handleValidationChange">
       <el-option v-for="(fv, fvIdx) in fieldValidators"
                  :key="fvIdx"
                  :label="fv.label"
@@ -34,12 +31,20 @@
           {value: 'mobilePhone', label: this.i18nt('designer.hint.mobilePhoneValidator')},
           {value: 'email', label: this.i18nt('designer.hint.emailValidator')},
           {value: 'url', label: this.i18nt('designer.hint.urlValidator')},
+          {value: 'idCard', label: this.i18nt('designer.hint.idCardValidator')},
           {value: 'noChinese', label: this.i18nt('designer.hint.noChineseValidator')},
           {value: 'chinese', label: this.i18nt('designer.hint.chineseValidator')},
         ],
       }
     },
 
+    methods: {
+      handleValidationChange(val) {
+        if (val) {
+          this.optionModel.validationHint = '必须是' + this.i18nt(`designer.hint.${val}Validator`)
+        }
+      }
+    }
   }
 </script>
 

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

@@ -33,8 +33,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',

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

@@ -8,7 +8,7 @@ export const containers = [
     options: {
       name: '',
       hidden: false,
-      gutter: 12,
+      gutter: 0,
       colHeight: null,  //栅格列统一高度属性，用于解决栅格列设置响应式布局浮动后被挂住的问题！！
       customClass: '',  //自定义css类名
     }

package/src/lang/en-US.js

@@ -137,6 +137,7 @@ export default {
       letterAndNumberValidator: 'LetterAndNumber',
       mobilePhoneValidator: 'MobilePhone',
       emailValidator: 'Email',
+      idCard: 'IDCard',
       urlValidator: 'URL',
       noChineseValidator: 'Non-Chinese',
       chineseValidator: 'Chinese',

package/src/lang/zh-CN.js

@@ -138,6 +138,7 @@ export default {
       mobilePhoneValidator: '手机号码',
       emailValidator: '邮箱',
       urlValidator: '网址',
+      idCardValidator: '身份证号',
       noChineseValidator: '非中文字符',
       chineseValidator: '仅中文字符',
 

package/vue.config.js

@@ -33,7 +33,7 @@ if (IS_PROD && buildProdFlag) {
 module.exports = {
   publicPath: './',
   assetsDir: './',
-
+  parallel: false,
   /* 开启vue运行时模板编译功能！！ */
   runtimeCompiler: true,