@bsgoal/common 1.8.1 → 1.8.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsgoal/common",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "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-19 14:00:24
+ * @LastEditTime: 2023-05-20 17:54:12
  * @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: '112123123123123123',
+  prop1:'222',
   prop2: 'select1',
   prop20: ''
 })
@@ -29,7 +29,7 @@ const confirm = () => {
   })
 }
 
-
+const bindModel = ref({prop1:'111'})
 
 
 
@@ -188,12 +188,12 @@ export default {
 <template>
   <div class="bsgoal-base-form-demo">
     <BsgoalBaseForm
-      readonly
       ref="BSGOAL_BASE_FORM_REF"
+      readonly
+      none="--"
       :limits="10"
       :config-options="configOptions"
       :values="values"
-      none="--"
     >
      <!-- <template #prop1="{option}">
          <div>666 {{ option }} </div>

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-19 14:00:05
+ * @LastEditTime: 2023-05-20 17:51:39
  * @FilePath: \common\src\components\bsgoal-base-form\index.vue
  * @Description:  表单公共组件 
  * 
@@ -80,6 +80,13 @@ const props = defineProps({
   none: {
     type: [String],
     default: '无'
+  },
+  /**
+   * 绑定的 mdel
+   */
+  bindModel: {
+    type: [Object],
+    default: () => ({})
   }
 })
 
@@ -92,7 +99,7 @@ const EL_FORM_REF = ref(null)
 // 自定义指令
 const vAlign = baseDirective.align
 
-const model = ref({})
+const model = ref(props.bindModel)
 const watchPropList = []
 
 /**
@@ -111,7 +118,10 @@ watchEffect(() => {
     if (![EnumType.INPUT, EnumType.INPUT_TEXT_AREA].includes(type)) {
       watchPropList.push(prop)
     }
-    model.value[prop] = valuesModel[prop] || value
+    const bindValue = unref(model)[prop]
+    console.log('bindValue',bindValue);
+    console.log('valuesModel[prop]',valuesModel[prop]);
+    model.value[prop] = bindValue || valuesModel[prop] || value
   })
 })
 

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-28 16:01:11
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-20 15:51:07
+ * @LastEditTime: 2023-05-20 16:08:59
  * @FilePath: \common\src\components\bsgoal-base-tabs\demo.vue
  * @Description: tabs 标签切页 公共组件演示
 -->
@@ -42,7 +42,6 @@ const  config = ref([
 <template>
   <div class="bsgoal-base-tabs-demo">
     <div class="base_tabs_demo">
-      {{ activeTabName }}
       <BsgoalBaseTabs :config-options="config" > 
         <template #tab1>
           <div>

package/src/components/bsgoal-base-tabs/index.vue

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-28 16:01:06
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-20 15:50:39
+ * @LastEditTime: 2023-05-20 16:14:19
  * @FilePath: \common\src\components\bsgoal-base-tabs\index.vue
  * @Description: tabs 标签页公共组件
  * 
@@ -16,7 +16,7 @@ export default {
 <script setup>
 /* setup模板
 ---------------------------------------------------------------- */
-import { ref, unref } from 'vue'
+import { ref, unref, computed } from 'vue'
 const props = defineProps({
   /**
    * 配置项
@@ -39,7 +39,7 @@ const props = defineProps({
   type: {
     type: [String],
     default: '',
-    validator: (v) => ['card', 'border-card'].includes(v)
+    validator: (v) => ['card', 'border-card', ''].includes(v)
   },
   /**
    * 组件绑定的值
@@ -57,20 +57,17 @@ const props = defineProps({
   }
 })
 
-/**
- *  update:modelValue  // 更新 modelValue 的方法
- */
 const emits = defineEmits(['update:modelValue'])
 
 // ---> S modelValue Get <---
-
-// ---> E modelValue Get <---
-const modelValueGet = () => {
+const modelValueGet = computed(() => {
   const { modelValue = '', configOptions = [] } = props
   const nameList = unref(configOptions).map((mi) => mi.value)
-  const actionName = unref(modelValue) 
+  const actionName = unref(modelValue)
   return actionName || nameList[0]
-}
+})
+// ---> E modelValue Get <---
+
 // ---> S tab的切换 <---
 const changeTab = (activeValue = '') => {
   emits('update:modelValue', activeValue)