@bsgoal/common 1.8.3 → 1.8.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsgoal/common",
-  "version": "1.8.3",
+  "version": "1.8.5",
   "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-20 17:54:12
+ * @LastEditTime: 2023-05-22 11:21:29
  * @FilePath: \common\src\components\bsgoal-base-form\demo.vue
  * @Description: 表单公共组件演示组件
  * 
@@ -16,7 +16,7 @@ import { ref, computed, toRefs, watch, unref } from 'vue'
 import EnumType from '../../enums/enumType.js'
 
 const values = ref({
-  prop1:'222',
+  prop1: '222',
   prop2: 'select1',
   prop20: ''
 })
@@ -29,12 +29,17 @@ const confirm = () => {
   })
 }
 
-const bindModel = ref({prop1:'111'})
-
-
+const bindModel = ref({ prop1: '111',prop99:1 })
 
 // 配置项
 const configOptions = ref([
+  {
+    label: 'prop99',
+    prop: 'prop99',
+    value: 0,
+    type: EnumType.INPUT_NUMBER,
+    max: 'max'
+  },
   {
     label: 'prop1',
     // value: '111',
@@ -88,7 +93,11 @@ const configOptions = ref([
     label: 'prop4',
     // value: '111',
     type: EnumType.SWITCH,
-    prop: 'prop4'
+    prop: 'prop4',
+    range: [
+      { label: '是', value: 1 },
+      { label: '否', value: 0 }
+    ]
   },
   {
     label: 'prop5',
@@ -193,9 +202,9 @@ export default {
       none="--"
       :limits="10"
       :config-options="configOptions"
-      :values="values"
+      :bind-model="bindModel"
     >
-     <!-- <template #prop1="{option}">
+      <!-- <template #prop1="{option}">
          <div>666 {{ option }} </div>
      </template> -->
     </BsgoalBaseForm>

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-20 17:51:39
+ * @LastEditTime: 2023-05-22 11:23:57
  * @FilePath: \common\src\components\bsgoal-base-form\index.vue
  * @Description:  表单公共组件 
  * 
@@ -119,8 +119,7 @@ watchEffect(() => {
       watchPropList.push(prop)
     }
     const bindValue = unref(model)[prop]
-    console.log('bindValue',bindValue);
-    console.log('valuesModel[prop]',valuesModel[prop]);
+    // console.log(prop,'valuesModel[prop]',bindValue)
     model.value[prop] = bindValue || valuesModel[prop] || value
   })
 })
@@ -303,6 +302,37 @@ const validateForm = (callback = () => {}) => {
   })
 }
 
+// ---> S switch active/inactive 的设置 <---
+
+/**
+ * @Author: canlong.shen
+ * @description: 设置 active 值
+ * @param {*} range 入参
+ * @param {*} type  'active' / 'inactive'
+ * @default:
+ * @return {*}
+ */
+const setActiveValueText = (range = [], type = '') => {
+  const { 0: startOption = {}, 1: endOption = {} } = range
+  const { value: startValue = false, label: startText = '' } = startOption
+  const { value: endValue = false, label: endText = '' } = endOption
+
+  switch (type) {
+    case 'active-value':
+      return startValue
+    case 'inactive-value':
+      return endValue
+    case 'active-text':
+      return startText
+    case 'inactive-text':
+      return endText
+    default:
+      break
+  }
+}
+
+// ---> E switch active/inactive 的设置 <---
+
 defineExpose({
   triggerOperationClear,
   triggerOperationForm,
@@ -313,7 +343,7 @@ defineExpose({
   <div class="bsgoal-base-form">
     <div class="base_form">
       <!-- / 表单内容 -->
-      <el-form ref="EL_FORM_REF" label-suffix=":" :model="model" v-align>
+      <el-form ref="EL_FORM_REF" label-suffix=":" :model="model" v-align >
         <el-row>
           <template
             v-for="(
@@ -365,7 +395,8 @@ defineExpose({
                     <!-- / textarea 输入框组件 -->
                     <template v-if="type === EnumType.INPUT_NUMBER">
                       <el-input-number
-                        v-model="num"
+                        v-model="model[prop]"
+                        controls-position="right"
                         :min="min"
                         :max="max"
                         @change="triggerValueChange"
@@ -412,8 +443,10 @@ defineExpose({
                     <template v-if="type === EnumType.SWITCH">
                       <el-switch
                         v-model="model[prop]"
-                        :active-value="range[0] || true"
-                        :inactive-value="range[1] || false"
+                        :active-value="setActiveValueText(range, 'active-value')"
+                        :inactive-value="setActiveValueText(range, 'inactive-value')"
+                        :active-text="setActiveValueText(range, 'active-text')"
+                        :inactive-text="setActiveValueText(range, 'inactive-text')"
                         @change="triggerValueChange(type, prop)"
                       />
                     </template>