yuang-framework-ui-pc 1.1.161 → 1.1.162

package/es/ele-data-table/index.d.ts

@@ -42,6 +42,10 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     reserveCurrent: BooleanConstructor;
     selectedRowKeys: import('vue').PropType<DataKey[]>;
     cacheData: import('vue').PropType<DataItem[]>;
+    isAllowShowEmpty: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     data: {
         type: import('vue').PropType<any[]>;
         default: () => never[];
@@ -208,6 +212,10 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     reserveCurrent: BooleanConstructor;
     selectedRowKeys: import('vue').PropType<DataKey[]>;
     cacheData: import('vue').PropType<DataItem[]>;
+    isAllowShowEmpty: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     data: {
         type: import('vue').PropType<any[]>;
         default: () => never[];
@@ -336,6 +344,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     bottomLine: boolean;
     emptyProps: import('./types').TableEmptyProps;
     reserveCurrent: boolean;
+    isAllowShowEmpty: boolean;
 }, {}, {
     ElTable: import('element-plus/es/utils/index').SFCWithInstall<import('vue').DefineComponent<{
         data: {

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

@@ -352,7 +352,7 @@ const index = /* @__PURE__ */ defineComponent({
     };
     return () => createVNode(ElTable, mergeProps(tableProps.value, {
       "ref": tableRef,
-      "emptyText": props.errorText || props.emptyText,
+      "emptyText": props.isAllowShowEmpty ? props.errorText || props.emptyText : "",
       "rowClassName": (param) => getBodyRowClass(props.rowClassName, param),
       "headerRowClassName": (param) => getHeadRowClass(props.headerRowClassName, param, props.headerEllipsis),
       "class": ["ele-data-table", {
@@ -380,18 +380,25 @@ const index = /* @__PURE__ */ defineComponent({
         var _a;
         return (_a = slots.append) == null ? void 0 : _a.call(slots, slotProps);
       } : void 0,
-      empty: slots.empty ? () => {
+      //empty: slots.empty ? () => slots.empty?.({ text: props.emptyText, error: props.errorText }) : props.emptyProps ? () => <ElEmpty imageSize={68} {...(!props.emptyProps || props.emptyProps === true ? {} : props.emptyProps)} description={props.errorText || props.emptyText} class="ele-table-empty" /> : void 0,
+      empty: () => {
         var _a;
-        return (_a = slots.empty) == null ? void 0 : _a.call(slots, {
-          text: props.emptyText,
-          error: props.errorText
-        });
-      } : props.emptyProps ? () => createVNode(ElEmpty, mergeProps({
-        "imageSize": 68
-      }, !props.emptyProps || props.emptyProps === true ? {} : props.emptyProps, {
-        "description": props.errorText || props.emptyText,
-        "class": "ele-table-empty"
-      }), null) : void 0,
+        if (!props.isAllowShowEmpty) return null;
+        if (slots.empty) {
+          return (_a = slots.empty) == null ? void 0 : _a.call(slots, {
+            text: props.emptyText,
+            error: props.errorText
+          });
+        }
+        if (props.emptyProps) {
+          return createVNode(ElEmpty, mergeProps({
+            "imageSize": 68
+          }, !props.emptyProps || props.emptyProps === true ? {} : props.emptyProps, {
+            "description": props.errorText || props.emptyText,
+            "class": "ele-table-empty"
+          }), null);
+        }
+      },
       default: () => tableCols.value.map(renderTableColumn)
     });
   }

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

@@ -148,6 +148,10 @@ export declare const dataTableProps: {
     selectedRowKeys: PropType<DataKey[]>;
     /** 缓存数据 */
     cacheData: PropType<DataItem[]>;
+    isAllowShowEmpty: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     width: (NumberConstructor | StringConstructor)[];
     height: (NumberConstructor | StringConstructor)[];
     data: {

package/es/ele-data-table/props.js

@@ -55,7 +55,11 @@ const dataTableProps = {
   /** 多选选中行的值 */
   selectedRowKeys: Array,
   /** 缓存数据 */
-  cacheData: Array
+  cacheData: Array,
+  isAllowShowEmpty: {
+    type: Boolean,
+    default: false
+  }
 };
 const dataTableEmits = {
   select: (_selection, _row) => true,

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

@@ -61,6 +61,7 @@ const _sfc_main = defineComponent({
         hasNext: tableData.value.length >= tableLimit.value
       });
     });
+    const isFinishedFirstRequest = ref(false);
     const tableEmptyProps = computed(() => {
       return mergeProps(props.emptyProps, globalProps.value.emptyProps);
     });
@@ -172,6 +173,7 @@ const _sfc_main = defineComponent({
         tablePage.value = currentPage;
         tableTotal.value = totalCount;
         handleDone({ records, currentPage, totalCount, response: props.datasource });
+        isFinishedFirstRequest.value = true;
         return;
       }
       if (!parent) {
@@ -200,9 +202,13 @@ const _sfc_main = defineComponent({
       });
     };
     const reload = (option, parent, resolve) => {
+      if (parent === void 0) {
+        isFinishedFirstRequest.value = false;
+      }
       load(option, parent, resolve);
     };
     const reset = () => {
+      isFinishedFirstRequest.value = false;
       methods.doLayout();
       if (props.lazy) {
         isShowTable.value = false;
@@ -242,6 +248,9 @@ const _sfc_main = defineComponent({
         tableTotal.value = totalCount || data.length;
       }
       tableLoading.value = false;
+      if (parent === void 0) {
+        isFinishedFirstRequest.value = true;
+      }
       const result = {
         records: tableData.value,
         currentPage: tablePage.value,
@@ -475,6 +484,7 @@ const _sfc_main = defineComponent({
       toolExportConfig,
       toolPrintConfig,
       loadingProps,
+      isFinishedFirstRequest,
       handleRefresh,
       handleSizeChange,
       handleColumnsChange,
@@ -521,7 +531,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         void 0
       ]), 1040)) : createCommentVNode("", true),
       renderSlot(_ctx.$slots, "default"),
-      _ctx.virtual ? (openBlock(), createBlock(_component_EleVirtualTable, mergeProps$1({ key: 1 }, _ctx.tableProps, { ref: "tableViewRef" }), createSlots({ _: 2 }, [
+      _ctx.virtual ? (openBlock(), createBlock(_component_EleVirtualTable, mergeProps$1({ key: 1 }, _ctx.tableProps, {
+        ref: "tableViewRef",
+        isAllowShowEmpty: _ctx.isFinishedFirstRequest
+      }), createSlots({ _: 2 }, [
         renderList(Object.keys(_ctx.$slots).filter((k) => !_ctx.tableSlotExcludes.includes(k)), (name) => {
           return {
             name,
@@ -530,8 +543,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ])
           };
         })
-      ]), 1040)) : (openBlock(), createElementBlock(Fragment, { key: 2 }, [
-        _ctx.isShowTable ? (openBlock(), createBlock(_component_EleDataTable, mergeProps$1({ key: 0 }, _ctx.tableProps, { ref: "tableViewRef" }), createSlots({ _: 2 }, [
+      ]), 1040, ["isAllowShowEmpty"])) : (openBlock(), createElementBlock(Fragment, { key: 2 }, [
+        _ctx.isShowTable ? (openBlock(), createBlock(_component_EleDataTable, mergeProps$1({ key: 0 }, _ctx.tableProps, {
+          ref: "tableViewRef",
+          isAllowShowEmpty: _ctx.isFinishedFirstRequest
+        }), createSlots({ _: 2 }, [
           renderList(Object.keys(_ctx.$slots).filter((k) => !_ctx.tableSlotExcludes.includes(k)), (name) => {
             return {
               name,
@@ -540,7 +556,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               ])
             };
           })
-        ]), 1040)) : createCommentVNode("", true)
+        ]), 1040, ["isAllowShowEmpty"])) : createCommentVNode("", true)
       ], 64)),
       _ctx.paginationProps || _ctx.$slots.footer ? (openBlock(), createElementBlock("div", {
         key: 3,

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

@@ -202,6 +202,10 @@ export declare const proTableProps: {
     rowClickChecked: PropType<import('../ele-data-table/types').RowClickChecked>;
     reserveCurrent: BooleanConstructor;
     selectedRowKeys: PropType<import('../ele-data-table/types').DataKey[]>;
+    isAllowShowEmpty: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 };
 export type ProTableProps = ExtractPropTypes<typeof proTableProps>;
 /**

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

@@ -353,7 +353,7 @@ const index = /* @__PURE__ */ vue.defineComponent({
     };
     return () => vue.createVNode(elementPlus.ElTable, vue.mergeProps(tableProps.value, {
       "ref": tableRef,
-      "emptyText": props$1.errorText || props$1.emptyText,
+      "emptyText": props$1.isAllowShowEmpty ? props$1.errorText || props$1.emptyText : "",
       "rowClassName": (param) => util.getBodyRowClass(props$1.rowClassName, param),
       "headerRowClassName": (param) => util.getHeadRowClass(props$1.headerRowClassName, param, props$1.headerEllipsis),
       "class": ["ele-data-table", {
@@ -381,18 +381,25 @@ const index = /* @__PURE__ */ vue.defineComponent({
         var _a;
         return (_a = slots.append) == null ? void 0 : _a.call(slots, slotProps);
       } : void 0,
-      empty: slots.empty ? () => {
+      //empty: slots.empty ? () => slots.empty?.({ text: props.emptyText, error: props.errorText }) : props.emptyProps ? () => <ElEmpty imageSize={68} {...(!props.emptyProps || props.emptyProps === true ? {} : props.emptyProps)} description={props.errorText || props.emptyText} class="ele-table-empty" /> : void 0,
+      empty: () => {
         var _a;
-        return (_a = slots.empty) == null ? void 0 : _a.call(slots, {
-          text: props$1.emptyText,
-          error: props$1.errorText
-        });
-      } : props$1.emptyProps ? () => vue.createVNode(elementPlus.ElEmpty, vue.mergeProps({
-        "imageSize": 68
-      }, !props$1.emptyProps || props$1.emptyProps === true ? {} : props$1.emptyProps, {
-        "description": props$1.errorText || props$1.emptyText,
-        "class": "ele-table-empty"
-      }), null) : void 0,
+        if (!props$1.isAllowShowEmpty) return null;
+        if (slots.empty) {
+          return (_a = slots.empty) == null ? void 0 : _a.call(slots, {
+            text: props$1.emptyText,
+            error: props$1.errorText
+          });
+        }
+        if (props$1.emptyProps) {
+          return vue.createVNode(elementPlus.ElEmpty, vue.mergeProps({
+            "imageSize": 68
+          }, !props$1.emptyProps || props$1.emptyProps === true ? {} : props$1.emptyProps, {
+            "description": props$1.errorText || props$1.emptyText,
+            "class": "ele-table-empty"
+          }), null);
+        }
+      },
       default: () => tableCols.value.map(renderTableColumn)
     });
   }

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

@@ -42,6 +42,10 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     reserveCurrent: BooleanConstructor;
     selectedRowKeys: import('vue').PropType<DataKey[]>;
     cacheData: import('vue').PropType<DataItem[]>;
+    isAllowShowEmpty: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     data: {
         type: import('vue').PropType<any[]>;
         default: () => never[];
@@ -208,6 +212,10 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     reserveCurrent: BooleanConstructor;
     selectedRowKeys: import('vue').PropType<DataKey[]>;
     cacheData: import('vue').PropType<DataItem[]>;
+    isAllowShowEmpty: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     data: {
         type: import('vue').PropType<any[]>;
         default: () => never[];
@@ -336,6 +344,7 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     bottomLine: boolean;
     emptyProps: import('./types').TableEmptyProps;
     reserveCurrent: boolean;
+    isAllowShowEmpty: boolean;
 }, {}, {
     ElTable: import('element-plus/es/utils/index').SFCWithInstall<import('vue').DefineComponent<{
         data: {

package/lib/ele-data-table/props.cjs

@@ -57,7 +57,11 @@ const dataTableProps = {
   /** 多选选中行的值 */
   selectedRowKeys: Array,
   /** 缓存数据 */
-  cacheData: Array
+  cacheData: Array,
+  isAllowShowEmpty: {
+    type: Boolean,
+    default: false
+  }
 };
 const dataTableEmits = {
   select: (_selection, _row) => true,

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

@@ -148,6 +148,10 @@ export declare const dataTableProps: {
     selectedRowKeys: PropType<DataKey[]>;
     /** 缓存数据 */
     cacheData: PropType<DataItem[]>;
+    isAllowShowEmpty: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     width: (NumberConstructor | StringConstructor)[];
     height: (NumberConstructor | StringConstructor)[];
     data: {

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

@@ -62,6 +62,7 @@ const _sfc_main = vue.defineComponent({
         hasNext: tableData.value.length >= tableLimit.value
       });
     });
+    const isFinishedFirstRequest = vue.ref(false);
     const tableEmptyProps = vue.computed(() => {
       return util$1.mergeProps(props2.emptyProps, globalProps.value.emptyProps);
     });
@@ -173,6 +174,7 @@ const _sfc_main = vue.defineComponent({
         tablePage.value = currentPage;
         tableTotal.value = totalCount;
         handleDone({ records, currentPage, totalCount, response: props2.datasource });
+        isFinishedFirstRequest.value = true;
         return;
       }
       if (!parent) {
@@ -201,9 +203,13 @@ const _sfc_main = vue.defineComponent({
       });
     };
     const reload = (option, parent, resolve) => {
+      if (parent === void 0) {
+        isFinishedFirstRequest.value = false;
+      }
       load(option, parent, resolve);
     };
     const reset = () => {
+      isFinishedFirstRequest.value = false;
       methods.doLayout();
       if (props2.lazy) {
         isShowTable.value = false;
@@ -243,6 +249,9 @@ const _sfc_main = vue.defineComponent({
         tableTotal.value = totalCount || data.length;
       }
       tableLoading.value = false;
+      if (parent === void 0) {
+        isFinishedFirstRequest.value = true;
+      }
       const result = {
         records: tableData.value,
         currentPage: tablePage.value,
@@ -476,6 +485,7 @@ const _sfc_main = vue.defineComponent({
       toolExportConfig,
       toolPrintConfig,
       loadingProps,
+      isFinishedFirstRequest,
       handleRefresh,
       handleSizeChange,
       handleColumnsChange,
@@ -522,7 +532,10 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
         void 0
       ]), 1040)) : vue.createCommentVNode("", true),
       vue.renderSlot(_ctx.$slots, "default"),
-      _ctx.virtual ? (vue.openBlock(), vue.createBlock(_component_EleVirtualTable, vue.mergeProps({ key: 1 }, _ctx.tableProps, { ref: "tableViewRef" }), vue.createSlots({ _: 2 }, [
+      _ctx.virtual ? (vue.openBlock(), vue.createBlock(_component_EleVirtualTable, vue.mergeProps({ key: 1 }, _ctx.tableProps, {
+        ref: "tableViewRef",
+        isAllowShowEmpty: _ctx.isFinishedFirstRequest
+      }), vue.createSlots({ _: 2 }, [
         vue.renderList(Object.keys(_ctx.$slots).filter((k) => !_ctx.tableSlotExcludes.includes(k)), (name) => {
           return {
             name,
@@ -531,8 +544,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             ])
           };
         })
-      ]), 1040)) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 2 }, [
-        _ctx.isShowTable ? (vue.openBlock(), vue.createBlock(_component_EleDataTable, vue.mergeProps({ key: 0 }, _ctx.tableProps, { ref: "tableViewRef" }), vue.createSlots({ _: 2 }, [
+      ]), 1040, ["isAllowShowEmpty"])) : (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 2 }, [
+        _ctx.isShowTable ? (vue.openBlock(), vue.createBlock(_component_EleDataTable, vue.mergeProps({ key: 0 }, _ctx.tableProps, {
+          ref: "tableViewRef",
+          isAllowShowEmpty: _ctx.isFinishedFirstRequest
+        }), vue.createSlots({ _: 2 }, [
           vue.renderList(Object.keys(_ctx.$slots).filter((k) => !_ctx.tableSlotExcludes.includes(k)), (name) => {
             return {
               name,
@@ -541,7 +557,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
               ])
             };
           })
-        ]), 1040)) : vue.createCommentVNode("", true)
+        ]), 1040, ["isAllowShowEmpty"])) : vue.createCommentVNode("", true)
       ], 64)),
       _ctx.paginationProps || _ctx.$slots.footer ? (vue.openBlock(), vue.createElementBlock("div", {
         key: 3,

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

@@ -202,6 +202,10 @@ export declare const proTableProps: {
     rowClickChecked: PropType<import('../ele-data-table/types').RowClickChecked>;
     reserveCurrent: BooleanConstructor;
     selectedRowKeys: PropType<import('../ele-data-table/types').DataKey[]>;
+    isAllowShowEmpty: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 };
 export type ProTableProps = ExtractPropTypes<typeof proTableProps>;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuang-framework-ui-pc",
-  "version": "1.1.161",
+  "version": "1.1.162",
   "type": "module",
   "scripts": {
     "dev": "vite --host --config vite.global.ts --mode dev",