ele-admin-plus 1.1.9 → 1.2.0-beta.2

package/lib/ele-pro-table/util.cjs

@@ -59,8 +59,9 @@ function getTableSize(cacheKey, size, globalSize) {
 function getDefaultFilter(columns) {
   const filter = {};
   core.eachTree(columns, (d) => {
-    if (typeof d.columnKey === "string" && d.columnKey.length && d.filteredValue) {
-      filter[d.columnKey] = d.filteredValue;
+    const prop = d.columnKey ?? d.prop;
+    if (typeof prop === "string" && prop && d.filteredValue) {
+      filter[prop] = d.filteredValue;
     }
   });
   return filter;
@@ -166,8 +167,8 @@ function getResponseResult(data, response, globalResponse, lazy, treeOpt) {
     return {};
   }
   return {
-    data: getResponseData(util.getValue(data, dataName), lazy, treeOpt),
-    total: (countName ? util.getValue(data, countName) : void 0) ?? 0
+    data: getResponseData(core.getValue(data, dataName), lazy, treeOpt),
+    total: (countName ? core.getValue(data, countName) : void 0) ?? 0
   };
 }
 function getResponseData(data, lazy, treeProps) {
@@ -320,7 +321,7 @@ function getCheckedColumns(columns, cols, sortable, filter) {
   });
   return data;
 }
-function getColItems(columns, untitledText, filter, sortFixed, cancelFixed) {
+function getColItems(columns, untitledText, indexText, expandText, filter, sortFixed, cancelFixed) {
   const temp = columns == null ? [] : [...columns];
   if (sortFixed) {
     temp.sort((a, b) => {
@@ -336,9 +337,10 @@ function getColItems(columns, untitledText, filter, sortFixed, cancelFixed) {
       uid: colId,
       //prop: d.prop,
       //columnKey: d.columnKey,
-      label: d.label || untitledText,
+      label: d.label || (d.type === "index" ? indexText : d.type === "expand" ? expandText : untitledText),
       checked: !d.hideInTable,
-      fixed: cancelFixed ? false : parent == null ? d.fixed : false
+      fixed: cancelFixed ? false : parent == null ? d.fixed : false,
+      type: d.type
     };
   });
 }
@@ -411,7 +413,7 @@ function getCellText(column, row, index, pageIndex) {
   if (column.type === "index") {
     return util$1.getIndexValue(index, column.index, pageIndex);
   }
-  const propValue = util.getValue(row, column.prop);
+  const propValue = core.getValue(row, column.prop);
   if (typeof column.formatter === "function") {
     return column.formatter(row, column, propValue, index);
   }
@@ -426,56 +428,188 @@ function getHeaderCellText(column, index) {
   }
   return column.label == null ? "" : String(column.label);
 }
-function getExportData(data, columns, spanMethod, pageIndex, showSummary, sumText, summaryMethod) {
+function getExportBodyNode(data, childrenField = "children", level = 0, parents = []) {
+  const bodyDodes = [];
+  let maxDepth = 0;
+  data.forEach((row, index) => {
+    const node = { row, index, level, childSize: 0 };
+    bodyDodes.push(node);
+    parents.forEach((parent) => {
+      parent.childSize++;
+    });
+    const children = row[childrenField];
+    if (children && children.length) {
+      const { depth, nodes } = getExportBodyNode(
+        children,
+        childrenField,
+        level + 1,
+        [...parents, node]
+      );
+      maxDepth = Math.max(maxDepth, depth);
+      nodes.forEach((n) => {
+        bodyDodes.push(n);
+      });
+    }
+  });
+  return { depth: maxDepth + 1, nodes: bodyDodes };
+}
+function getExportData(data, columns, spanMethod, pageIndex, showSummary, sumText, summaryMethod, childrenField, showTreeIndex, showHeader) {
+  const { nodes, depth } = getExportBodyNode(data, childrenField);
   const { rows: headerRows, cols: bodyCols } = util$1.analyseColumns(columns);
+  const showExpandIndex = bodyCols.some((c) => {
+    var _a;
+    return ((_a = c.originalCol) == null ? void 0 : _a.type) === "expand";
+  }) ? showTreeIndex : false;
+  if (depth <= 1 || showExpandIndex) {
+    showTreeIndex = false;
+  }
+  const treeIconIndex = showTreeIndex ? void 0 : bodyCols.findIndex(
+    (c) => {
+      var _a;
+      return !((_a = c.originalCol) == null ? void 0 : _a.type) || !["index", "expand", "selection"].includes(c.originalCol.type);
+    }
+  );
   const bodyData = [];
-  data.forEach((row, index) => {
+  nodes.forEach((node, index) => {
+    const row = node.row;
     const bodyRowData = [];
+    const expandRowData = [];
     bodyCols.forEach((col, columnIndex) => {
-      const { key, originalCol: column } = col;
+      const { key: colKey, originalCol: column } = col;
+      const key = `${index}-${columnIndex}-${colKey}`;
       const { colspan, rowspan } = util$1.getCellSpan(
         { column, columnIndex, row, rowIndex: index },
         spanMethod
       );
       const isNone = colspan == 0 || rowspan == 0;
       const text = isNone ? "" : getCellText(column, row, index, pageIndex);
-      bodyRowData.push({ key, row, index, column, text, colspan, rowspan });
+      const dataItem = {
+        key,
+        row,
+        index,
+        column,
+        text,
+        colspan,
+        rowspan,
+        isTreeCell: depth > 1 ? columnIndex === treeIconIndex : false,
+        isTreeLeaf: !node.childSize,
+        indent: node.level
+      };
+      if (column.type === "expand") {
+        dataItem.text = showExpandIndex ? String(node.index + 1) : "";
+        if (showExpandIndex && !expandRowData.length) {
+          dataItem.rowspan = 2;
+        }
+        const expandDataItem = {
+          key: "_expand_" + key,
+          row,
+          index,
+          column,
+          text,
+          colspan: showExpandIndex ? bodyCols.length - 1 : bodyCols.length,
+          isExpandCell: true
+        };
+        if (showExpandIndex) {
+          expandRowData[0] = {
+            key: "_expand_0-" + key,
+            row,
+            index,
+            rowspan: 0,
+            colspan: 0,
+            isExpandCell: true
+          };
+          expandRowData[1] = expandDataItem;
+        } else {
+          expandRowData[0] = expandDataItem;
+        }
+      }
+      bodyRowData.push(dataItem);
     });
     bodyData.push(bodyRowData);
+    if (expandRowData.length) {
+      bodyData.push(expandRowData);
+    }
+    if (showTreeIndex) {
+      for (let i = depth - 1; i >= 0; i--) {
+        const colspan = i < node.level ? 0 : 1;
+        bodyRowData.unshift({
+          key: `_index_${index}-${i}`,
+          index,
+          text: i === node.level ? String(node.index + 1) : void 0,
+          colspan,
+          rowspan: i === node.level ? node.childSize + 1 : colspan,
+          isTreeIndex: true,
+          hideLeftBorder: i === node.level ? false : true,
+          hideRightBorder: bodyCols.length ? true : false
+        });
+      }
+    }
   });
   const headerData = [];
-  headerRows.forEach((headerCols, index) => {
-    const headerRowData = [];
-    headerCols.forEach((col) => {
-      const { key, colspan, rowspan, originalCol: column } = col;
-      const isNone = colspan == 0 || rowspan == 0;
-      const text = isNone ? "" : getHeaderCellText(column, index);
-      headerRowData.push({ key, index, column, text, colspan, rowspan });
+  if (showHeader) {
+    headerRows.forEach((headerCols, index) => {
+      const headerRowData = [];
+      headerCols.forEach((col) => {
+        const { key, colspan, rowspan, originalCol: column } = col;
+        const isNone = colspan == 0 || rowspan == 0;
+        const text = isNone ? "" : getHeaderCellText(column, index);
+        headerRowData.push({ key, index, column, text, colspan, rowspan });
+      });
+      headerData.push(headerRowData);
+      if (showTreeIndex) {
+        for (let i = depth - 1; i >= 0; i--) {
+          headerRowData.unshift({
+            key: `_index_th_${index}-${i}`,
+            index,
+            colspan: i === 0 ? index === 0 ? depth : 0 : 0,
+            rowspan: i === 0 ? index === 0 ? headerRows.length : 0 : 0,
+            isTreeIndex: true
+          });
+        }
+      }
     });
-    headerData.push(headerRowData);
-  });
+  }
   const footerData = [];
   if (showSummary && data.length) {
     const footerRowData = [];
-    const userSums = util$1.getUserSums(summaryMethod, bodyCols, data);
+    const uSum = util$1.getUserSums(summaryMethod, bodyCols, data);
     bodyCols.forEach((col, i) => {
-      const { key, dataKey, originalCol: column } = col;
-      const sumValue = util$1.getSumValue(data, dataKey);
-      footerRowData.push({
-        key,
-        column,
-        text: userSums == null ? i === 0 ? sumText : sumValue : userSums[i],
-        index: 0
-      });
+      const { key, dataKey: dKey, originalCol: column } = col;
+      const text = uSum == null ? util$1.getSumValue(data, dKey, i, sumText) : uSum[i];
+      footerRowData.push({ key, column, text, index: 0 });
     });
     footerData.push(footerRowData);
+    if (showTreeIndex) {
+      for (let i = depth - 1; i >= 0; i--) {
+        footerRowData.unshift({
+          key: `_index_tf-${i}`,
+          index: 0,
+          colspan: i === 0 ? depth : 0,
+          rowspan: i === 0 ? headerRows.length : 0,
+          isTreeIndex: true
+        });
+      }
+    }
+  }
+  if (showTreeIndex) {
+    for (let i = depth - 1; i >= 0; i--) {
+      bodyCols.unshift({ key: `_index_${i}`, width: 26 });
+    }
   }
   return { headerData, bodyData, footerData, bodyCols };
 }
 function exportCSV(fileName, headerData, bodyData, footerData) {
   const csvRows = [];
   [...headerData, ...bodyData, ...footerData].forEach((item) => {
-    csvRows.push(item.map((d) => d.text ?? "").join(","));
+    const cells = item.map((d) => {
+      const text = (d.text ?? "").replace(/,/g, "，").replace(/\n/g, "    ");
+      if (!d.isTreeCell || !d.indent) {
+        return text;
+      }
+      const indent = Array.from({ length: d.indent }).fill("  ").join("");
+      return indent + text;
+    });
+    csvRows.push(cells.join(","));
   });
   const content = encodeURIComponent(csvRows.join("\n"));
   const a = document.createElement("a");
@@ -490,13 +624,13 @@ function columnsExportFilter(item) {
   if (item.hideInExport) {
     return false;
   }
-  return !item.type || !["selection", "expand"].includes(item.type);
+  return !item.type || !["selection"].includes(item.type);
 }
 function columnsPrintFilter(item) {
   if (item.hideInPrint) {
     return false;
   }
-  return !item.type || !["selection", "expand"].includes(item.type);
+  return !item.type || !["selection"].includes(item.type);
 }
 exports.columnsExportFilter = columnsExportFilter;
 exports.columnsPrintFilter = columnsPrintFilter;
@@ -509,6 +643,7 @@ exports.getColId = getColId;
 exports.getColItems = getColItems;
 exports.getColsCacheKey = getColsCacheKey;
 exports.getDefaultFilter = getDefaultFilter;
+exports.getExportBodyNode = getExportBodyNode;
 exports.getExportData = getExportData;
 exports.getHeaderCellText = getHeaderCellText;
 exports.getInitCacheColumns = getInitCacheColumns;

package/lib/ele-pro-table/util.d.ts

@@ -1,4 +1,4 @@
-import { Pages, Orders, Filters, OrderItem, RequestOption, ResponseOption, TablePagination, DatasourceResult, ResponseResult, ReloadDataResult, ColItem, ProProps, ExportDataItem, ExportDataResult } from './types';
+import { Pages, Orders, Filters, OrderItem, RequestOption, ResponseOption, TablePagination, DatasourceResult, ResponseResult, ReloadDataResult, ColItem, ProProps, ExportBodyNode, ExportDataItem, ExportDataResult } from './types';
 import { DataItem, Column, Columns, Sorter, Filter, TableSize, TreeProps, RowKey, SpanMethod, SummaryMethod } from '../ele-data-table/types';
 import { ElePaginationProps } from '../ele-app/plus';
 
@@ -141,11 +141,13 @@ export declare function getCheckedColumns(columns: Columns | undefined, cols: Co
  * 获取列展示列表数据
  * @param columns 列配置
  * @param untitledText 未命名列文字
+ * @param indexText 序号列文字
+ * @param expandText 展开列文字
  * @param filter 过滤列的方法
  * @param sortFixed 是否对固定列排序
  * @param cancelFixed 是否取消固定列
  */
-export declare function getColItems(columns?: Columns, untitledText?: string, filter?: (item: Column) => boolean, sortFixed?: boolean, cancelFixed?: boolean): ColItem[];
+export declare function getColItems(columns?: Columns, untitledText?: string, indexText?: string, expandText?: string, filter?: (item: Column) => boolean, sortFixed?: boolean, cancelFixed?: boolean): ColItem[];
 /**
  * 获取列配置
  * @param columns 列数据
@@ -190,6 +192,17 @@ export declare function getCellText(column: Column | undefined, row: DataItem, i
  * @param index 行索引
  */
 export declare function getHeaderCellText(column: Column | undefined, index: number): string;
+/**
+ * 获取主体数据封装节点
+ * @param data 数据
+ * @param childrenField 子级字段名
+ * @param level 树形所处深度
+ * @param parents 父级节点
+ */
+export declare function getExportBodyNode(data: DataItem[], childrenField?: string, level?: number, parents?: ExportBodyNode[]): {
+    depth: number;
+    nodes: ExportBodyNode[];
+};
 /**
  * 获取导出的数据
  * @param data 元数据
@@ -199,8 +212,10 @@ export declare function getHeaderCellText(column: Column | undefined, index: num
  * @param showSummary 是否显示合计行
  * @param sumText 合计行文本
  * @param summaryMethod 合计行自定义方法
+ * @param childrenField 子级字段名
+ * @param showTreeIndex 是否显示层级序号
  */
-export declare function getExportData(data: DataItem[], columns: Columns, spanMethod?: SpanMethod, pageIndex?: number, showSummary?: boolean, sumText?: string, summaryMethod?: SummaryMethod): ExportDataResult;
+export declare function getExportData(data: DataItem[], columns: Columns, spanMethod?: SpanMethod, pageIndex?: number, showSummary?: boolean, sumText?: string, summaryMethod?: SummaryMethod, childrenField?: string, showTreeIndex?: boolean, showHeader?: boolean): ExportDataResult;
 /**
  * 导出csv文件
  * @param fileName 文件名

package/lib/ele-qr-code/style/index.cjs

@@ -1,2 +1 @@
 "use strict";
-//

package/lib/ele-qr-code-svg/style/index.cjs

@@ -1,2 +1 @@
 "use strict";
-//

package/lib/ele-segmented/style/index.cjs

@@ -1,5 +1,5 @@
 "use strict";
-require("element-plus/lib/components/tabs/style/index");
-require("element-plus/lib/components/tab-pane/style/index");
-require("element-plus/lib/components/icon/style/index");
+require("element-plus/es/components/tabs/style/index");
+require("element-plus/es/components/tab-pane/style/index");
+require("element-plus/es/components/icon/style/index");
 require("./index.scss");

package/lib/ele-segmented/style/index.d.ts

@@ -0,0 +1 @@
+

package/lib/ele-split-panel/index.cjs

@@ -3,7 +3,7 @@ const vue = require("vue");
 const elementPlus = require("element-plus");
 const icons = require("../icons");
 const ReceiverView = require("../ele-config-provider/components/receiver-view");
-const receiver = require("../ele-config-provider/receiver");
+const util = require("../ele-pro-layout/util");
 const props = require("./props");
 const _sfc_main = vue.defineComponent({
   name: "EleSplitPanel",
@@ -11,7 +11,7 @@ const _sfc_main = vue.defineComponent({
   props: props.splitPanelProps,
   emits: props.splitPanelEmits,
   setup(props2, { emit }) {
-    const isResponsive = receiver.useResponsive(props2);
+    const isResponsive = util.useResponsive(props2);
     const rootRef = vue.ref(null);
     const wrapRef = vue.ref(null);
     const sideRef = vue.ref(null);

package/lib/ele-split-panel/index.d.ts

@@ -12,7 +12,7 @@ declare const _default: import('vue').DefineComponent<{
     collapse: BooleanConstructor;
     vertical: BooleanConstructor;
     reverse: BooleanConstructor;
-    resizable: BooleanConstructor; /** 是否开启布局响应 */
+    resizable: BooleanConstructor;
     flexTable: BooleanConstructor;
     responsive: {
         type: BooleanConstructor;
@@ -43,7 +43,7 @@ declare const _default: import('vue').DefineComponent<{
     collapse: BooleanConstructor;
     vertical: BooleanConstructor;
     reverse: BooleanConstructor;
-    resizable: BooleanConstructor; /** 是否开启布局响应 */
+    resizable: BooleanConstructor;
     flexTable: BooleanConstructor;
     responsive: {
         type: BooleanConstructor;
@@ -53,8 +53,8 @@ declare const _default: import('vue').DefineComponent<{
     "onUpdate:collapse"?: ((_collapse: boolean) => any) | undefined;
 }, {
     reverse: boolean;
-    collapse: boolean;
     vertical: boolean;
+    collapse: boolean;
     resizable: boolean;
     responsive: boolean;
     allowCollapse: boolean;

package/lib/ele-split-panel/style/index.cjs

@@ -1,3 +1,3 @@
 "use strict";
-require("element-plus/lib/components/icon/style/index");
+require("element-plus/es/components/icon/style/index");
 require("./index.scss");

package/lib/ele-split-panel/style/index.d.ts

@@ -0,0 +1 @@
+

package/lib/ele-steps/style/index.cjs

@@ -1,4 +1,4 @@
 "use strict";
-require("element-plus/lib/components/steps/style/index");
-require("element-plus/lib/components/step/style/index");
+require("element-plus/es/components/steps/style/index");
+require("element-plus/es/components/step/style/index");
 require("./index.scss");

package/lib/ele-steps/style/index.d.ts

@@ -0,0 +1 @@
+

package/lib/ele-steps/style/index.scss

@@ -22,7 +22,7 @@
     border-style: solid;
     border-width: eleVar('step', 'line-size');
     border-color: eleVar('step', 'line-color');
-    transition: border-color $ele-transition;
+    transition: border-color $transition-base;
   }
 
   .el-step__line-inner {
@@ -37,9 +37,9 @@
     color: eleVar('step', 'color');
     font-size: eleVar('step', 'icon-size');
     transition: (
-      color $ele-transition,
-      border-color $ele-transition,
-      background-color $ele-transition
+      color $transition-base,
+      border-color $transition-base,
+      background-color $transition-base
     );
 
     &.is-text {

package/lib/ele-tab-tool/style/index.cjs

@@ -1,2 +1 @@
 "use strict";
-//

package/lib/ele-tab-wrap/index.cjs

@@ -1,9 +1,30 @@
 "use strict";
 const vue = require("vue");
+const props$1 = require("../ele-tabs/props");
 const props = require("./props");
 const _sfc_main = vue.defineComponent({
   name: "EleTabWrap",
-  props: props.tabWrapProps
+  props: props.tabWrapProps,
+  setup(props2) {
+    const data = vue.reactive({
+      size: props2.size,
+      type: props2.type
+    });
+    vue.provide(props$1.TAB_WRAP_KEY, data);
+    vue.watch(
+      () => props2.size,
+      () => {
+        data.size = props2.size;
+      }
+    );
+    vue.watch(
+      () => props2.type,
+      () => {
+        data.type = props2.type;
+      }
+    );
+    return {};
+  }
 });
 const _export_sfc = (sfc, props2) => {
   const target = sfc.__vccOpts || sfc;
@@ -16,6 +37,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return vue.openBlock(), vue.createElementBlock("div", {
     class: vue.normalizeClass([
       "ele-tab-wrap",
+      "ele-tabs-wrap",
       { "is-small": _ctx.size === "small" },
       { "is-large": _ctx.size === "large" },
       { "is-simple": _ctx.type === "simple" },

package/lib/ele-tab-wrap/index.d.ts

@@ -1,7 +1,7 @@
 declare const _default: import('vue').DefineComponent<{
     size: import('vue').PropType<import('../ele-tabs/types').TabSize>;
     type: import('vue').PropType<import('../ele-tabs/types').TabType>;
-}, unknown, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
+}, {}, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     size: import('vue').PropType<import('../ele-tabs/types').TabSize>;
     type: import('vue').PropType<import('../ele-tabs/types').TabType>;
 }>>, {}, {}>;

package/lib/ele-tab-wrap/style/index.cjs

@@ -1,2 +1 @@
 "use strict";
-//

package/lib/ele-table/index.d.ts

@@ -1,7 +1,7 @@
 declare const _default: import('vue').DefineComponent<{
     stripe: BooleanConstructor;
     border: BooleanConstructor;
-    size: import('vue').PropType<"" | "small" | "default" | "large" | undefined>;
+    size: import('vue').PropType<"" | "default" | "small" | "large" | undefined>;
     hasHeader: {
         type: BooleanConstructor;
         default: boolean;
@@ -11,7 +11,7 @@ declare const _default: import('vue').DefineComponent<{
 }, unknown, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     stripe: BooleanConstructor;
     border: BooleanConstructor;
-    size: import('vue').PropType<"" | "small" | "default" | "large" | undefined>;
+    size: import('vue').PropType<"" | "default" | "small" | "large" | undefined>;
     hasHeader: {
         type: BooleanConstructor;
         default: boolean;

package/lib/ele-table/props.d.ts

@@ -9,7 +9,7 @@ export declare const tableProps: {
     /** 是否带有纵向边框 */
     border: BooleanConstructor;
     /** 尺寸 */
-    size: PropType<"" | "small" | "default" | "large" | undefined>;
+    size: PropType<"" | "default" | "small" | "large" | undefined>;
     /** 是否有表头 */
     hasHeader: {
         type: BooleanConstructor;

package/lib/ele-table/style/index.d.ts

@@ -0,0 +1 @@
+

package/lib/ele-table/style/index.scss

@@ -22,7 +22,7 @@
       font-weight: normal;
       line-height: eleVar('table', 'line-height');
       padding: eleVar('table', 'padding');
-      transition: background-color $ele-transition;
+      transition: background-color $transition-base;
       border-width: 0;
       border-style: solid;
       border-color: eleVar('table', 'border-color');
@@ -185,6 +185,22 @@
     table-layout: fixed;
     border-collapse: collapse;
     word-break: break-all;
+
+    &.is-border {
+      border-left: none;
+      border-right: 1px solid eleVar('table', 'border-color');
+
+      & > tr,
+      & > thead > tr,
+      & > tbody > tr,
+      & > tfoot > tr {
+        & > th,
+        & > td {
+          border-right-width: 0;
+          border-left-width: 1px;
+        }
+      }
+    }
   }
 }