3h1-ui 2.1.12 → 2.1.14

package/es/index.js

@@ -1,7 +1,7 @@
 import { h, nextTick, createVNode, defineComponent, ref, computed, unref, watchEffect, watch, resolveComponent, openBlock, createBlock, mergeProps, withCtx, createElementBlock, Fragment, renderList, createTextVNode, toDisplayString, createSlots, renderSlot, normalizeProps, guardReactiveProps, createElementVNode, onMounted, normalizeClass, createCommentVNode, normalizeStyle, Transition, toHandlers, useSlots, withDirectives, vShow, getCurrentInstance, inject, onUnmounted, provide, onBeforeUnmount, resolveDynamicComponent, reactive, toRef, toRefs, TransitionGroup, getCurrentScope, onScopeDispose, readonly, isVNode, shallowReactive, toRaw, shallowRef, withKeys, withModifiers, render as render$1, resolveDirective, isRef, useAttrs as useAttrs$2 } from "vue";
 import { Radio, Select, Tree, TreeSelect, Cascader, Transfer, Input, Tooltip, Skeleton, Popover, Pagination, Empty, Button as Button$1, Table as Table$1, Form, FormItem, DatePicker, InputNumber, AutoComplete, Switch, Checkbox, Slider, Rate, TimePicker, Divider, Col, Popconfirm, Modal as Modal$2, Row, Dropdown, Menu, MenuItem, MenuDivider, Spin, PageHeader, Image, Badge, Tag, FormItemRest, Descriptions, Drawer, Space, Upload, Avatar } from "ant-design-vue";
 import { propTypes, isFunction as isFunction$4, isString as isString$3, isArray as isArray$3, getSlot as getSlot$1, addClass as addClass$1, removeClass as removeClass$1, getPopupContainer as getPopupContainer$1, triggerWindowResize, off, on, addResizeListener, removeResizeListener, isNumber as isNumber$2, isBoolean, isNull, extendSlots as extendSlots$1, withInstall as withInstall$1, isObject as isObject$3, dateUtil, isNullOrUnDef, isDef as isDef$1, error as error$1, deepMerge as deepMerge$1, getDynamicProps, buildProps, createBEM, forEach as forEach$1, isClient as isClient$1, filter, treeToList, eachTree, isEmpty, isServer, formatToDate, isMap as isMap$2, buildUUID, findNodeAll, getViewportOffset, warn as warn$1, isNullAndUnDef, dataURLtoBlob } from "@shy-plugins/utils";
-import { useAttrs as useAttrs$1, useRuleFormItem, useTimeoutFn as useTimeoutFn$2, useScrollTo as useScrollTo$1, useIntersectionObserver, useCopyToClipboard, useMessage, usePagination as usePagination$1, createContext as createContext$1, useContext as useContext$2, useBreakpoint, useI18n as useI18n$1, useContentHeight, useDesign as useDesign$1, useWindowSizeFn as useWindowSizeFn$1, onMountedOrActivated, useEventListener as useEventListener$1 } from "@shy-plugins/use";
+import { useAttrs as useAttrs$1, useRuleFormItem, useTimeoutFn as useTimeoutFn$2, useScrollTo as useScrollTo$1, useIntersectionObserver, useCopyToClipboard, useMessage, usePagination as usePagination$2, createContext as createContext$1, useContext as useContext$2, useBreakpoint, useI18n as useI18n$1, useContentHeight, useDesign as useDesign$1, useWindowSizeFn as useWindowSizeFn$1, onMountedOrActivated, useEventListener as useEventListener$1 } from "@shy-plugins/use";
 import { zxcvbn } from "@zxcvbn-ts/core";
 import Iconify from "@purge-icons/generated";
 import Sortablejs from "sortablejs";
@@ -6856,7 +6856,7 @@ const _sfc_main$P = /* @__PURE__ */ defineComponent({
     const debounceHandleSearchChange = useDebounceFn$1(handleSearchChange, 100);
     const { clipboardRef, isSuccessRef } = useCopyToClipboard(props2.value);
     const { createMessage } = useMessage();
-    const { getPaginationList, getTotal, setCurrentPage } = usePagination$1(
+    const { getPaginationList, getTotal, setCurrentPage } = usePagination$2(
       currentList,
       props2.pageSize
     );
@@ -11862,7 +11862,7 @@ function itemRender({
   }
   return originalElement;
 }
-function usePagination(refProps) {
+function usePagination$1(refProps) {
   const configRef = ref({});
   const show = ref(true);
   watch(() => unref(refProps).pagination, (pagination) => {
@@ -14599,7 +14599,7 @@ const _sfc_main$i = defineComponent({
       setPagination,
       setShowPagination,
       getShowPagination
-    } = usePagination(getProps);
+    } = usePagination$1(getProps);
     const {
       getRowSelection,
       getRowSelectionRef,
@@ -19993,6 +19993,53 @@ const basicColumn = {
 const basicFormConfig = {
   labelWidth: 80
 };
+const usePagination = () => {
+  const page = reactive({
+    total: 0,
+    current: 1,
+    pageSize: 10,
+    pageSizeOptions: ["10", "20", "30", "40"]
+  });
+  const setPage = (pageInfo) => {
+    nextTick(() => {
+      Object.keys(pageInfo).forEach((key2) => {
+        page[key2] = pageInfo[key2];
+      });
+    });
+  };
+  return { page, setPage };
+};
+const useTableData = (getProps, { setPage, params }) => {
+  const dataSource = ref([]);
+  const setTableData = (data) => {
+    dataSource.value = data.map((item) => {
+      item._isEdit = false;
+      return item;
+    });
+  };
+  const getTableData = () => {
+    return dataSource.value;
+  };
+  const reload = async () => {
+    var _a2;
+    if ((_a2 = getProps.value) == null ? void 0 : _a2.api) {
+      const res = await getProps.value.api(params.value);
+      setTableData(res.records);
+      setPage({ total: (res == null ? void 0 : res.total) || 0 });
+    }
+  };
+  onMounted(async () => {
+    if (getProps.value.isImmediate) {
+      await reload();
+    }
+  });
+  return {
+    dataSource,
+    setTableData,
+    reload,
+    getTableData
+  };
+};
 const __default__ = defineComponent({
   name: "TablePlus"
 });
@@ -20070,6 +20117,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return { ...basicColumn, ...item };
       });
     });
+    const { page, setPage } = usePagination();
     const getFormConfig = computed(() => {
       return {
         ...getProps.value.formConfig,
@@ -20080,7 +20128,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       ...basicFormConfig,
       ...getFormConfig.value
     });
-    ref({});
+    const formSearch = ref({});
+    const params = computed(() => {
+      return {
+        ...getProps.value.searchInfo,
+        ...formSearch.value,
+        current: page.current,
+        size: page.pageSize
+      };
+    });
+    useTableData(
+      getProps,
+      {
+        setPage,
+        params
+      }
+    );
     const tableRef = ref();
     const getRowSelection = () => {
       if (getProps.value.configRowSelection.type === "checkbox") {

package/lib/index.js

@@ -11864,7 +11864,7 @@ function itemRender({
   }
   return originalElement;
 }
-function usePagination(refProps) {
+function usePagination$1(refProps) {
   const configRef = vue.ref({});
   const show = vue.ref(true);
   vue.watch(() => vue.unref(refProps).pagination, (pagination) => {
@@ -14601,7 +14601,7 @@ const _sfc_main$i = vue.defineComponent({
       setPagination,
       setShowPagination,
       getShowPagination
-    } = usePagination(getProps);
+    } = usePagination$1(getProps);
     const {
       getRowSelection,
       getRowSelectionRef,
@@ -19995,6 +19995,53 @@ const basicColumn = {
 const basicFormConfig = {
   labelWidth: 80
 };
+const usePagination = () => {
+  const page = vue.reactive({
+    total: 0,
+    current: 1,
+    pageSize: 10,
+    pageSizeOptions: ["10", "20", "30", "40"]
+  });
+  const setPage = (pageInfo) => {
+    vue.nextTick(() => {
+      Object.keys(pageInfo).forEach((key2) => {
+        page[key2] = pageInfo[key2];
+      });
+    });
+  };
+  return { page, setPage };
+};
+const useTableData = (getProps, { setPage, params }) => {
+  const dataSource = vue.ref([]);
+  const setTableData = (data) => {
+    dataSource.value = data.map((item) => {
+      item._isEdit = false;
+      return item;
+    });
+  };
+  const getTableData = () => {
+    return dataSource.value;
+  };
+  const reload = async () => {
+    var _a2;
+    if ((_a2 = getProps.value) == null ? void 0 : _a2.api) {
+      const res = await getProps.value.api(params.value);
+      setTableData(res.records);
+      setPage({ total: (res == null ? void 0 : res.total) || 0 });
+    }
+  };
+  vue.onMounted(async () => {
+    if (getProps.value.isImmediate) {
+      await reload();
+    }
+  });
+  return {
+    dataSource,
+    setTableData,
+    reload,
+    getTableData
+  };
+};
 const __default__ = vue.defineComponent({
   name: "TablePlus"
 });
@@ -20072,6 +20119,7 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
         return { ...basicColumn, ...item };
       });
     });
+    const { page, setPage } = usePagination();
     const getFormConfig = vue.computed(() => {
       return {
         ...getProps.value.formConfig,
@@ -20082,7 +20130,22 @@ const _sfc_main = /* @__PURE__ */ vue.defineComponent({
       ...basicFormConfig,
       ...getFormConfig.value
     });
-    vue.ref({});
+    const formSearch = vue.ref({});
+    const params = vue.computed(() => {
+      return {
+        ...getProps.value.searchInfo,
+        ...formSearch.value,
+        current: page.current,
+        size: page.pageSize
+      };
+    });
+    useTableData(
+      getProps,
+      {
+        setPage,
+        params
+      }
+    );
     const tableRef = vue.ref();
     const getRowSelection = () => {
       if (getProps.value.configRowSelection.type === "checkbox") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "2.1.12",
+  "version": "2.1.14",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -31,8 +31,8 @@
     "vue-types": "^5.0.2",
     "vxe-table": "^4.3.6",
     "xe-utils": "^3.5.7",
-    "@shy-plugins/utils": "1.0.14",
-    "@shy-plugins/use": "1.0.3"
+    "@shy-plugins/use": "1.0.3",
+    "@shy-plugins/utils": "1.0.14"
   },
   "types": "es/ui/index.d.ts",
   "devDependencies": {