@bsgoal/common 1.7.2 → 1.7.3

package/package.json

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

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-05-18 16:24:31
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-18 17:29:13
+ * @LastEditTime: 2023-05-18 18:13:42
  * @FilePath: \common\src\components\bsgoal-base-button\demo.vue
  * @Description:  按钮 演示
  * 
@@ -16,12 +16,10 @@ import BsgoalBaseButton from './index.vue'
 // props
 const props = defineProps({})
 
-const task = () => {
-  return new Promise((resolve) => {
-    setTimeout(() => {
-      resolve()
-    }, 3000)
-  })
+const task = (done) => {
+  setTimeout(() => {
+    done()
+  }, 3000)
 }
 </script>
 <script>

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-05-18 16:24:25
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-18 17:28:21
+ * @LastEditTime: 2023-05-18 18:25:55
  * @FilePath: \common\src\components\bsgoal-base-button\index.vue
  * @Description: 统一按钮 
  * 
@@ -13,6 +13,7 @@
 ---------------------------------------------------------------- */
 import { ref, unref, computed } from 'vue'
 import { Delete, Plus } from '@element-plus/icons-vue'
+import { values } from 'lodash';
 
 // props
 const props = defineProps({
@@ -39,6 +40,10 @@ const props = defineProps({
     type: [String],
     default: 'add',
     validator: (v) => ['add', 'delete', 'edit', 'detail'].includes(v)
+  },
+  values: {
+    type: [Array, Object],
+    default: () => ({})
   }
 })
 
@@ -48,11 +53,9 @@ const triggerClick = () => {
   loading.value = true
   const { task } = props
   const taskValue = unref(task)
-  taskValue()
-    .then()
-    .finally(() => {
-      loading.value = false
-    })
+  taskValue(() => {
+    loading.value = false
+  },props.values)
 }
 // ---> E 触发按钮 <---
 

package/src/components/bsgoal-base-search-table/demo.vue

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-18 17:04:53
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-05-18 15:56:29
+ * @LastEditTime: 2023-05-18 18:26:57
  * @FilePath: \common\src\components\bsgoal-base-search-table\demo.vue
  * @Description: 查询 + 表格 组合公共组件
  * 
@@ -20,6 +20,8 @@ import { ref, unref } from 'vue'
 import EnumType from '../../enums/enumType.js'
 import BsgoalBaseSearchTable from './index.vue'
 import DemoTable from './demo-table.vue'
+import BsgoalBaseButton from '../bsgoal-base-button/index.vue'
+
 // props
 const props = defineProps({})
 
@@ -728,6 +730,13 @@ const BSGOAL_BASE_SEARCH_TABLE_REF = ref(null)
 const test = () => {
   BSGOAL_BASE_SEARCH_TABLE_REF.value.refresh()
 }
+
+const task = (done = () => {}, rows = {}) => {
+  console.log('rows', rows.prop1)
+  setTimeout(() => {
+    done()
+  }, 3000)
+}
 </script>
 <template>
   <div class="bsgoal-search-table-demo">
@@ -758,8 +767,10 @@ const test = () => {
         <template v-slot:menu>
           <el-button type="primary" @click="test">操作按钮</el-button>
         </template>
-        <template v-slot:operation>
-          <el-button type="primary">编辑</el-button>
+        <template v-slot:operation="{ row }">
+          <div>
+            <BsgoalBaseButton :task="task" :values="row" />
+          </div>
         </template>
       </BsgoalBaseSearchTable>
     </div>