haiwei-ui 1.2.7 → 1.2.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haiwei-ui",
-  "version": "1.2.7",
+  "version": "1.2.9",
   "description": "HaiWei前端组件库",
   "author": "Eric",
   "license": "ISC",
@@ -8,7 +8,7 @@
   "scripts": {
     "serve": "vue-cli-service lint && vue-cli-service serve",
     "build": "vue-cli-service lint && vue-cli-service build",
-    "lint": "vue-cli-service lint",
+    "lint": "vue-cli-service lint --fit",
     "cm": "rimraf node_modules && rimraf dist",
     "cc": "rimraf node_modules/.cache",
     "i": "cd ./script && npm_install.bat",

package/packages/components/list/components/querybar/index.vue

@@ -13,6 +13,9 @@
       <el-form-item v-if="exportEnabled" v-nm-has="exportBtnCode">
         <nm-button type="primary" @click="onExport" icon="export" text="导出" />
       </el-form-item>
+      <el-form-item v-if="importEnabled" v-nm-has="importBtnCode">
+        <nm-button type="primary" @click="onImport" icon="import" text="导入" />
+      </el-form-item>
       <el-form-item v-if="advanced_.enabled">
         <nm-button ref="showAdvnacedBtn" type="warning" @click="onAdvancedClick">
           高级查询
@@ -93,7 +96,11 @@ export default {
     /**显示导出按钮 */
     exportEnabled: Boolean,
     /**导出按钮权限编码 */
-    exportBtnCode: String
+    exportBtnCode: String,
+    /**显示导入按钮 */
+    importEnabled: Boolean,
+    /**导入按钮权限编码 */
+    importBtnCode: String
   },
   computed: {
     model_() {
@@ -189,6 +196,9 @@ export default {
     },
     onExport() {
       this.$parent.triggerExport()
+    },
+    onImport() {
+      this.$parent.triggerImport()
     }
   },
   mounted() {

package/packages/components/list/components/table/index.vue

@@ -104,9 +104,39 @@
         const parent = this.$parent
         
         // 检查是否启用树形全选
-        if (parent.isTreeSelectAllEnabled && parent.isTreeSelectAllEnabled()) {
-          // 树形全选模式
-          if (selection.length > 0) {
+        const isTreeSelectAllEnabled = parent.isTreeSelectAllEnabled && parent.isTreeSelectAllEnabled()
+        
+        if (isTreeSelectAllEnabled) {
+          // 判断是全选还是取消全选
+          const visibleRowsCount = this.rows.length
+          
+          // 简化逻辑：如果selection为空数组，肯定是取消全选
+          // 如果selection不为空，需要进一步判断
+          let isSelectAllOperation = false
+          
+          if (selection.length === 0) {
+            // selection为空数组，肯定是取消全选
+            isSelectAllOperation = false
+          } else {
+            // selection不为空，需要判断
+            const hasExistingSelection = parent.selection && parent.selection.length > 0
+            const hasManySelected = hasExistingSelection && parent.selection.length > visibleRowsCount
+            
+            if (!hasExistingSelection) {
+              // 还没有选择任何记录，肯定是全选操作
+              isSelectAllOperation = true
+            } else if (hasManySelected) {
+              // 已经选择了很多记录（包括子节点），肯定是取消全选操作
+              isSelectAllOperation = false
+            } else {
+              // 其他情况：选择了一些记录但不多
+              // 如果selection包含当前页显示的所有行，那么是全选操作
+              // 否则是取消全选操作
+              isSelectAllOperation = selection.length >= visibleRowsCount
+            }
+          }
+          
+          if (isSelectAllOperation) {
             // 选择所有节点（包括子节点）
             parent.selectAllTreeNodes(parent.rows, parent.selection)
           } else {

package/packages/components/list/index.vue

@@ -495,6 +495,11 @@ export default {
         
         if (!isSelected) {
           selection.push(node)
+          
+          // 更新表格UI选择状态
+          if (this.$refs.table && this.$refs.table.toggleRowSelection) {
+            this.$refs.table.toggleRowSelection(node, true)
+          }
         }
         
         // 递归处理子节点
@@ -516,13 +521,18 @@ export default {
         const rowKeyValue = typeof this.rowKey === 'function' ? this.rowKey(node) : node[this.rowKey]
         
         // 从选择中移除当前节点
-        const index = selection.findIndex(s => {
+        const selectedIndex = selection.findIndex(s => {
           const selectedKey = typeof this.rowKey === 'function' ? this.rowKey(s) : s[this.rowKey]
           return selectedKey === rowKeyValue
         })
         
-        if (index > -1) {
-          selection.splice(index, 1)
+        if (selectedIndex > -1) {
+          selection.splice(selectedIndex, 1)
+          
+          // 更新表格UI选择状态
+          if (this.$refs.table && this.$refs.table.toggleRowSelection) {
+            this.$refs.table.toggleRowSelection(node, false)
+          }
         }
         
         // 递归处理子节点
@@ -538,7 +548,21 @@ export default {
     /** 检查是否启用树形全选 */
     isTreeSelectAllEnabled() {
       const treeSelectAllOptions = this.$_.assignIn({}, def.treeSelectAllOptions, this.treeSelectAll)
-      return treeSelectAllOptions.enabled && this.treeProps && this.treeProps.children
+      const enabled = treeSelectAllOptions.enabled
+      
+      // 检查是否启用树形全选：需要同时满足以下条件：
+      // 1. treeSelectAll.enabled 为 true
+      // 2. treeProps 存在
+      // 3. treeProps.children 存在（可以是任何值，只要存在就行）
+      const hasTreeProps = !!this.treeProps
+      const hasChildrenProp = hasTreeProps && this.treeProps.children !== undefined && this.treeProps.children !== null
+      
+      return enabled && hasTreeProps && hasChildrenProp
+    },
+
+    /** 获取选中的记录 */
+    getSelection() {
+      return this.selection
     }
   },
   mounted() {

package/src/views/components/advanced/list/demo1/demo.vue

@@ -1,11 +1,16 @@
 <template>
-  <nm-list v-bind="list">
+  <nm-list ref="list" v-bind="list">
     <template v-slot:querybar>
       <el-form-item label="姓名：" prop="name">
         <el-input v-model="list.model.name" />
       </el-form-item>
     </template>
 
+    <!-- 操作按钮 -->
+    <template v-slot:querybar-buttons>
+      <nm-button type="primary" text="显示选中" icon="view" @click="showSelection" />
+    </template>
+
     <template v-slot:col-operation>
       <nm-button type="text" text="编辑" icon="edit" />
       <nm-button-delete type="text" :action="remove" id="1" @success="onSuccess" />
@@ -21,7 +26,24 @@
           icon: 'list',
           action: this.query,
           rowKey: 'id',
+
+          /** 启用多选功能 */
+          multiple: true,
+
+          /** 树形全选配置 */
+          treeSelectAll: {
+            enabled: true, // 启用树形全选
+            defaultSelectAll: true // 默认全部选择
+          },
+
+          /** 树形表格配置 */
           treeProps: { children: 'children', hasChildren: 'hasChildren' },
+          defaultExpandAll: true,
+
+          /** 选择列配置 */
+          selectionWidth: '55',
+          selectionFixed: true,
+
           model: {
             name: ''
           },
@@ -84,6 +106,20 @@
       remove() {},
       onSuccess() {
         this.query()
+      },
+
+      /** 显示选中的记录 */
+      showSelection() {
+        const listRef = this.$refs.list
+        if (listRef && listRef.getSelection) {
+          const selection = listRef.getSelection()
+          if (selection && selection.length > 0) {
+            const names = selection.map(item => item.name).join(', ')
+            this.$message.success(`已选中 ${selection.length} 条记录：${names}`)
+          } else {
+            this.$message.info('没有选中任何记录')
+          }
+        }
       }
     }
   }