@liuzengwei/element-ui 2.15.5-xn.56 → 2.15.5-xn.58

package/lib/theme-chalk/segmented.css

@@ -1 +1 @@
-.el-segmented{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;padding:0;background-color:transparent;border-radius:2px;position:relative}.el-segmented.is-disabled{opacity:.6;cursor:not-allowed}.el-segmented--block{width:100%}.el-segmented--vertical{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;width:auto}.el-segmented--large .el-segmented__item{padding:12px 15px;font-size:14px}.el-segmented--small .el-segmented__item{padding:8px 12px;font-size:13px}.el-segmented__item{-webkit-box-flex:1;-ms-flex:1;flex:1;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding:10px;cursor:pointer;border-radius:0;-webkit-transition:all .2s cubic-bezier(.645,.045,.355,1);transition:all .2s cubic-bezier(.645,.045,.355,1);font-size:14px;line-height:20px;color:#86909C;position:relative;background-color:#FFF;border:1px solid #F2F2F2}.el-segmented__item:not(:first-child){border-left:none}.el-segmented__item:first-child{border-radius:2px 0 0 2px}.el-segmented__item:last-child{border-radius:0 2px 2px 0}.el-segmented__item:first-child:last-child{border-radius:2px}.el-segmented__item:hover{background-color:rgba(72,133,248,.1)}.el-segmented__item.is-selected{background-color:#4885F8;color:#FFF;border-color:#4885F8;z-index:1}.el-segmented__item.is-selected:hover{background-color:#4885F8}.el-segmented__item.is-disabled{cursor:not-allowed;color:#86909C;background-color:#F5F7FA}.el-segmented__item.is-disabled:hover{background-color:#F5F7FA}.el-segmented__item.is-disabled.is-selected{background-color:#F5F7FA;color:#86909C;border-color:#F2F2F2}.el-segmented__item-input{position:absolute;opacity:0;pointer-events:none}.el-segmented__item-label{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;width:100%}.el-segmented.el-segmented--block .el-segmented__item{min-width:0}.el-segmented.el-segmented--stretch{width:100%;background-color:#FFF;border:1px solid #F2F2F2;border-radius:2px}.el-segmented.el-segmented--stretch .el-segmented__item{-webkit-box-flex:0;-ms-flex:none;flex:none;border:none;border-right:1px solid #F2F2F2}.el-segmented.el-segmented--vertical{width:auto}.el-segmented.el-segmented--vertical .el-segmented__item{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;width:100%}.el-segmented.el-segmented--vertical .el-segmented__item:not(:first-child){border-top:none;border-left:1px solid #F2F2F2}.el-segmented.el-segmented--vertical .el-segmented__item:first-child{border-radius:2px 2px 0 0}.el-segmented.el-segmented--vertical .el-segmented__item:last-child{border-radius:0 0 2px 2px}.el-segmented.el-segmented--vertical .el-segmented__item:first-child:last-child{border-radius:2px}
+.el-segmented,.el-segmented__item{display:-webkit-inline-box;display:-ms-inline-flexbox;position:relative}.el-segmented{display:inline-flex;padding:0;background-color:transparent;border-radius:2px}.el-segmented.is-disabled{opacity:.6;cursor:not-allowed}.el-segmented--block{width:100%}.el-segmented--vertical{-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column;width:auto}.el-segmented--large .el-segmented__item{padding:12px 15px;font-size:14px}.el-segmented--small .el-segmented__item{padding:8px 12px;font-size:13px}.el-segmented__item{-webkit-box-flex:0;-ms-flex:0 1 auto;flex:0 1 auto;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;padding:10px;cursor:pointer;border-radius:0;-webkit-transition:all .2s cubic-bezier(.645,.045,.355,1);transition:all .2s cubic-bezier(.645,.045,.355,1);font-size:14px;line-height:20px;color:#86909C;background-color:#FFF;border:1px solid #F2F2F2}.el-segmented__item:not(:first-child){border-left:none}.el-segmented__item:first-child{border-radius:2px 0 0 2px}.el-segmented__item:last-child{border-radius:0 2px 2px 0}.el-segmented__item:first-child:last-child{border-radius:2px}.el-segmented__item:hover{background-color:rgba(72,133,248,.1)}.el-segmented__item.is-selected{background-color:#4885F8;color:#FFF;border-color:#4885F8;z-index:1}.el-segmented__item.is-selected:hover{background-color:#4885F8}.el-segmented__item.is-disabled{cursor:not-allowed;color:#86909C;background-color:#F5F7FA}.el-segmented__item.is-disabled:hover{background-color:#F5F7FA}.el-segmented__item.is-disabled.is-selected{background-color:#F5F7FA;color:#86909C;border-color:#F2F2F2}.el-segmented__item-input{position:absolute;opacity:0;pointer-events:none}.el-segmented__item-label{display:-webkit-inline-box;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;white-space:nowrap}.el-segmented.el-segmented--block .el-segmented__item{min-width:0}.el-segmented.el-segmented--stretch{width:100%;background-color:#FFF;border:1px solid #F2F2F2;border-radius:2px}.el-segmented.el-segmented--stretch .el-segmented__item{-webkit-box-flex:0;-ms-flex:none;flex:none;border:none;border-right:1px solid #F2F2F2}.el-segmented.el-segmented--vertical{width:auto}.el-segmented.el-segmented--vertical .el-segmented__item{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;width:100%}.el-segmented.el-segmented--vertical .el-segmented__item:not(:first-child){border-top:none;border-left:1px solid #F2F2F2}.el-segmented.el-segmented--vertical .el-segmented__item:first-child{border-radius:2px 2px 0 0}.el-segmented.el-segmented--vertical .el-segmented__item:last-child{border-radius:0 0 2px 2px}.el-segmented.el-segmented--vertical .el-segmented__item:first-child:last-child{border-radius:2px}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@liuzengwei/element-ui",
-  "version": "2.15.5-xn.56",
+  "version": "2.15.5-xn.58",
   "description": "A Component Library for Vue.js (Fork of Element UI).",
   "main": "lib/element-ui.common.js",
   "files": [

package/packages/table/src/table.vue

@@ -596,51 +596,29 @@
       },
 
       getSelectionRows() {
-        const selection = this.store.states.selection || [];
-        const result = [];
-
-        // 获取表格主体元素
-        const bodyWrapper = this.bodyWrapper;
-        if (!bodyWrapper) return result;
-
-        // 获取所有行元素
-        const rows = bodyWrapper.querySelectorAll('.el-table__row');
-
-        // 遍历选中行数据，找到对应的DOM节点
-        selection.forEach(rowData => {
-          // 通过row-key或者数据索引找到对应的行元素
-          let targetRow = null;
-          const rowKey = this.rowKey;
-
-          if (rowKey) {
-            // 如果有row-key，通过row-key查找
-            const rowId = this.getRowKey ? this.getRowKey(rowData) : rowData[rowKey];
-            rows.forEach(row => {
-              const rowKeyAttr = row.getAttribute('row-key');
-              if (rowKeyAttr === String(rowId)) {
-                targetRow = row;
-              }
-            });
-          } else {
-            // 如果没有row-key，通过数据索引查找
-            const dataIndex = this.store.states.data.indexOf(rowData);
-            if (dataIndex >= 0 && rows[dataIndex]) {
-              targetRow = rows[dataIndex];
-            }
-          }
+        return this.store.states.selection;
+      },
 
-          // 如果找到了对应的行元素，添加到结果中
-          if (targetRow) {
-            result.push({
-              row: rowData,
-              index: this.store.states.data.indexOf(rowData),
-              $el: targetRow,
-              selected: true
-            });
-          }
+      getSelectionNodes() {
+        const { selection, treeData, rowKey } = this.store.states;
+  
+        // 如果不是树形表格，返回简单的行数据
+        if (!rowKey || !Object.keys(treeData).length) {
+          return selection.map(row => ({ row }));
+        }
+  
+        // 树形表格，返回完整节点信息
+        const getRowIdentity = require('./util').getRowIdentity;
+  
+        return selection.map(row => {
+          const rowId = getRowIdentity(row, rowKey);
+          const nodeData = treeData[rowId] || {};
+  
+          return {
+            row,
+            ...nodeData
+          };
         });
-
-        return result;
       },
 
       updateAffixHeader() {