bri-components 1.2.7 → 1.2.8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.2.7",
+    "version": "1.2.8",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",

package/src/abolish/DshFlatTable.vue

@@ -594,7 +594,7 @@
             getRuleResult (col, row, showRuleMessage = this.showRuleMessage) {
                 if ((this.ruleRecordMap[`${row._id}dsh${col._key}`] || {}).showRuleMessage || showRuleMessage) {
                     const val = row[col._key];
-                    const ruleConfig = this.$getFormTypeRuleConfig(col);
+                    const ruleConfig = this.$getFieldRuleConfig(col);
                     // 为空 校验必填；不为空 格式校验 （不是必填也要校验格式）
                     return this.$isEmptyData(val)
                         ? {
@@ -604,7 +604,7 @@
                         : ruleConfig.regs && ruleConfig.regs.length
                             ? {
                                 bool: ruleConfig.regs.every(regItem => regItem.test(val)),
-                                message: col.regMessage || `${col._name}格式不正确`
+                                message: col._regMessage || ruleConfig.regMessage || `${col._name}格式不正确`
                             }
                             : {
                                 bool: true

package/src/components/form/DshForm.vue

@@ -240,12 +240,12 @@
             },
             getRules (formItem) {
                 let rules = [];
-                let ruleConfig = this.$getFormTypeRuleConfig(formItem);
+                let ruleConfig = this.$getFieldRuleConfig(formItem);
 
                 // 格式校验 （不依赖必填）
-                if (ruleConfig.regs && ruleConfig.regs.length) {
+                if (ruleConfig.regs.length) {
                     rules.push({
-                        message: formItem.regMessage || `${formItem._name}格式不正确`,
+                        message: formItem._regMessage || ruleConfig.regMessage || `${formItem._name}格式不正确`,
                         trigger: "blur",
                         transform: (val) => {
                             if (this.$isEmptyData(val)) {

package/src/components/list/BriFlatTable.vue

@@ -407,7 +407,7 @@
             getRuleResult (col, row, showRuleMessage = this.showRuleMessage) {
                 if ((this.ruleRecordMap[`${row._id}dsh${col._key}`] || {}).showRuleMessage || showRuleMessage) {
                     const val = row[col._key];
-                    const ruleConfig = this.$getFormTypeRuleConfig(col);
+                    const ruleConfig = this.$getFieldRuleConfig(col);
                     // 为空 校验必填；不为空 格式校验 （不是必填也要校验格式）
                     return this.$isEmptyData(val)
                         ? {
@@ -417,7 +417,7 @@
                         : ruleConfig.regs && ruleConfig.regs.length
                             ? {
                                 bool: ruleConfig.regs.every(regItem => regItem.test(val)),
-                                message: col.regMessage || `${col._name}格式不正确`
+                                message: col._regMessage || ruleConfig.regMessage || `${col._name}格式不正确`
                             }
                             : {
                                 bool: true

package/src/components/list/BriTree.vue

@@ -167,10 +167,9 @@
                         _key: "_key",
                         _name: "唯一标识",
                         _type: "text",
+                        _textType: "key",
                         _line: true,
-                        _required: true,
-                        regStr: "^(?!.*__.*)[a-zA-Z0-9]+(\\w+){1}[a-zA-Z0-9]+$",
-                        regMessage: "长度必须不小于3，只能包含小写字母，数字，下划线,不以下划线开头或结尾"
+                        _required: true
                     },
                     {
                         _key: "description",