@bsgoal/common 1.6.6 → 1.6.7

package/package.json

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

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-23 16:35:24
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-06 14:53:11
+ * @LastEditTime: 2023-05-18 14:56:57
  * @FilePath: \common\src\components\bsgoal-base-dialog\demo.vue
  * @Description: 弹窗公共组件 演示
  * 
@@ -52,6 +52,11 @@ const tabsConfigOptions = ref([
     value: 'tab4'
   }
 ])
+
+const triggerConfirm = (done) => {
+   console.log('关闭前');
+   done()
+}
 </script>
 <template>
   <div class="bsgoal-base-dialog-demo">
@@ -61,10 +66,10 @@ const tabsConfigOptions = ref([
         <template #footer>
           <el-button type="primary">底部按钮</el-button>
         </template>
-      </BsgoalBaseDialog>
-      <BsgoalBaseDialog v-model="dialogVisible2" size="max" type="form">
-        <BsgoalBaseTabs v-memo="activeTabName" :config-options="tabsConfigOptions" />
-      </BsgoalBaseDialog>
+      </BsgoalBaseDialog  >
+      <BsgoalBaseDialog v-model="dialogVisible2" size="max" type="form" @on-confirm="triggerConfirm">
+        <BsgoalBaseTabs v-memo="activeTabName" :config-options="tabsConfigOptions"   />
+      </BsgoalBaseDialog >
       <el-button type="primary" @click="test">打开弹窗</el-button>
       <el-button type="primary" @click="test2">打开弹窗2</el-button>
     </div>

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-23 16:35:19
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-10 11:56:01
+ * @LastEditTime: 2023-05-18 14:54:15
  * @FilePath: \common\src\components\bsgoal-base-dialog\index.vue
  * @Description:  弹窗公共组件
  * 
@@ -97,8 +97,9 @@ const cancel = () => {
  * @return {*}
  */
 const confirm = () => {
-  dialogVisible.value = false
-  emits('on-confirm')
+  emits('on-confirm', () => {
+    dialogVisible.value = false
+  })
 }
 
 watch(
@@ -141,8 +142,12 @@ const widthGet = computed(() => {
   <div class="bsgoal-base-dialog">
     <div class="base_dialog">
       <!-- S 组件实体 -->
-      <el-dialog v-model="dialogVisible" custom-class="bsgoal_base_dialog_main"
-        :class="{ 'bsgoal-dialog__footer--conceal': !footer }" :width="widthGet">
+      <el-dialog
+        v-model="dialogVisible"
+        custom-class="bsgoal_base_dialog_main"
+        :class="{ 'bsgoal-dialog__footer--conceal': !footer }"
+        :width="widthGet"
+      >
         <template #header>
           <div class="base_dialog_header">{{ title }}</div>
         </template>
@@ -200,4 +205,5 @@ const widthGet = computed(() => {
       padding: 0px 0px 30px 30px;
     }
   }
-}</style>
+}
+</style>

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

@@ -8,17 +8,6 @@
  * 
 -->
 
-<template>
-  <div class="bsgoal-base-form-demo">
-    <BsgoalBaseForm readonly ref="BSGOAL_BASE_FORM_REF" :limits="10" :config-options="configOptions" :values="values" none="--" />
-    <el-button type="primary" @click="confirm">提交</el-button>
-  </div>
-</template>
-<script>
-export default {
-  name: 'BsgoalBaseFormDemo'
-}
-</script>
 <script setup>
 /* setup模板
 ---------------------------------------------------------------- */
@@ -27,20 +16,17 @@ import { ref, computed, toRefs, watch, unref } from 'vue'
 import EnumType from '../../enums/enumType.js'
 
 const values = ref({
-   prop1:'112123123123123123',
-   prop2:'select1',
-   prop20:''
+  prop1: '112123123123123123',
+  prop2: 'select1',
+  prop20: ''
 })
 
 const BSGOAL_BASE_FORM_REF = ref(null)
 
-const confirm =  () => {
-    BSGOAL_BASE_FORM_REF.value.validateForm( (res) => {
-     
-       console.log('res',res);
-
-    } )
-  
+const confirm = () => {
+  BSGOAL_BASE_FORM_REF.value.validateForm((res) => {
+    console.log('res', res)
+  })
 }
 
 // 配置项
@@ -51,8 +37,8 @@ const configOptions = ref([
     prop: 'prop1',
     type: EnumType.INPUT,
     width: '100px',
-    rules:true,
-    readonly:true
+    rules: true,
+    readonly: true
   },
   {
     label: 'prop20',
@@ -60,8 +46,8 @@ const configOptions = ref([
     prop: 'prop20',
     type: EnumType.INPUT,
     width: '100px',
-    rules:true,
-    readonly:true
+    rules: true,
+    readonly: true
   },
   {
     label: 'prop2',
@@ -86,8 +72,7 @@ const configOptions = ref([
         value: 'select5'
       }
     ],
-    readonly:true
-
+    readonly: true
   },
   {
     label: 'prop3',
@@ -191,6 +176,24 @@ const configOptions = ref([
   }
 ])
 </script>
+<script>
+export default {
+  name: 'BsgoalBaseFormDemo'
+}
+</script>
+<template>
+  <div class="bsgoal-base-form-demo">
+    <BsgoalBaseForm
+      readonly
+      ref="BSGOAL_BASE_FORM_REF"
+      :limits="10"
+      :config-options="configOptions"
+      :values="values"
+      none="--"
+    />
+    <el-button type="primary" @click="confirm">提交</el-button>
+  </div>
+</template>
 <style lang="scss" scoped>
 /* 自定义样式
 ---------------------------------------------------------------- */