@bsgoal/common 2.15.12 → 2.15.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsgoal/common",
-  "version": "2.15.12",
+  "version": "2.15.15",
   "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:10:39
  * @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',
@@ -263,10 +263,10 @@ const changeValues = (params = '') => {
   <div class="bsgoal-base-form-demo">
     {{ values }}
     <BsgoalBaseForm
+      compact
       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 14:20:25
+ * @LastEditTime: 2023-06-30 16:14:07
  * @FilePath: \common\src\components\bsgoal-base-form\index.vue
  * @Description:  表单公共组件 
  * 
@@ -110,6 +110,14 @@ const props = defineProps({
   itemStyler: {
     type: [Object],
     default: () => ({})
+  },
+
+  /**
+   * 紧凑型
+   */
+  compact: {
+    type: [Boolean],
+    default: false
   }
 })
 
@@ -176,12 +184,6 @@ watchEffect(() => {
     if (prop.startsWith('_')) {
       model.value[prop] = `${prop}`
     } else {
-      console.log('bindValue', bindValue)
-      console.log('valuesModel[prop]', valuesModel[prop])
-      console.log(
-        'bindValue || valuesModel[prop] || value',
-        bindValue || valuesModel[prop] || value
-      )
       model.value[prop] = bindValue || valuesModel[prop] || value
     }
 
@@ -417,6 +419,27 @@ const setActiveValueText = (range = [], type = '') => {
 
 // ---> E switch active/inactive 的设置 <---
 
+// ---> S styles <---
+const colStyle = computed(() => {
+  const styler = {}
+  const { compact = false } = props
+  if (compact) {
+    styler.marginBottom = '0px'
+  }
+  return styler
+})
+const itemStyle = computed(() => {
+  const styler = {}
+  const { compact = false, itemStyler = {} } = props
+  if (compact) {
+    styler.marginBottom = '0px'
+  }
+
+  return {  ...styler ,...itemStyler }
+})
+
+// ---> E styles <---
+
 defineExpose({
   triggerOperationClear,
   triggerOperationForm,
@@ -467,8 +490,14 @@ defineExpose({
             ) of configOptionsGet"
             :key="key"
           >
-            <el-col :class="{ 'base_form--visible': !visible }" :xs="24" :sm="24" :md="medium">
-              <el-form-item :style="itemStyler" :label="label" :prop="prop" :rules="rules">
+            <el-col
+              :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 }">
                   <!-- S 内容组件 -->
                   <template v-if="!readonly">