@bsgoal/common 2.15.6 → 2.15.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bsgoal/common",
3
- "version": "2.15.6",
3
+ "version": "2.15.7",
4
4
  "private": false,
5
5
  "files": [
6
6
  "dist",
@@ -2,7 +2,7 @@
2
2
  * @Author: canlong.shen
3
3
  * @Date: 2023-04-23 16:35:24
4
4
  * @LastEditors: canlong.shen
5
- * @LastEditTime: 2023-05-31 11:44:23
5
+ * @LastEditTime: 2023-06-29 11:13:20
6
6
  * @FilePath: \common\src\components\bsgoal-base-dialog\demo.vue
7
7
  * @Description: 弹窗公共组件 演示
8
8
  *
@@ -51,9 +51,9 @@ const tabsConfigOptions = ref([
51
51
  }
52
52
  ])
53
53
 
54
- const triggerConfirm = (done) => {
54
+ const triggerConfirm = (done ) => {
55
55
  setTimeout(() => {
56
- done()
56
+ done(false)
57
57
  }, 3000)
58
58
  console.log('关闭前')
59
59
  }
@@ -2,7 +2,7 @@
2
2
  * @Author: canlong.shen
3
3
  * @Date: 2023-04-23 16:35:19
4
4
  * @LastEditors: canlong.shen
5
- * @LastEditTime: 2023-06-01 11:56:02
5
+ * @LastEditTime: 2023-06-29 10:41:56
6
6
  * @FilePath: \common\src\components\bsgoal-base-dialog\index.vue
7
7
  * @Description: 弹窗公共组件
8
8
  *
@@ -97,8 +97,10 @@ const cancel = () => {
97
97
  * @return {*}
98
98
  */
99
99
  const confirm = (done = () => {}) => {
100
- emits('on-confirm', () => {
101
- dialogVisible.value = false
100
+ emits('on-confirm', (close = true) => {
101
+ if(close){
102
+ dialogVisible.value = false
103
+ }
102
104
  done()
103
105
  })
104
106
  }
@@ -2,7 +2,7 @@
2
2
  * @Author: canlong.shen
3
3
  * @Date: 2023-04-17 11:44:29
4
4
  * @LastEditors: canlong.shen
5
- * @LastEditTime: 2023-06-26 11:56:55
5
+ * @LastEditTime: 2023-06-29 11:13:00
6
6
  * @FilePath: \common\src\components\bsgoal-base-form\index.vue
7
7
  * @Description: 表单公共组件
8
8
  *
@@ -340,7 +340,8 @@ const filterSlotProps = (model = {}) => {
340
340
  const rebuildModel = {}
341
341
  for (const prop of Object.keys(model)) {
342
342
  if (!prop.startsWith('_')) {
343
- rebuildModel[prop] = model[prop]
343
+ const value = model[prop]
344
+ rebuildModel[prop] = parseInt(value) ? +value : value
344
345
  }
345
346
  }
346
347
  return rebuildModel
@@ -440,7 +441,7 @@ defineExpose({
440
441
  limit = limits,
441
442
  length = 255,
442
443
  visible = true,
443
- multiple= false,
444
+ multiple = false,
444
445
  formatter = (v) => {
445
446
  return v
446
447
  },