@bsgoal/common 2.7.5 → 2.7.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsgoal/common",
-  "version": "2.7.5",
+  "version": "2.7.6",
   "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 11:44:19
  * @FilePath: \common\src\components\bsgoal-base-form\demo.vue
  * @Description: 表单公共组件演示组件
  * 
@@ -33,13 +33,14 @@ const confirm = () => {
   })
 }
 
-const bindModel = ref({ prop1: '111', prop99: 1, prop101: '否', prop102: '0' })
+const bindModel = ref({ prop1: '111', prop99: 1, prop101: '否', prop102: '0' ,_prop104:'55'})
 
 // 配置项
 const configOptions = ref([
    {
     label: 'prop104',
     prop: '_prop104',
+    rules: true
   },
   {
     label: 'prop103',

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 11:48:20
  * @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)
     }
   })
 })
@@ -317,6 +315,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 +341,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)