@dt-frames/ui 2.0.3 → 2.0.5

package/es/components/modal/index.js

@@ -1,9 +1,10 @@
 import { useApp, isFunction, isObject, error, useTimeoutFn, useSlots, useI18n, off, on, windowResizeFn, dispatchResize, isArray, deepMerge } from "@dt-frames/core";
-import { reactive, ref as ref$1, watchEffect, unref, nextTick, onUnmounted, toRefs, useAttrs, createVNode, isVNode, defineComponent, computed, openBlock, createElementBlock, normalizeClass, Fragment, createBlock, withCtx, createElementVNode, createCommentVNode, getCurrentInstance as getCurrentInstance$1, inject, h as h$1, provide, onMounted as onMounted$1, normalizeStyle, resolveDynamicComponent, renderSlot, mergeProps, watch, resolveDirective, normalizeProps, renderList, withDirectives, createTextVNode, toDisplayString, createSlots, guardReactiveProps } from "vue";
+import { reactive, ref, getCurrentInstance, watchEffect, unref, nextTick, onUnmounted, toRaw, toRefs, useAttrs, createVNode, isVNode, defineComponent, computed, openBlock, createElementBlock, normalizeClass, Fragment, createBlock, withCtx, createElementVNode, createCommentVNode, inject, h, provide, onMounted, onBeforeUnmount, normalizeStyle, resolveDynamicComponent, renderSlot, mergeProps, watch, resolveDirective, normalizeProps, renderList, withDirectives, createTextVNode, toDisplayString, createSlots, guardReactiveProps } from "vue";
 import { Tooltip, Button, FormItem, Col, Spin } from "ant-design-vue/es";
 import "ant-design-vue/es/spin/style";
 import { omit } from "lodash-es";
 import { Modal } from "ant-design-vue";
+import "ant-design-vue/es/modal/style";
 import "ant-design-vue/es/tooltip/style";
 import "ant-design-vue/es/col/style";
 import "ant-design-vue/es/form/style";
@@ -12,9 +13,9 @@ const orgDialogProp = reactive({});
 const cbTransfer = reactive({});
 const dataTransfer = reactive({});
 function useModalOut() {
-  const modal = ref$1(null);
-  const loaded = ref$1(true);
-  const uid = ref$1(null);
+  const modal = ref(null);
+  const loaded = ref(true);
+  const uid = ref(null);
   const { isProd } = useApp();
   function register(modalMethod, uuid) {
     if (!getCurrentInstance()) {
@@ -72,9 +73,9 @@ function useModalOut() {
   return [register, methods];
 }
 function useModal(props, setModalData) {
-  const modalInstanceRef = ref$1(null);
+  const modalInstanceRef = ref(null);
   const currentInstance = getCurrentInstance();
-  const uidRef = ref$1(null);
+  const uidRef = ref(null);
   const { isProd } = useApp();
   const getInstance = () => {
     const instance = unref(modalInstanceRef);
@@ -453,14 +454,14 @@ const Bar = defineComponent({
     move: Number
   },
   setup(props) {
-    const instance = getCurrentInstance$1();
-    const thumb = ref$1();
+    const instance = getCurrentInstance();
+    const thumb = ref();
     const wrap = inject("scroll-bar-wrap", {});
     const bar = computed(() => {
       return BAR_MAP[props.vertical ? "vertical" : "horizontal"];
     });
-    const barStore = ref$1({});
-    const cursorDown = ref$1();
+    const barStore = ref({});
+    const cursorDown = ref();
     const clickThumbHandler = (e) => {
       if (e.ctrlKey || e.button === 2) {
         return;
@@ -504,13 +505,13 @@ const Bar = defineComponent({
     onUnmounted(() => {
       off(document, "mouseup", mouseUpDocumentHandler);
     });
-    return () => h$1(
+    return () => h(
       "div",
       {
         class: ["scrollbar__bar", "is-" + bar.value.key],
         onMousedown: clickTrackHandler
       },
-      h$1("div", {
+      h("div", {
         ref: thumb,
         class: "scrollbar__thumb",
         onMousedown: clickThumbHandler,
@@ -548,12 +549,12 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    const sizeWidth = ref$1("0");
-    const sizeHeight = ref$1("0");
-    const moveX = ref$1(0);
-    const moveY = ref$1(0);
-    const wrap = ref$1();
-    const resize = ref$1();
+    const sizeWidth = ref("0");
+    const sizeHeight = ref("0");
+    const moveX = ref(0);
+    const moveY = ref(0);
+    const wrap = ref();
+    const resize = ref();
     provide("scroll-bar-wrap", wrap);
     const style = computed(() => {
       let rsStyle = {};
@@ -577,7 +578,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
       sizeHeight.value = heightPercentage < 100 ? heightPercentage + "%" : "";
       sizeWidth.value = widthPercentage < 100 ? widthPercentage + "%" : "";
     };
-    onMounted$1(() => {
+    onMounted(() => {
       nextTick(update);
       if (!props.noresize) {
         addResizeListener(unref(resize), update);
@@ -683,10 +684,10 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   emits: ["ext-height", "height-change"],
   setup(__props, { emit: emits }) {
     const props = __props;
-    const wrapperRef = ref$1(null);
-    const wrapRef = ref$1(null);
-    const realHeightRef = ref$1(0);
-    const minRealHeightRef = ref$1(0);
+    const wrapperRef = ref(null);
+    const wrapRef = ref(null);
+    const realHeightRef = ref(0);
+    const minRealHeightRef = ref(0);
     let realHeight = 0;
     const wrapStyle = computed(() => {
       return {
@@ -702,10 +703,10 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
       const wrapperRefDom = unref(wrapperRef);
       if (!wrapperRefDom)
         return;
-      const bodyDom = wrapperRefDom.$el.parentElement;
+      const bodyDom = wrapperRefDom.$el.parentElement.parentElement.parentElement;
       if (!bodyDom)
         return;
-      bodyDom.style.padding = "0";
+      bodyDom.style.padding = props.useWrapper ? "24px" : "0";
       await nextTick();
       const modalDom = bodyDom.parentElement && bodyDom.parentElement.parentElement;
       return modalDom;
@@ -820,7 +821,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: emits }) {
     const props = __props;
     const { t } = useI18n();
-    const advancedRef = ref$1(props.isAdvanced);
+    const advancedRef = ref(props.isAdvanced);
     let key = 0;
     const showAdvanceRef = computed(() => {
       return props.mode === "search" ? props.showAdvancedButton : false;
@@ -889,7 +890,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                   (button.show === void 0 ? true : button.show) ? withDirectives((openBlock(), createBlock(_component_AButton, {
                     type: button.type,
                     class: normalizeClass(button.class),
-                    loading: button.loading?.value,
+                    loading: button.loading,
                     disabled: button.disabled,
                     key: unref(key),
                     onClick: ($event) => handleBtnClick(button)
@@ -900,7 +901,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                       ]) : createCommentVNode("", true)
                     ]),
                     default: withCtx(() => [
-                      createTextVNode(" " + toDisplayString(unref(t)(button.name)) + " ", 1),
+                      createTextVNode(" " + toDisplayString(unref(t)(button.label)) + " ", 1),
                       button.postIcon ? withDirectives((openBlock(), createElementBlock("span", _hoisted_2, null, 512)), [
                         [_directive_icon, button.postIcon]
                       ]) : createCommentVNode("", true)
@@ -954,8 +955,8 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       if (props.buttons && props.buttons.length)
         return props.buttons;
       let buttonActions = [
-        { t: "\u4FDD\u5B58", name: props.okText || t("SAVE"), preIcon: "mdi:content-save", type: "primary", flag: "OK" },
-        { t: "\u5173\u95ED", name: props.cancelText || t("CLOSE"), preIcon: "mdi:close", flag: "CANCEL" }
+        { t: "\u4FDD\u5B58", label: props.okText || t("SAVE"), preIcon: "mdi:content-save", type: "primary", flag: "OK" },
+        { t: "\u5173\u95ED", label: props.cancelText || t("CLOSE"), preIcon: "mdi:close", flag: "CANCEL" }
       ];
       if (!props.showSave)
         buttonActions = buttonActions.filter((btn) => btn.flag !== "OK");
@@ -986,7 +987,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   }
 });
 function useFullScreen(wrapClassName) {
-  const fullScreenRef = ref$1(false);
+  const fullScreenRef = ref(false);
   const getWrapClassName = computed(() => {
     const clsName = unref(wrapClassName) || "";
     const cls = unref(fullScreenRef) ? `fullscreen-modal ${clsName} ` : unref(clsName);
@@ -1009,9 +1010,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   emits: ["visible-change", "height-change", "cancel", "save", "register", "update:visible"],
   setup(__props, { emit: emits }) {
     const props = __props;
-    const visibleRef = ref$1(false);
-    const propsRef = ref$1();
-    const modalWrapperRef = ref$1(null);
+    const visibleRef = ref(false);
+    const propsRef = ref();
+    const modalWrapperRef = ref(null);
     const { getWrapClassName, toggleFullScreen, fullScreenRef } = useFullScreen(computed(() => unref(propsRef)?.wrapClassName));
     const getMergeProps = computed(() => {
       return {

package/es/components/modal/index.less

@@ -14,6 +14,16 @@
             height: 100%;
         }
     }
+
+    .ant-modal-content{
+        display: flex;
+        flex-direction: column;
+
+        .ant-modal-body{
+            flex: 1;
+            height: 0;
+        }
+    }
 }
 
 

package/es/components/modal/src/components/ModalFooter.d.ts

@@ -107,11 +107,11 @@ declare const _sfc_main: import("vue").DefineComponent<{
         "onHandle-method"?: (...args: any[]) => any;
     }, {
         mode: "search" | "dialog";
-        minShowColumn: number;
-        showAdvancedButton: boolean;
         show: boolean;
-        isAdvanced: boolean;
+        showAdvancedButton: boolean;
+        minShowColumn: number;
         buttonList: ButtonProps[];
+        isAdvanced: boolean;
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("handleSave" | "handleCancel")[], "handleSave" | "handleCancel", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     buttons: PropType<ButtonProps[]>;

package/es/components/modal/src/index.d.ts

@@ -100,7 +100,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     afterClose: FunctionConstructor;
 }, {
     props: any;
-    emits: (event: "register" | "visible-change" | "height-change" | "cancel" | "save" | "update:visible", ...args: any[]) => void;
+    emits: (event: "visible-change" | "height-change" | "cancel" | "save" | "register" | "update:visible", ...args: any[]) => void;
     visibleRef: import("vue").Ref<boolean>;
     propsRef: import("vue").Ref<Partial<ExtractPropTypes<{
         t: {
@@ -620,11 +620,11 @@ declare const _sfc_main: import("vue").DefineComponent<{
             "onHandle-method"?: (...args: any[]) => any;
         }, {
             mode: "search" | "dialog";
-            minShowColumn: number;
-            showAdvancedButton: boolean;
             show: boolean;
-            isAdvanced: boolean;
+            showAdvancedButton: boolean;
+            minShowColumn: number;
             buttonList: import("../../form/src/types/form.type").ButtonProps[];
+            isAdvanced: boolean;
         }>;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("handleSave" | "handleCancel")[], "handleSave" | "handleCancel", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
         buttons: import("vue").PropType<import("../../form/src/types/form.type").ButtonProps[]>;
@@ -649,7 +649,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         showSave: boolean;
         showCancel: boolean;
     }>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("register" | "visible-change" | "height-change" | "cancel" | "save" | "update:visible")[], "register" | "visible-change" | "height-change" | "cancel" | "save" | "update:visible", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("visible-change" | "height-change" | "cancel" | "save" | "register" | "update:visible")[], "visible-change" | "height-change" | "cancel" | "save" | "register" | "update:visible", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
     t: {
         type: StringConstructor;
     };
@@ -747,27 +747,27 @@ declare const _sfc_main: import("vue").DefineComponent<{
     closeFunc: import("vue").PropType<() => Promise<boolean>>;
     afterClose: FunctionConstructor;
 }>> & {
-    onRegister?: (...args: any[]) => any;
-    "onUpdate:visible"?: (...args: any[]) => any;
     "onVisible-change"?: (...args: any[]) => any;
     "onHeight-change"?: (...args: any[]) => any;
     onCancel?: (...args: any[]) => any;
     onSave?: (...args: any[]) => any;
+    onRegister?: (...args: any[]) => any;
+    "onUpdate:visible"?: (...args: any[]) => any;
 }, {
-    loading: boolean;
     visible: boolean;
-    mask: boolean;
     closable: boolean;
     destroyOnClose: boolean;
     scrollTop: boolean;
     draggable: boolean;
     defaultFullscreen: boolean;
     canFullscreen: boolean;
+    loading: boolean;
     loadingTip: string;
     useWrapper: boolean;
     centered: boolean;
     showOkBtn: boolean;
     showCancelBtn: boolean;
+    mask: boolean;
     maskClosable: boolean;
     keyboard: boolean;
 }>;

package/es/components/source/hooks/useSource.d.ts

@@ -21,6 +21,7 @@ export declare function useSource(props: SourceOption): {
             total: number;
         }>;
         loading: import("vue").Ref<boolean>;
+        onSearch: () => void;
         onTableChange: (params: TableParamsType) => void;
         onAdd: () => void;
         onUpdate: (arg: any) => void;
@@ -35,6 +36,19 @@ export declare function useSource(props: SourceOption): {
         onQueryById: (id: Key) => Promise<unknown>;
         registerInstance: (instance: CurdActionType) => CurdActionType;
     };
+    api: import("../types/source.type").ApiObjType;
+    loading: {
+        [key: string]: import("vue").Ref<boolean>;
+    };
+    dataSource: import("vue").Ref<any[]>;
+    onAdd: () => void;
+    onUpdate: (arg: any) => void;
+    onDelete: (arg: any) => void;
+    onDeletes: (ids: Key[]) => void;
+    onQueryById: (id: Key) => Promise<unknown>;
+    onDownload: (excelData: DownloadType, extraData?: any[]) => void;
+    onSave: () => void;
     onSearch: () => void;
+    onReset: () => void;
     onTableChange: (params: TableParamsType) => void;
 };

package/es/components/source/index.js

@@ -1,5 +1,5 @@
-import { ref, unref, reactive, toRaw } from "vue";
-import { isString, http, isObject, useAppStore, error, getDictValueByCode, formatNumber, useI18n, useMessage, isArray } from "@dt-frames/core";
+import { ref, unref, toRaw } from "vue";
+import { isString, http, isObject, useAppStore, error, getDictValueByCode, formatNumber, useI18n, useMessage, isArray, isFunction, isBoolean } from "@dt-frames/core";
 import { isObject as isObject$1 } from "@vueuse/core";
 import { capitalize } from "lodash-es";
 import * as xlsx from "xlsx";
@@ -134,7 +134,7 @@ function useSource(props) {
   const { t } = useI18n("UI");
   const { confirm, message } = useMessage();
   const { appConf } = useAppStore();
-  const { baseUrl, api: orgApi, immediateSearch = true, exportName, beforeUpdate, afterUpdate } = props;
+  const { baseUrl, api: orgApi, exportName, queryAfterUpdate, beforeUpdate, afterUpdate } = props;
   const pagination = ref({
     current: appConf?.ui?.table?.defaultPageNo || 1,
     pageSize: appConf?.ui?.table?.defaultPageSize || 20,
@@ -142,27 +142,34 @@ function useSource(props) {
   });
   const { loading, api } = getApi(orgApi, baseUrl);
   const dataSource = ref([]);
-  const baseData = reactive({
-    entityDTO: {},
-    orderDTOs: []
-  });
+  let baseData = {
+    pageNumber: 1,
+    pageSize: appConf?.ui?.table?.defaultPageSize || 20
+  };
   let tableInstance = null;
   let formInstance = null;
   let curdInstance = null;
   function onSearch() {
     tableInstance?.clearSelectedRowKeys();
     const { defaultPageSize } = tableInstance?.getPagination() || {};
-    baseData.pageDTO = {
-      pageNo: 0,
+    baseData = {
+      ...formInstance?.getFormValues() ?? {},
+      pageNumber: 1,
       pageSize: defaultPageSize
     };
     loading.onSearch.value = true;
+    loading.onQuerypage.value = true;
     setPage();
   }
   function onReset() {
-    baseData.entityDTO = { ...formInstance?.getFormValues() ?? {} };
-    baseData.pageDTO.pageNo = 0;
+    const { defaultPageSize } = tableInstance?.getPagination() || {};
+    baseData = {
+      ...formInstance?.getFormValues() ?? {},
+      pageNumber: 1,
+      pageSize: defaultPageSize
+    };
     loading.onReset.value = true;
+    loading.onQuerypage.value = true;
     tableInstance?.clearSelectedRowKeys();
     setPage();
   }
@@ -177,12 +184,12 @@ function useSource(props) {
         dataSource.value.splice(0, dataSource.value.length, ...rsp);
         return;
       }
-      const { records, pageDTO } = rsp;
+      const { records, total, size, current } = rsp;
       dataSource.value.splice(0, dataSource.value.length, ...records);
       pagination.value = {
-        current: (pageDTO?.pageNo ?? 0) + 1,
-        pageSize: pageDTO?.pageSize ?? appConf?.ui?.table?.defaultPageSize,
-        total: pageDTO?.totalCount ?? 0
+        current,
+        pageSize: size || appConf?.ui?.table?.defaultPageSize,
+        total
       };
     }).finally(() => {
       loading.onSearch.value = false;
@@ -192,18 +199,29 @@ function useSource(props) {
   }
   function onTableChange(params) {
     const { pagination: pagination2, sort, filter } = params;
-    baseData.pageDTO = {
-      pageNo: pagination2.current - 1,
+    if (!appConf?.ui?.table?.multipleSorter) {
+      let order = sort.order;
+      let sortOrder = order === "ascend" ? "asc" : order === "descend" ? "desc" : null;
+      baseData = {
+        ...baseData,
+        sortName: sortOrder ? sort.field : "",
+        sortOrder
+      };
+    } else {
+      baseData.sort = (sort || []).map((it) => {
+        if (it.order) {
+          return {
+            sortName: it.field,
+            sortOrder: it.order === "ascend" ? "asc" : "desc"
+          };
+        }
+      }).filter((it) => it);
+    }
+    baseData = {
+      ...baseData,
+      pageNumber: pagination2.current,
       pageSize: pagination2.pageSize
     };
-    baseData.orderDTOs = (isObject$1(sort) ? [sort] : sort).map((it) => {
-      if (it.order) {
-        return {
-          propertyName: it.field,
-          dir: it.order === "ascend" ? "asc" : "desc"
-        };
-      }
-    }).filter((it) => it);
     setPage(filter);
   }
   function onAdd() {
@@ -221,23 +239,33 @@ function useSource(props) {
   function onSave() {
     let model = curdInstance && curdInstance.curdFormMethods.getFormValues();
     curdInstance.curdFormMethods.validate().then((rsp) => {
+      if (beforeUpdate && isFunction(beforeUpdate)) {
+        let canUpdate = beforeUpdate(model);
+        if (isBoolean(canUpdate) && canUpdate === false) {
+          return false;
+        } else if (!isBoolean(canUpdate)) {
+          model = { ...canUpdate || {} };
+        }
+      }
       if (!model.id) {
         loading.onAdd.value = true;
         fetch(api.add, { ...model }, false).then((rsp2) => {
-          if (rsp2?.code === 0) {
+          if (rsp2?.code === appConf?.http?.okCode) {
             message.success(t("ADD_SUCCESS"));
             curdInstance.closeModal();
-            onSearch();
+            if (queryAfterUpdate !== false)
+              onSearch();
           }
           loading.onAdd.value = false;
         });
       } else {
         loading.onUpdate.value = true;
         fetch(api.update, { ...model }, false).then((rsp2) => {
-          if (rsp2?.code === 0) {
+          if (rsp2?.code === appConf?.http?.okCode) {
             message.success(t("UPDATE_SUCCESS"));
             curdInstance.closeModal();
-            onSearch();
+            if (queryAfterUpdate !== false)
+              onSearch();
           }
           loading.onUpdate.value = false;
         });
@@ -264,10 +292,11 @@ function useSource(props) {
       iconType: "warning",
       onOk() {
         fetch(api.deletes, toRaw(_ids), false).then((rsp) => {
-          if (rsp?.code === 0) {
+          if (rsp?.code === appConf?.http?.okCode) {
             message.success((isSingleDelete ? "" : t("MULTIFY")) + t("DELETE_SUCCESS"));
             !isSingleDelete && tableInstance.clearSelectedRowKeys();
-            onSearch();
+            if (queryAfterUpdate !== false)
+              onSearch();
           }
         }).finally(() => {
           isSingleDelete && (loading.onDeletes.value = false);
@@ -305,6 +334,7 @@ function useSource(props) {
     dataSource,
     pagination,
     loading: loading.onQuerypage,
+    onSearch,
     onTableChange,
     onAdd,
     onUpdate,
@@ -323,7 +353,18 @@ function useSource(props) {
     form,
     table,
     curd,
+    api,
+    loading,
+    dataSource,
+    onAdd,
+    onUpdate,
+    onDelete,
+    onDeletes,
+    onQueryById,
+    onDownload,
+    onSave,
     onSearch,
+    onReset,
     onTableChange
   };
 }

package/es/components/source/types/source.type.d.ts

@@ -12,8 +12,8 @@ export declare type ApiObjType = {
 export declare type SourceOption = {
     baseUrl?: string;
     exportName?: string | ComputedRef;
-    immediateSearch?: boolean;
-    beforeUpdate?: () => boolean | undefined;
+    queryAfterUpdate?: boolean;
+    beforeUpdate?: (model: Recordable) => boolean | Recordable | undefined;
     afterUpdate?: () => void;
     api?: ApiObjType;
 };
@@ -22,12 +22,9 @@ export declare type orderType = {
     order: 'asc' | 'desc';
 };
 export declare type BaseDataType = {
-    entityDTO?: any;
-    pageDTO?: {
-        pageNo: Number;
-        pageSize: Number;
-    } | null;
-    orderDTOs: orderType[];
+    pageNumber: Number;
+    pageSize: Number;
+    [key: string]: any;
 };
 export declare type TableParamsType = {
     pagination: any;