@bsgoal/common 2.7.8 → 2.7.9

package/package.json

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

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

@@ -61,7 +61,8 @@ const configOptions = ref([
     formatter: (value = '') => {
       return `${value}`.match(/^\d{1,}$/) ? value : ''
     },
-    placeholder: ''
+    placeholder: '',
+    rules:true
   },
 
   {

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 14:05:39
+ * @LastEditTime: 2023-05-30 14:24:25
  * @FilePath: \common\src\components\bsgoal-base-form\index.vue
  * @Description:  表单公共组件 
  * 
@@ -175,11 +175,11 @@ const configOptionsGet = computed(() => {
   const { configOptions } = props
   const options = unref(configOptions)
   const reOptions = options.map((option) => {
-    let { rules = [], label = '', validator = false } = option
+    let { rules = [], label = '',  prop = ''} = option
     const requiredRule = { required: true, message: `${label}不能为空`, trigger: 'blur' }
     if (isBoolean(rules) && rules) {
       rules = [requiredRule]
-    } else if ( !validator && Array.isArray(rules) && !!rules.length ) {
+    } else if ( !prop.startsWith('_') && Array.isArray(rules) && !!rules.length ) {
       rules = [ requiredRule ,...rules,]
     } 
     option.rules = rules
@@ -434,7 +434,7 @@ defineExpose({
             :key="key"
           >
             <el-col :class="{ 'base_form--visible': !visible }" :xs="24" :sm="24" :md="medium">
-              <el-form-item :label="label" :prop="prop" :rules="rules">
+              <el-form-item :label="label" :prop="prop" :rules="rules" :required="!!rules.length">
                 <slot :name="[prop]" :option="{ readonly, value: model[prop], values: model }">
                   <!-- S 内容组件 -->
                   <template v-if="!readonly">