ele-admin-plus 1.2.1-beta.3 → 1.2.1-beta.5

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

@@ -116,6 +116,17 @@ function getActiveChilds(menus, active, childrenName) {
   }
   return m[field] || [];
 }
+function getIframeSrc(routePath, iframeUrl) {
+  const [_path1, query1 = ""] = (routePath ?? "").split("?");
+  const [path2, query2 = ""] = (iframeUrl ?? "").split("?");
+  const params1 = new URLSearchParams(query1);
+  const params2 = new URLSearchParams(query2);
+  for (const [key, value] of params2.entries()) {
+    params1.append(key, value);
+  }
+  const newQuery = params1.toString();
+  return `${path2}${newQuery ? `?${newQuery}` : ""}`;
+}
 function getMenuItems(menus, link) {
   return core.mapTree(menus, (m) => {
     const { path, meta } = m;
@@ -148,6 +159,7 @@ exports.findMenuByPath = findMenuByPath;
 exports.findTabByKey = findTabByKey;
 exports.findTabByPath = findTabByPath;
 exports.getActiveChilds = getActiveChilds;
+exports.getIframeSrc = getIframeSrc;
 exports.getMatchedComponents = getMatchedComponents;
 exports.getMatchedLevels = getMatchedLevels;
 exports.getMatchedMenus = getMatchedMenus;

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

@@ -62,6 +62,12 @@ export declare function getRouteTab(route: RouteLocationNormalizedLoaded, tabs:
  * @param childrenName 子级字段名称
  */
 export declare function getActiveChilds(menus: MenuItem[], active?: string, childrenName?: string): MenuItem[];
+/**
+ * 拼接内嵌地址
+ * @param routePath 路由地址含参数
+ * @param iframeUrl 内嵌地址
+ */
+export declare function getIframeSrc(routePath?: string, iframeUrl?: string): string;
 /**
  * 菜单数据转换
  * @param menus 菜单数据

package/lib/ele-pro-table/components/table-tools.cjs

@@ -88,7 +88,7 @@ const _sfc_main = vue.defineComponent({
   emits: {
     reload: () => true,
     "update:size": (_size) => true,
-    "update:columns": (_columns, _tableColumns) => true,
+    "update:columns": (_columns, _tableColumns, _isReset) => true,
     "update:maximized": (_maximized) => true
   },
   setup(props, { emit }) {
@@ -96,6 +96,25 @@ const _sfc_main = vue.defineComponent({
     const toolExportRef = vue.ref(null);
     const toolPrintRef = vue.ref(null);
     const placement = vue.computed(() => props.maximized ? "bottom" : "top");
+    const sizeDropdownItems = vue.computed(() => {
+      return [
+        {
+          title: lang.value.sizeLarge,
+          command: "large",
+          icon: vue.markRaw(icons.SizeSlackOutlined)
+        },
+        {
+          title: lang.value.sizeDefault,
+          command: "default",
+          icon: vue.markRaw(icons.SizeMiddleOutlined)
+        },
+        {
+          title: lang.value.sizeSmall,
+          command: "small",
+          icon: vue.markRaw(icons.SizeCompactOutlined)
+        }
+      ];
+    });
     const reload = () => {
       emit("reload");
     };
@@ -105,8 +124,8 @@ const _sfc_main = vue.defineComponent({
       }
       emit("update:size", size);
     };
-    const updateColumns = (columns, tableColumns) => {
-      emit("update:columns", columns, tableColumns);
+    const updateColumns = (columns, tableColumns, isReset) => {
+      emit("update:columns", columns, tableColumns, isReset);
     };
     const toggleMaximized = () => {
       emit("update:maximized", !props.maximized);
@@ -133,13 +152,11 @@ const _sfc_main = vue.defineComponent({
     };
     return {
       ownSlots,
-      SizeSlackOutlined: icons.SizeSlackOutlined,
-      MenuOutlined: icons.MenuOutlined,
-      SizeCompactOutlined: icons.SizeCompactOutlined,
       lang,
       toolExportRef,
       toolPrintRef,
       placement,
+      sizeDropdownItems,
       reload,
       updateSize,
       updateColumns,
@@ -292,16 +309,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               placement: "bottom",
               popperClass: "ele-tool-size-popper",
               modelValue: _ctx.size,
-              items: [
-                { title: _ctx.lang.sizeLarge, command: "large", icon: _ctx.SizeSlackOutlined },
-                {
-                  title: _ctx.lang.sizeDefault,
-                  command: "default",
-                  icon: _ctx.MenuOutlined,
-                  iconStyle: { transform: "scale(0.94)", transformOrigin: "left" }
-                },
-                { title: _ctx.lang.sizeSmall, command: "small", icon: _ctx.SizeCompactOutlined }
-              ],
+              items: _ctx.sizeDropdownItems,
               popperOptions: {
                 modifiers: [{ name: "offset", options: { offset: [0, 10] } }]
               },

package/lib/ele-pro-table/components/table-tools.d.ts

@@ -1,4 +1,5 @@
 import { PropType } from 'vue';
+import { DropdownItem } from '../../ele-dropdown/types';
 import { Columns, TableSize, DataItem, SpanMethod, SummaryMethod, CellStyle, CellClass, HeaderCellStyle, HeaderCellClass, TreeProps } from '../../ele-data-table/types';
 import { TableTool, TableLocale, FetchFunction, ExportConfig, PrintConfig, TableExportParams } from '../types';
 
@@ -62,9 +63,6 @@ declare const _default: import('vue').DefineComponent<{
     };
 }, {
     ownSlots: string[];
-    SizeSlackOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
-    MenuOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
-    SizeCompactOutlined: import('vue').DefineComponent<{}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{}>>, {}, {}>;
     lang: import('vue').ComputedRef<TableLocale>;
     toolExportRef: import('vue').Ref<import('vue').CreateComponentPublicInstance<Readonly<import('vue').ExtractPropTypes<{
         locale: {
@@ -110,12 +108,12 @@ declare const _default: import('vue').DefineComponent<{
         dataType: import('vue').Ref<import('../types').ExportDataType>;
         colItems: import('vue').Ref<{
             uid: string;
-            label?: string;
-            checked?: boolean;
-            fixed?: boolean | string;
+            label?: string | undefined;
+            checked?: boolean | undefined;
+            fixed?: (boolean | string) | undefined;
             children?: any[] | undefined;
-            type?: string;
-            width?: number | string;
+            type?: string | undefined;
+            width?: (number | string) | undefined;
         }[]>;
         isCheckAll: import('vue').Ref<boolean>;
         isIndeterminate: import('vue').Ref<boolean>;
@@ -224,12 +222,12 @@ declare const _default: import('vue').DefineComponent<{
         dataType: import('vue').Ref<import('../types').ExportDataType>;
         colItems: import('vue').Ref<{
             uid: string;
-            label?: string;
-            checked?: boolean;
-            fixed?: boolean | string;
+            label?: string | undefined;
+            checked?: boolean | undefined;
+            fixed?: (boolean | string) | undefined;
             children?: any[] | undefined;
-            type?: string;
-            width?: number | string;
+            type?: string | undefined;
+            width?: (number | string) | undefined;
         }[]>;
         isCheckAll: import('vue').Ref<boolean>;
         isIndeterminate: import('vue').Ref<boolean>;
@@ -297,12 +295,12 @@ declare const _default: import('vue').DefineComponent<{
         dataType: import('vue').Ref<import('../types').ExportDataType>;
         colItems: import('vue').Ref<{
             uid: string;
-            label?: string;
-            checked?: boolean;
-            fixed?: boolean | string;
+            label?: string | undefined;
+            checked?: boolean | undefined;
+            fixed?: (boolean | string) | undefined;
             children?: any[] | undefined;
-            type?: string;
-            width?: number | string;
+            type?: string | undefined;
+            width?: (number | string) | undefined;
         }[]>;
         isCheckAll: import('vue').Ref<boolean>;
         isIndeterminate: import('vue').Ref<boolean>;
@@ -412,12 +410,12 @@ declare const _default: import('vue').DefineComponent<{
         dataType: import('vue').Ref<import('../types').ExportDataType>;
         colItems: import('vue').Ref<{
             uid: string;
-            label?: string;
-            checked?: boolean;
-            fixed?: boolean | string;
+            label?: string | undefined;
+            checked?: boolean | undefined;
+            fixed?: (boolean | string) | undefined;
             children?: any[] | undefined;
-            type?: string;
-            width?: number | string;
+            type?: string | undefined;
+            width?: (number | string) | undefined;
         }[]>;
         isCheckAll: import('vue').Ref<boolean>;
         isIndeterminate: import('vue').Ref<boolean>;
@@ -445,9 +443,10 @@ declare const _default: import('vue').DefineComponent<{
         defaultShowTreeIndex: boolean;
     }> | null>;
     placement: import('vue').ComputedRef<"top" | "bottom">;
+    sizeDropdownItems: import('vue').ComputedRef<DropdownItem[]>;
     reload: () => void;
     updateSize: (size: string) => void;
-    updateColumns: (columns: Columns, tableColumns: Columns) => void;
+    updateColumns: (columns: Columns, tableColumns: Columns, isReset: boolean) => void;
     toggleMaximized: () => void;
     openExportModal: () => void;
     openPrintModal: () => void;
@@ -456,7 +455,7 @@ declare const _default: import('vue').DefineComponent<{
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     reload: () => true;
     'update:size': (_size: TableSize) => true;
-    'update:columns': (_columns: Columns, _tableColumns: Columns) => true;
+    'update:columns': (_columns: Columns, _tableColumns: Columns, _isReset: boolean) => true;
     'update:maximized': (_maximized: boolean) => true;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 工具按钮布局 */
@@ -517,7 +516,7 @@ declare const _default: import('vue').DefineComponent<{
         required: true;
     };
 }>> & {
-    "onUpdate:columns"?: ((_columns: Columns, _tableColumns: Columns) => any) | undefined;
+    "onUpdate:columns"?: ((_columns: Columns, _tableColumns: Columns, _isReset: boolean) => any) | undefined;
     onReload?: (() => any) | undefined;
     "onUpdate:size"?: ((_size: "" | "small" | "default" | "large" | undefined) => any) | undefined;
     "onUpdate:maximized"?: ((_maximized: boolean) => any) | undefined;

package/lib/ele-pro-table/components/tool-column.cjs

@@ -35,7 +35,7 @@ const _sfc_main = vue.defineComponent({
     cacheKey: String
   },
   emits: {
-    "update:columns": (_columns, _tableColumns) => true
+    "update:columns": (_columns, _tableColumns, _isReset) => true
   },
   setup(props, { emit }) {
     const toolRef = vue.ref(null);
@@ -53,7 +53,7 @@ const _sfc_main = vue.defineComponent({
       isCheckAll.value = checkAll;
       isIndeterminate.value = indeterminate;
     };
-    const updateColumns = () => {
+    const updateColumns = (isReset) => {
       const colsWidth = util.getCacheColsWidth(props.cacheKey);
       const columns = util.getCheckedColumns(
         props.columns,
@@ -73,7 +73,7 @@ const _sfc_main = vue.defineComponent({
         true,
         colsWidth
       );
-      emit("update:columns", columns, tableColumns);
+      emit("update:columns", columns, tableColumns, !!isReset);
     };
     const cacheSettingCols = () => {
       if (props.cacheKey) {
@@ -164,7 +164,7 @@ const _sfc_main = vue.defineComponent({
     const handleReset = () => {
       cleanSettingCols();
       initColItems();
-      updateColumns();
+      updateColumns(true);
     };
     vue.watch(
       [() => props.columns, () => props.locale],

package/lib/ele-pro-table/components/tool-column.d.ts

@@ -23,12 +23,12 @@ declare const _default: import('vue').DefineComponent<{
     toolRef: import('vue').Ref<EleToolInstance>;
     colItems: import('vue').Ref<{
         uid: string;
-        label?: string;
-        checked?: boolean;
-        fixed?: boolean | string;
+        label?: string | undefined;
+        checked?: boolean | undefined;
+        fixed?: (boolean | string) | undefined;
         children?: any[] | undefined;
-        type?: string;
-        width?: number | string;
+        type?: string | undefined;
+        width?: (number | string) | undefined;
     }[]>;
     isCheckAll: import('vue').Ref<boolean>;
     isIndeterminate: import('vue').Ref<boolean>;
@@ -41,7 +41,7 @@ declare const _default: import('vue').DefineComponent<{
     handleFixedLeftTooltip: (el: HTMLElement) => void;
     handleFixedRightTooltip: (el: HTMLElement) => void;
 }, unknown, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
-    'update:columns': (_columns: Columns, _tableColumns: Columns) => true;
+    'update:columns': (_columns: Columns, _tableColumns: Columns, _isReset: boolean) => true;
 }, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     /** 提示位置 */
     placement: PropType<EleTooltipProps["placement"]>;
@@ -59,7 +59,7 @@ declare const _default: import('vue').DefineComponent<{
     /** 列配置缓存本地的名称 */
     cacheKey: StringConstructor;
 }>> & {
-    "onUpdate:columns"?: ((_columns: Columns, _tableColumns: Columns) => any) | undefined;
+    "onUpdate:columns"?: ((_columns: Columns, _tableColumns: Columns, _isReset: boolean) => any) | undefined;
 }, {
     sortable: boolean;
     allowFixed: boolean;

package/lib/ele-pro-table/components/tool-export.d.ts

@@ -68,12 +68,12 @@ declare const _default: import('vue').DefineComponent<{
     dataType: import('vue').Ref<ExportDataType>;
     colItems: import('vue').Ref<{
         uid: string;
-        label?: string;
-        checked?: boolean;
-        fixed?: boolean | string;
+        label?: string | undefined;
+        checked?: boolean | undefined;
+        fixed?: (boolean | string) | undefined;
         children?: any[] | undefined;
-        type?: string;
-        width?: number | string;
+        type?: string | undefined;
+        width?: (number | string) | undefined;
     }[]>;
     isCheckAll: import('vue').Ref<boolean>;
     isIndeterminate: import('vue').Ref<boolean>;

package/lib/ele-pro-table/components/tool-print-body-cell.cjs

@@ -24,7 +24,7 @@ const _sfc_main = vue.defineComponent({
       const { text, row, column, index: $index } = props.col;
       const params = [{ row, column, $index }];
       const slotName = column ? column.printSlot || column.slot : void 0;
-      if (column && !["expand", "selection", "index"].includes(column.type || "") && slotName && typeof slots[slotName] === "function") {
+      if (column && "expand" !== column.type && slotName && typeof slots[slotName] === "function") {
         return { render: slots[slotName], params };
       }
       return { render: () => text, params };

package/lib/ele-pro-table/components/tool-print-header-cell.cjs

@@ -21,8 +21,9 @@ const _sfc_main = vue.defineComponent({
     const renderOpt = vue.computed(() => {
       const { text, column } = props.col;
       const params = [{ column, $index: props.columnIndex }];
-      if (column && "index" !== column.type && column.headerSlot && typeof slots[column.headerSlot] === "function") {
-        return { render: slots[column.headerSlot], params };
+      const slotName = column ? column.printHeaderSlot || column.headerSlot : void 0;
+      if (column && slotName && typeof slots[slotName] === "function") {
+        return { render: slots[slotName], params };
       }
       return { render: () => text, params };
     });

package/lib/ele-pro-table/components/tool-print.d.ts

@@ -70,12 +70,12 @@ declare const _default: import('vue').DefineComponent<{
     dataType: import('vue').Ref<ExportDataType>;
     colItems: import('vue').Ref<{
         uid: string;
-        label?: string;
-        checked?: boolean;
-        fixed?: boolean | string;
+        label?: string | undefined;
+        checked?: boolean | undefined;
+        fixed?: (boolean | string) | undefined;
         children?: any[] | undefined;
-        type?: string;
-        width?: number | string;
+        type?: string | undefined;
+        width?: (number | string) | undefined;
     }[]>;
     isCheckAll: import('vue').Ref<boolean>;
     isIndeterminate: import('vue').Ref<boolean>;

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

@@ -32,16 +32,9 @@ const _sfc_main = vue.defineComponent({
     const events = util.useEmits(emit);
     const methods = util.useMethods(() => getTableRef());
     const globalProps = receiver.useGlobalProps("table");
-    const userColumns = vue.computed(() => {
-      return core.mapTree(props2.columns, (item) => {
-        if (item.vIf == null || (typeof item.vIf === "function" ? item.vIf() : item.vIf)) {
-          return item;
-        }
-      });
-    });
     const tableState = {
       sorter: props2.defaultSort ?? {},
-      filter: util$1.getDefaultFilter(userColumns.value),
+      filter: util$1.getDefaultFilter(props2.columns),
       where: props2.where ?? {}
     };
     const tableToolsRef = vue.ref(null);
@@ -324,27 +317,31 @@ const _sfc_main = vue.defineComponent({
       tableSize.value = size;
       emit("sizeChange", size);
     };
-    const handleColumnsChange = (columns, tableColumns) => {
+    const handleColumnsChange = (columns, tableColumns, isReset) => {
       tableCols.value = columns;
-      emit("columnsChange", columns, tableColumns);
+      emit("columnsChange", columns, tableColumns, isReset);
     };
     const handleMaximizedChange = (maximized) => {
       tableMaximized.value = maximized;
       emit("maximizedChange", maximized);
     };
     const handlePageSizeChange = (limit) => {
-      if (tableTotal.value !== "*") {
-        const maxPage = Math.ceil(tableTotal.value / limit);
-        if (maxPage && tablePage.value > maxPage) {
-          tablePage.value = maxPage;
+      if (tableLimit.value !== limit) {
+        tableLimit.value = limit;
+        if (tableTotal.value !== "*") {
+          const maxPage = Math.ceil(tableTotal.value / limit);
+          if (maxPage && tablePage.value > maxPage) {
+            tablePage.value = maxPage;
+          }
         }
+        reload();
       }
-      tableLimit.value = limit;
-      reload();
     };
     const handlePageCurrentChange = (page) => {
-      tablePage.value = page;
-      reload();
+      if (tablePage.value !== page) {
+        tablePage.value = page;
+        reload();
+      }
     };
     const handleSortChange = (sorter) => {
       if (props2.loadOnChanged) {
@@ -450,7 +447,7 @@ const _sfc_main = vue.defineComponent({
       }
     };
     vue.watch(
-      userColumns,
+      () => props2.columns,
       (columns) => {
         if (columns) {
           tableCols.value = util$1.getInitCacheColumns(
@@ -522,7 +519,6 @@ const _sfc_main = vue.defineComponent({
       tableSlotExcludes,
       pageSlotExcludes,
       ...methods,
-      userColumns,
       tableToolsRef,
       tableViewRef,
       tableData,
@@ -580,7 +576,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ref: "tableToolsRef",
             tools: _ctx.toolNames,
             size: _ctx.tableSize,
-            columns: _ctx.userColumns,
+            columns: _ctx.columns,
             columnSortable: _ctx.columnSortable,
             columnFixed: _ctx.columnFixed,
             maximized: _ctx.tableMaximized,