@bsgoal/common 2.7.5 → 2.7.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsgoal/common",
-  "version": "2.7.5",
+  "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-26 15:55:40
+ * @LastEditTime: 2023-05-30 14:07:00
  * @FilePath: \common\src\components\bsgoal-base-form\demo.vue
  * @Description: 表单公共组件演示组件
  * 
@@ -33,13 +33,26 @@ const confirm = () => {
   })
 }
 
-const bindModel = ref({ prop1: '111', prop99: 1, prop101: '否', prop102: '0' })
+const bindModel = ref({ prop1: '111', prop99: 1, prop101: '否', prop102: '0', _prop104: '' })
+
+
 
 // 配置项
 const configOptions = ref([
-   {
+  {
     label: 'prop104',
     prop: '_prop104',
+    validator:true,
+    rules: [
+      {
+        validator: (rule, value, callback) => {
+          console.log('value', value)
+
+           return callback(new Error('Please input the age'))
+        },
+        trigger: 'change'
+      }
+    ]
   },
   {
     label: 'prop103',
@@ -248,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-23 15:37:32
+ * @LastEditTime: 2023-05-30 14:05:39
  * @FilePath: \common\src\components\bsgoal-base-form\index.vue
  * @Description:  表单公共组件 
  * 
@@ -154,12 +154,10 @@ watchEffect(() => {
     }
     const bindValue = unref(model)[prop]
     // '_xxx 开头都是内容插槽'
-    if (!prop.startsWith('_')) {
-      model.value[prop] = bindValue || valuesModel[prop] || value
+    model.value[prop] = bindValue || valuesModel[prop] || value
 
-      if (isObject(show)) {
-        watchPropsForShow(show, unref(model), prop)
-      }
+    if (isObject(show)) {
+      watchPropsForShow(show, unref(model), prop)
     }
   })
 })
@@ -177,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
   })
@@ -317,6 +313,22 @@ const triggerValueChange = (type, prop) => {
   emits('on-change', emitValue)
 }
 
+/**
+ * @Author: canlong.shen
+ * @description: 过滤掉插槽字段
+ * @default:
+ * @return {*}
+ */
+const filterSlotProps = (model = {}) => {
+  const rebuildModel = {}
+  for (const prop of Object.keys(model)) {
+    if (!prop.startsWith('_')) {
+      rebuildModel[prop] = model[prop]
+    }
+  }
+  return rebuildModel
+}
+
 /**
  * @Author: canlong.shen
  * @description: 表单校验
@@ -327,7 +339,8 @@ const validateForm = (callback = () => {}) => {
   EL_FORM_REF.value.validate((valid = false, field = {}) => {
     if (valid) {
       const validModel = triggerOperationForm()
-      callback(validModel)
+      const cleanModel = filterSlotProps(validModel)
+      callback(cleanModel)
     } else {
       callback(false)