@bsgoal/common 2.14.4 → 2.14.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsgoal/common",
-  "version": "2.14.4",
+  "version": "2.14.6",
   "private": false,
   "files": [
     "dist",
@@ -26,6 +26,7 @@
     "issue": "npm run  build && npm publish"
   },
   "dependencies": {
+    "@bsgoal/common": "2.14.4",
     "element-plus": "^2.3.3",
     "vue": "^3.3.4",
     "vue-router": "^4.1.6",

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-21 08:43:39
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-06-25 09:47:05
+ * @LastEditTime: 2023-06-27 11:49:24
  * @FilePath: \common\src\components\bsgoal-base-tree\demo.vue
  * @Description: 左侧树的演示
  * 
@@ -45,7 +45,7 @@ const createData = (maxDeep, maxChildren, minNodesNumber, deep = 1, key = 'node'
 treeData.value = createData(4, 4, 4)
 
 const triggerTreeClick = (value, node, treeNode, event) => {
-  console.log('triggerTreeClick ================');
+  console.log('triggerTreeClick ================')
   // console.log('value', value)
   // console.log('node', node)
   // console.log('treeNode', treeNode)
@@ -64,6 +64,8 @@ const treeLazyLoad = (node) => {
         },
         {
           label: 'label2-2',
+          key: 'label2-2',
+
           children: [
             {
               label: 'label2-2-1'
@@ -86,7 +88,8 @@ const treeInitNode = (node) => {
       resolve([
         {
           value: 'value1',
-          label: 'label1'
+          label: 'label1',
+          nodeKey:'label1'
         }
       ])
     }, 1000)
@@ -96,6 +99,7 @@ const treeInitNode = (node) => {
 const triggerAddClick = (params = '') => {
   console.log('triggerAddClick', params)
 }
+
 </script>
 <template>
   <div class="bsgoal-base-tree-demo">
@@ -107,16 +111,23 @@ const triggerAddClick = (params = '') => {
             label: 'label999',
             children: [
               {
-                label: '8888'
+                label: '8888',
+                key: '8888'
               }
             ]
           }
         ]"
+        node-key="nodeKey"
         :lazy-load="treeLazyLoad"
         :init-node="treeInitNode"
+        :expanded-keys="['label1']"
         @on-click="triggerTreeClick"
         @on-click-add="triggerAddClick"
-      />
+      >
+        <template #prefix="{data}">
+          <div>66</div>
+        </template>
+      </BsgoalBaseTree>
     </div>
   </div>
 </template>

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

@@ -2,7 +2,7 @@
  * @Author: canlong.shen
  * @Date: 2023-04-21 08:43:33
  * @LastEditors: canlong.shen
- * @LastEditTime: 2023-06-25 17:37:08
+ * @LastEditTime: 2023-06-27 11:47:51
  * @FilePath: \common\src\components\bsgoal-base-tree\index.vue
  * @Description: 虚拟化树型结构 公共组件
  * 
@@ -66,6 +66,20 @@ const props = defineProps({
   initNode: {
     type: [Function],
     default: null
+  },
+  /**
+   * 节点的 key
+   */
+  nodeKey: {
+    type: [String],
+    default: 'key'
+  },
+  /**
+   * 默认展开的节点
+   */
+  expandedKeys: {
+    type: [Array],
+    default: () => []
   }
 })
 
@@ -132,8 +146,8 @@ const loadNode = async (node, resolve, props) => {
 }
 
 const lazyGet = computed(() => {
-  const { lazyLoad = null , initNode = null} = props
-  if(lazyLoad && initNode ){
+  const { lazyLoad = null, initNode = null } = props
+  if (lazyLoad && initNode) {
     return true
   }
   return false
@@ -162,30 +176,40 @@ const handleItemAdd = (node = null, data = {}) => {
         <el-tree
           ref="EL_TREE_REF"
           highlight-current
+          auto-expand-parent
           empty-text="暂无数据"
+          :nodeKey="nodeKey"
           :data="treeData"
           :lazy="lazyGet"
           :load="(node, resolve) => loadNode(node, resolve, props)"
           :expand-on-click-node="false"
           :props="treeProps"
           :filter-node-method="filterNode"
+          :default-expanded-keys="expandedKeys"
           @node-click="clickNodeTree"
         >
           <template #default="{ node, data }">
-            <div class="base_tree_node">
-              <!-- S 节点名称 -->
-              <span class="base_tree_node_label">
-                {{ node.label }}
-              </span>
-              <!-- E 节点名称 -->
-              <!-- S 操作符号 -->
-              <span class="base_tree_node_icon" v-show="data.hasIcon">
-                <el-icon color="var(--el-color-primary)"  @click.stop="handleItemAdd(node, data)">
-                  <Plus />
-                </el-icon>
-              </span>
-              <!-- E 操作符号 -->
-            </div>
+            <slot :data="data">
+              <div class="base_tree_node">
+                <!-- S 节点前图标 -->
+                <div v-if="$slots.prefix">
+                  <slot name="prefix" :data="data" ></slot>
+                </div>
+                <!-- E 节点前图标 -->
+                <!-- S 节点名称 -->
+                <span class="base_tree_node_label">
+                  {{ node.label }}
+                </span>
+                <!-- E 节点名称 -->
+                <!-- S 操作符号 -->
+                <span class="base_tree_node_icon" v-if="data.hasIcon">
+                  <el-icon color="var(--el-color-primary)" @click.stop="handleItemAdd(node, data)">
+                    <Plus />
+                  </el-icon>
+                </span>
+                <!-- E 操作符号 -->
+              </div>
+            </slot>
           </template>
         </el-tree>
         <!-- E 树结构 -->

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-25 16:46:31
+ * @LastEditTime: 2023-06-27 11:27:35
  * @FilePath: \common\src\components\bsgoal-base-tree-table\demo.vue
  * @Description:  树 + 列表 + 演示
  * 
@@ -770,7 +770,7 @@ const triggerTreeAddClick = (params = '') => {
 }
 
 const treeData = ref([])
-
+const expandedKeys = ['label2-2']
 setTimeout(() => {
   treeData.value = ref([
     {
@@ -779,6 +779,7 @@ setTimeout(() => {
       hasIcon: true
     },
     {
+      key:'label2-2',
       label: 'label2-2',
       children: [
         {
@@ -807,6 +808,7 @@ const test = () => {
         ref="BSGOAL_BASE_TREE_TABLE_REF"
         selection
         operation
+        :expandedKeys="expandedKeys"
         :tree-data="treeData"
         :page-size="40"
         :fetch="fetch"
@@ -815,6 +817,9 @@ const test = () => {
         @on-click-tree="triggerTreeClick"
         @on-add-tree="triggerTreeAddClick"
       >
+      <!-- <template #tree="{data}">
+         <div>{{ data }}</div>
+      </template> -->
       <!-- <template #prop1="{row}">
          <div>{{ row }}</div>
       </template> -->

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-26 11:54:08
+ * @LastEditTime: 2023-06-27 11:50:21
  * @FilePath: \common\src\components\bsgoal-base-tree-table\index.vue
  * @Description: 树结构  + 列表
  * 
@@ -233,7 +233,15 @@ const tableStyler = computed(() => {
           @on-switch="triggerTreeSwitch"
           @on-add="triggerTreeAdd"
           @on-click="triggerTreeClick"
-        ></BsgoalBaseTree>
+        >
+          <template #default="{ data }">
+            <slot name="tree" :data="data"></slot>
+          </template>
+
+          <template #prefix="{ data }">
+            <slot name="tree-prefix" :data="data"></slot>
+          </template>
+        </BsgoalBaseTree>
         <!-- E 树 -->
       </div>
       <div class="base_tree_table--table" :style="tableStyler">