@bsgoal/common 2.15.13 → 2.15.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsgoal/common",
-  "version": "2.15.13",
+  "version": "2.15.16",
   "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-06-30 14:21:51
+ * @LastEditTime: 2023-06-30 16:54:25
  * @FilePath: \common\src\components\bsgoal-base-form\demo.vue
  * @Description: 表单公共组件演示组件
  * 
@@ -127,7 +127,7 @@ const configOptions = ref([
     value: [],
     type: ComponentTypeEnums.SELECT,
     prop: 'prop2',
-    multiple:true,
+    multiple: true,
     range: [
       {
         label: 'select1',
@@ -145,7 +145,7 @@ const configOptions = ref([
         label: 'select4',
         value: 'select5'
       }
-    ],
+    ]
   },
   {
     label: 'prop3',
@@ -266,7 +266,6 @@ const changeValues = (params = '') => {
       ref="BSGOAL_BASE_FORM_REF"
       readonly
       none="--"
-      :itemStyler="{ marginBottom: '8px' }"
       :limits="10"
       :config-options="configOptions"
       :bind-model="values"

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-06-30 15:58:56
+ * @LastEditTime: 2023-06-30 17:32:31
  * @FilePath: \common\src\components\bsgoal-base-form\index.vue
  * @Description:  表单公共组件 
  * 
@@ -356,7 +356,7 @@ const filterSlotProps = (model = {}) => {
     if (!prop.startsWith('_')) {
       const value = model[prop]
       const valueInt = Number.parseInt(value)
-      rebuildModel[prop] = valueInt || ['0', 0].includes(value) ? valueInt : value
+      rebuildModel[prop] = ( valueInt || ['0', 0].includes(value) ) && !(/^0.+/i).test(`${value}`) ? valueInt : value
     }
   }
   return rebuildModel
@@ -420,22 +420,23 @@ const setActiveValueText = (range = [], type = '') => {
 // ---> E switch active/inactive 的设置 <---
 
 // ---> S styles <---
-const colStyle = () => {
+const colStyle = computed(() => {
   const styler = {}
   const { compact = false } = props
   if (compact) {
     styler.marginBottom = '0px'
   }
   return styler
-}
-const itemStyle = () => {
+})
+const itemStyle = computed(() => {
   const styler = {}
   const { compact = false, itemStyler = {} } = props
   if (compact) {
     styler.marginBottom = '0px'
   }
-  return { ...itemStyler, ...styler }
-}
+
+  return {  ...styler ,...itemStyler }
+})
 
 // ---> E styles <---
 
@@ -490,11 +491,11 @@ defineExpose({
             :key="key"
           >
             <el-col
-              :style="colStyle"
               :class="{ 'base_form--visible': !visible }"
               :xs="24"
               :sm="24"
               :md="medium"
+              :style="colStyle"
             >
               <el-form-item :style="itemStyle" :label="label" :prop="prop" :rules="rules">
                 <slot :name="[prop]" :option="{ readonly, value: model[prop], values: model }">