@bsgoal/common 2.15.6 → 2.15.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsgoal/common",
-  "version": "2.15.6",
+  "version": "2.15.8",
   "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-31 11:44:23
+ * @LastEditTime: 2023-06-30 09:17:44
  * @FilePath: \common\src\components\bsgoal-base-dialog\demo.vue
  * @Description: 弹窗公共组件 演示
  * 
@@ -53,10 +53,17 @@ const tabsConfigOptions = ref([
 
 const triggerConfirm = (done) => {
   setTimeout(() => {
-    done()
+    done(false)
   }, 3000)
   console.log('关闭前')
 }
+
+const triggerShow = (status = '') => {
+  console.log(status, '显示')
+}
+const triggerHide = (status = '') => {
+  console.log(status, '关闭')
+}
 </script>
 <template>
   <div class="bsgoal-base-dialog-demo">
@@ -72,6 +79,8 @@ const triggerConfirm = (done) => {
         size="max"
         type="blank"
         @on-confirm="triggerConfirm"
+        @on-show="triggerShow"
+        @on-hide="triggerHide"
       >
         <BsgoalBaseTabs v-memo="activeTabName" :config-options="tabsConfigOptions" />
       </BsgoalBaseDialog>

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-06-01 11:56:02
+ * @LastEditTime: 2023-06-30 09:13:34
  * @FilePath: \common\src\components\bsgoal-base-dialog\index.vue
  * @Description:  弹窗公共组件
  * 
@@ -78,7 +78,7 @@ const props = defineProps({
   }
 })
 
-const emits = defineEmits(['update:modelValue', 'on-confirm'])
+const emits = defineEmits(['update:modelValue', 'on-confirm','on-show','on-hide'])
 const dialogVisible = ref(props.modelValue.value)
 
 /**
@@ -97,8 +97,10 @@ const cancel = () => {
  * @return {*}
  */
 const confirm = (done = () => {}) => {
-  emits('on-confirm', () => {
-    dialogVisible.value = false
+  emits('on-confirm', (close = true) => {
+    if (close) {
+      dialogVisible.value = false
+    }
     done()
   })
 }
@@ -112,6 +114,11 @@ watch(
 
 watch(dialogVisible, (v) => {
   emits('update:modelValue', v)
+  if (v) {
+    emits('on-show', v)
+  } else {
+    emits('on-hide', v)
+  }
 })
 
 //  设置不同尺寸

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-06-26 09:20:07
+ * @LastEditTime: 2023-06-30 08:59:19
  * @FilePath: \common\src\components\bsgoal-base-form\demo.vue
  * @Description: 表单公共组件演示组件
  * 
@@ -32,6 +32,9 @@ const confirm = () => {
     console.log('res', res)
   })
 }
+const resetFields = () => {
+  BSGOAL_BASE_FORM_REF.value.resetFields()
+}
 
 const bindModel = ref({ prop1: '111', prop99: 1, prop101: '否', prop102: '0', _prop104: '' })
 
@@ -265,6 +268,7 @@ const configOptions = ref([
       <template #_prop104> 6666 </template>
     </BsgoalBaseForm>
     <el-button type="primary" @click="confirm">提交</el-button>
+    <el-button type="primary" @click="resetFields">重置</el-button>
   </div>
 </template>
 <style lang="scss" scoped>

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-06-26 11:56:55
+ * @LastEditTime: 2023-06-30 09:19:56
  * @FilePath: \common\src\components\bsgoal-base-form\index.vue
  * @Description:  表单公共组件 
  * 
@@ -340,7 +340,9 @@ const filterSlotProps = (model = {}) => {
   const rebuildModel = {}
   for (const prop of Object.keys(model)) {
     if (!prop.startsWith('_')) {
-      rebuildModel[prop] = model[prop]
+      const value = model[prop]
+      const valueInt = Number.parseInt(value);
+      rebuildModel[prop] = valueInt || ['0', 0].includes(value) ? valueInt : value;
     }
   }
   return rebuildModel
@@ -406,7 +408,8 @@ const setActiveValueText = (range = [], type = '') => {
 defineExpose({
   triggerOperationClear,
   triggerOperationForm,
-  validateForm
+  validateForm,
+  resetFields:triggerOperationClear
 })
 </script>
 <template>
@@ -440,7 +443,7 @@ defineExpose({
                 limit = limits,
                 length = 255,
                 visible = true,
-                multiple= false,
+                multiple = false,
                 formatter = (v) => {
                   return v
                 },

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-06-26 11:52:21
+ * @LastEditTime: 2023-06-29 14:43:56
  * @FilePath: \common\src\components\bsgoal-base-search-table\demo.vue
  * @Description: 查询 + 表格 组合公共组件
  * 
@@ -743,6 +743,7 @@ const task = (done = () => {}, rows = {}) => {
         ref="BSGOAL_BASE_SEARCH_TABLE_REF"
         selection
         operation
+        :show-summary="true"
         :call="call"
         :fetch="fetch"
         :config-options="configOptions"

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-18 17:04:47
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-06-28 14:19:38
+ * @LastEditTime: 2023-06-29 14:35:56
  * @FilePath: \common\src\components\bsgoal-base-search-table\index.vue
  * @Description: 查询+表格 基础组件
  * 
@@ -130,6 +130,13 @@ const props = defineProps({
   pageSize: {
     type: [Number],
     default: 20
+  },
+  /**
+   * 是否显示合计
+   */
+  showSummary: {
+    type: [Boolean],
+    default: false
   }
 })
 
@@ -234,6 +241,7 @@ defineExpose({
       <!-- S 表格 -->
       <BsgoalBaseTable
         ref="BSGOAL_BASE_TABLE_REF"
+        :show-summary="showSummary"
         :page-size="pageSize"
         :map-props="mapProps"
         :operationWidth="operationWidth"

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-10 14:26:44
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-06-28 13:53:43
+ * @LastEditTime: 2023-06-29 17:34:31
  * @FilePath: \common\src\components\bsgoal-base-table\demo.vue
  * @Description: 表格公共组件演示页面
  * 
@@ -163,52 +163,52 @@ const data = ref([])
 setTimeout(() => {
   data.value = [
     {
-      prop1: 'prop1',
-      prop2: 'prop2',
-      prop3: 'prop3',
-      prop4: 'prop4',
-      prop5: 'prop5',
-      prop6: 'prop6'
+      prop1: 1,
+      prop2: 2,
+      prop3: 3,
+      prop4: 4,
+      prop5: 5,
+      prop6: 6
     },
     {
-      prop1: 'prop1',
-      prop2: 'prop2',
-      prop3: 'prop3',
-      prop4: 'prop4',
-      prop5: 'prop5',
-      prop6: 'prop6'
+      prop1: 1,
+      prop2: 2,
+      prop3: 3,
+      prop4: 4,
+      prop5: 5,
+      prop6: 6
     },
     {
-      prop1: 'prop1',
-      prop2: 'prop2',
-      prop3: 'prop3',
-      prop4: 'prop4',
-      prop5: 'prop5',
-      prop6: 'prop6'
+      prop1: 1,
+      prop2: 2,
+      prop3: 3,
+      prop4: 4,
+      prop5: 5,
+      prop6: 6
     },
     {
-      prop1: 'prop1',
-      prop2: 'prop2',
-      prop3: 'prop3',
-      prop4: 'prop4',
-      prop5: 'prop5',
-      prop6: 'prop6'
+      prop1: 1,
+      prop2: 2,
+      prop3: 3,
+      prop4: 4,
+      prop5: 5,
+      prop6: 6
     },
     {
-      prop1: 'prop1',
-      prop2: 'prop2',
-      prop3: 'prop3',
-      prop4: 'prop4',
-      prop5: 'prop5',
-      prop6: 'prop6'
+      prop1: 1,
+      prop2: 2,
+      prop3: 3,
+      prop4: 4,
+      prop5: 5,
+      prop6: 6
     },
     {
-      prop1: 'prop1',
-      prop2: 'prop2',
-      prop3: 'prop3',
-      prop4: 'prop4',
-      prop5: 'prop5',
-      prop6: 'prop6'
+      prop1: 1,
+      prop2: 2,
+      prop3: 3,
+      prop4: 4,
+      prop5: 5,
+      prop6: 6
     }
   ]
 }, 3000)
@@ -271,7 +271,7 @@ const clearSelection = () => {
       ref="BSGOAL_EL_TABLE_REF"
       operation-width="200"
       operation
-      selection
+      :showSummary="true"
       :has-page="false"
       :config-options="configOptionsTable"
       :data="data"
@@ -283,7 +283,7 @@ const clearSelection = () => {
       <!-- S 操作项 -->
       <template v-slot:operation="{ row }">
         <div>
-          {{ row }}
+          <!-- {{ row }} -->
         </div>
       </template>
       <!-- E 操作项 -->

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-10 11:29:04
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-06-28 15:50:58
+ * @LastEditTime: 2023-06-30 08:40:07
  * @FilePath: \common\src\components\bsgoal-base-table\index.vue
  * @Description: 
  * 
@@ -133,6 +133,13 @@ const props = defineProps({
   pageSize: {
     type: [Number],
     default: 20
+  },
+  /**
+   * 是否显示合计
+   */
+  showSummary: {
+    type: [Boolean],
+    default: false
   }
 })
 
@@ -268,6 +275,29 @@ const clearSelection = () => {
 
 // ---> E 暴露事件 <---
 
+// ---> S 表格绑定的方法 <---
+
+const summaryMethod = (columns = '') => {
+  const dataList = columns.data
+  const calcResultList = []
+
+  dataList.forEach((fi = {}) => {
+    let calcIndex = 0
+    for (const [prop, value] of Object.entries(fi)) {
+      const cellValue = calcResultList[calcIndex]
+      const cellValueInt = parseInt(cellValue) || 0
+      const valueInt = parseInt(value) || 0
+      calcResultList[calcIndex] = cellValueInt + valueInt
+      calcIndex++
+    }
+  })
+
+
+  return ['合计', ...calcResultList.slice(1)]
+}
+
+// ---> E 表格绑定的方法 <---
+
 // ---> S 兼容微前端 <---
 const isMicroApp = window.__MICRO_APP_ENVIRONMENT__
 // ---> E 兼容微前端 <---
@@ -299,6 +329,9 @@ defineExpose({
           highlight-current-row
           style="width: 100%"
           v-loading="tableLoading"
+          sum-text="合计"
+          :summary-method="summaryMethod"
+          :show-summary="showSummary"
           :data="tableData"
           :header-cell-style="{
             fontWeight: 'bold',

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-06-20 09:20:51
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-06-28 14:22:20
+ * @LastEditTime: 2023-06-30 08:42:21
  * @FilePath: \common\src\components\bsgoal-base-tree-table\demo.vue
  * @Description:  树 + 列表 + 演示
  * 
@@ -826,6 +826,7 @@ const clearSelection = () => {
         ref="BSGOAL_BASE_TREE_TABLE_REF"
         selection
         operation
+        showSummary
         :expandedKeys="expandedKeys"
         :tree-data="treeData"
         :page-size="40"

package/src/components/bsgoal-base-tree-table/index.vue

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-06-20 09:20:44
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-06-28 14:21:32
+ * @LastEditTime: 2023-06-29 14:37:18
  * @FilePath: \common\src\components\bsgoal-base-tree-table\index.vue
  * @Description: 树结构  + 列表
  * 
@@ -168,6 +168,13 @@ const props = defineProps({
   expandedKeys: {
     type: [Array],
     default: () => []
+  },
+  /**
+   * 是否显示合计
+   */
+   showSummary: {
+    type: [Boolean],
+    default: false
   }
 })
 
@@ -295,6 +302,7 @@ const tableStyler = computed(() => {
         <BsgoalBaseSearchTable
           ref="BSGOAL_BASE_SEARCH_TABLE_REF"
           v-bind="$props"
+          :show-summary="showSummary"
           @select="triggerSelect"
           @select-all="triggerSelectAll"
           @selection-change="triggerSelectionChange"

package/src/entry.js

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-05-11 18:31:55
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-06-25 17:21:19
+ * @LastEditTime: 2023-06-29 13:42:31
  * @FilePath: \common\src\entry.js
  * @Description: 打包 入口文件
  * 
@@ -30,6 +30,7 @@ import BsgoalBaseInput from '@/components/bsgoal-base-input/index.vue'
 import BsgoalBaseTreeTable from '@/components/bsgoal-base-tree-table/index.vue'
 import BsgoalBaesPopover from '@/components/bsgoal-baes-popover/index.vue'
 import BsgoalBaseViewer from '@/components/bsgoal-base-viewer/index.vue'
+import BsgoalBaseTooltip from '@/components/bsgoal-base-tooltip/index.vue'
 import componentTypeEnums from '@/enums/componentTypeEnums.js'
 import { useFetch } from '@/combines/useFetchs.js'
 
@@ -61,7 +62,8 @@ export default {
       BsgoalBaseInput,
       BsgoalBaseTreeTable,
       BsgoalBaesPopover,
-      BsgoalBaseViewer
+      BsgoalBaseViewer,
+      BsgoalBaseTooltip
     }
 
     for (const [name, component] of Object.entries(componentsMap)) {