@bsgoal/common 2.7.6 → 2.7.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsgoal/common",
-  "version": "2.7.6",
+  "version": "2.7.8",
   "private": false,
   "files": [
     "dist",

package/src/components/bsgoal-base-form/demo.vue

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-10 15:00:00
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-30 11:44:19
+ * @LastEditTime: 2023-05-30 14:07:00
  * @FilePath: \common\src\components\bsgoal-base-form\demo.vue
  * @Description: 表单公共组件演示组件
  * 
@@ -33,14 +33,26 @@ const confirm = () => {
   })
 }
 
-const bindModel = ref({ prop1: '111', prop99: 1, prop101: '否', prop102: '0' ,_prop104:'55'})
+const bindModel = ref({ prop1: '111', prop99: 1, prop101: '否', prop102: '0', _prop104: '' })
+
+
 
 // 配置项
 const configOptions = ref([
-   {
+  {
     label: 'prop104',
     prop: '_prop104',
-    rules: true
+    validator:true,
+    rules: [
+      {
+        validator: (rule, value, callback) => {
+          console.log('value', value)
+
+           return callback(new Error('Please input the age'))
+        },
+        trigger: 'change'
+      }
+    ]
   },
   {
     label: 'prop103',
@@ -249,9 +261,9 @@ const configOptions = ref([
       :config-options="configOptions"
       :bind-model="bindModel"
     >
-      <template #_prop104="{option}">
-         <div>666  </div>
-     </template>
+    <template #_prop104>
+      6666
+    </template>
     </BsgoalBaseForm>
     <el-button type="primary" @click="confirm">提交</el-button>
   </div>

package/src/components/bsgoal-base-form/index.vue

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-17 11:44:29
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-30 11:48:20
+ * @LastEditTime: 2023-05-30 14:05:39
  * @FilePath: \common\src\components\bsgoal-base-form\index.vue
  * @Description:  表单公共组件 
  * 
@@ -175,15 +175,13 @@ const configOptionsGet = computed(() => {
   const { configOptions } = props
   const options = unref(configOptions)
   const reOptions = options.map((option) => {
-    let { rules = [], label = '' } = option
+    let { rules = [], label = '', validator = false } = option
     const requiredRule = { required: true, message: `${label}不能为空`, trigger: 'blur' }
     if (isBoolean(rules) && rules) {
       rules = [requiredRule]
-    } else if (Array.isArray(rules) && !!rules.length) {
-      rules = [requiredRule, ...rules]
-    } else {
-      rules = []
-    }
+    } else if ( !validator && Array.isArray(rules) && !!rules.length ) {
+      rules = [ requiredRule ,...rules,]
+    } 
     option.rules = rules
     return option
   })