ele-admin-plus 1.2.1-beta.6 → 1.2.2-beta.1

package/es/ele-pro-table/index.js

@@ -235,14 +235,28 @@ const _sfc_main = defineComponent({
         );
         requestCallback(data, total, parent, result, resolve);
       }).catch((e) => {
-        requestCallback(e == null ? void 0 : e.message);
+        const errorMsg = e == null ? void 0 : e.message;
+        requestCallback(
+          errorMsg == null ? errorMsg : String(errorMsg),
+          void 0,
+          parent,
+          e,
+          resolve
+        );
         resolve && console.error(e);
       });
     };
     const requestCallback = (data, total, parent, response, resolve) => {
-      var _a;
-      if (!Array.isArray(data)) {
-        tableData.value = [];
+      var _a, _b;
+      if (data == null || !Array.isArray(data)) {
+        if (resolve) {
+          if (parent != null) {
+            parent[((_a = props.treeProps) == null ? void 0 : _a.children) || "children"] = [];
+          }
+          resolve([]);
+        } else {
+          tableData.value = [];
+        }
         tableLoading.value = false;
         if (typeof data === "string" && data) {
           errorText.value = data;
@@ -259,7 +273,7 @@ const _sfc_main = defineComponent({
       }
       if (resolve) {
         if (parent != null) {
-          parent[((_a = props.treeProps) == null ? void 0 : _a.children) || "children"] = data;
+          parent[((_b = props.treeProps) == null ? void 0 : _b.children) || "children"] = data;
         }
         resolve(data);
       } else {

package/es/ele-pro-table/props.d.ts

@@ -2,6 +2,9 @@ import { PropType, ExtractPropTypes } from 'vue';
 import { StyleValue } from '../ele-app/types';
 import { EleLoadingProps, EleToolbarProps } from '../ele-app/plus';
 import { DataItem, Columns, TableSize, RowKey } from '../ele-data-table/types';
+import { default as TableTools } from './components/table-tools';
+import { default as ToolExport } from './components/tool-export';
+import { default as ToolPrint } from './components/tool-print';
 import { Where, Datasource, RequestOption, ResponseOption, ParseData, DoneParams, TablePagination, TableTool, TableLocale, ExportConfig, PrintConfig } from './types';
 
 /**
@@ -175,11 +178,11 @@ export declare const proTableProps: {
         required: boolean;
     };
     sticky: BooleanConstructor;
-    slotNormalize: {
+    headerEllipsis: {
         type: BooleanConstructor;
         default: boolean;
     };
-    headerEllipsis: {
+    slotNormalize: {
         type: BooleanConstructor;
         default: boolean;
     };
@@ -235,3 +238,15 @@ export declare const proTableEmits: {
     'update:currentRowKey': (_currentRowKey?: import('../ele-data-table/types').DataKey) => boolean;
     'update:selectedRowKeys': (_selectedRowKeys?: import('../ele-data-table/types').DataKey[]) => boolean;
 };
+/**
+ * 默认工具按钮实例
+ */
+export type TableToolsInstance = InstanceType<typeof TableTools> | null;
+/**
+ * 导出组件实例
+ */
+export type ToolExportInstance = InstanceType<typeof ToolExport> | null;
+/**
+ * 打印组件实例
+ */
+export type ToolPrintInstance = InstanceType<typeof ToolPrint> | null;

package/es/ele-segmented/index.d.ts

@@ -9,6 +9,10 @@ declare const _default: import('vue').DefineComponent<{
         required: boolean;
     };
     size: import('vue').PropType<import('./types').SegmentedSize>;
+    formValidate: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, {
     tabRef: import('vue').Ref<ElTabsInstance>;
     isEmptyActive: import('vue').ComputedRef<boolean>;
@@ -26,11 +30,16 @@ declare const _default: import('vue').DefineComponent<{
         required: boolean;
     };
     size: import('vue').PropType<import('./types').SegmentedSize>;
+    formValidate: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & {
     "onUpdate:modelValue"?: ((_value: string | number) => any) | undefined;
     onChange?: ((_active: string | number) => any) | undefined;
 }, {
     disabled: boolean;
     block: boolean;
+    formValidate: boolean;
 }, {}>;
 export default _default;

package/es/ele-segmented/index.js

@@ -16,7 +16,9 @@ const _sfc_main = defineComponent({
     const handleUpdateModelValue = (value) => {
       if (props.modelValue !== value) {
         emit("update:modelValue", value);
-        validateChange();
+        if (props.formValidate) {
+          validateChange();
+        }
         emit("change", value);
       }
     };

package/es/ele-segmented/props.d.ts

@@ -18,6 +18,11 @@ export declare const segmentedProps: {
     };
     /** 尺寸 */
     size: PropType<SegmentedSize>;
+    /** 是否支持表单验证 */
+    formValidate: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 };
 export type SegmentedProps = ExtractPropTypes<typeof segmentedProps>;
 /**

package/es/ele-segmented/props.js

@@ -11,7 +11,12 @@ const segmentedProps = {
     required: true
   },
   /** 尺寸 */
-  size: String
+  size: String,
+  /** 是否支持表单验证 */
+  formValidate: {
+    type: Boolean,
+    default: true
+  }
 };
 const segmentedEmits = {
   /** 更新绑定值 */

package/es/ele-tab-wrap/components/tab-dropdown.js

@@ -57,7 +57,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         popperClass: "ele-tab-popup",
         popperOptions: {
           modifiers: [{ name: "offset", options: { offset: [12, 8] } }]
-        }
+        },
+        formValidate: false
       }, _ctx.dropdownProps || {}, {
         ref: "dropdownRef",
         items: _ctx.items,

package/es/ele-tabs/index.js

@@ -436,6 +436,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
           key: 0,
           triggerKeys: [],
           persistent: false,
+          formValidate: false,
           placement: "bottom-start",
           popperClass: "ele-tab-popup",
           popperOptions: {