@dt-frames/ui 2.0.5 → 2.0.7

package/es/assets/locales/en.d.ts

@@ -35,6 +35,7 @@ export declare const EN: {
         FIXED_TO_LEFT: string;
         FIXED_TO_RIGHT: string;
         EXPORT: string;
+        DOWNLOAD_TEMPLATE: string;
         EXPORT_CURRENT_PAGE: string;
         EXPORT_SELECT_COLUMN: string;
         EXPORT_ALL: string;
@@ -71,6 +72,7 @@ export declare const EN: {
         SMALL_SIZE: string;
         MODIFY_PASSWORD: string;
         LOGIN_OUT: string;
+        REFRESH: string;
         CLOSE_CURRENT_TAG: string;
         CLOSE_LEFT_TAGS: string;
         CLOSE_RIGHT_TAGS: string;

package/es/assets/locales/en.ts

@@ -35,6 +35,7 @@ export const EN = {
         "FIXED_TO_LEFT": "Fixed to the left",
         "FIXED_TO_RIGHT": "Fixed to the right",
         "EXPORT": "Export",
+        "DOWNLOAD_TEMPLATE": "Download Template",
         "EXPORT_CURRENT_PAGE": "Export the current page",
         "EXPORT_SELECT_COLUMN": "Export Selected columns",
         "EXPORT_ALL": "Export all columns",
@@ -71,6 +72,7 @@ export const EN = {
         "SMALL_SIZE": "Small Size",
         "MODIFY_PASSWORD": "Modify Password",
         "LOGIN_OUT": "Log out",
+        "REFRESH": "Refresh",
         "CLOSE_CURRENT_TAG": "Close the current tab",
         "CLOSE_LEFT_TAGS": "Close the left tab",
         "CLOSE_RIGHT_TAGS": "Close the right tab",

package/es/assets/locales/zh.d.ts

@@ -72,6 +72,7 @@ export declare const ZH: {
         SMALL_SIZE: string;
         MODIFY_PASSWORD: string;
         LOGIN_OUT: string;
+        REFRESH: string;
         CLOSE_CURRENT_TAG: string;
         CLOSE_LEFT_TAGS: string;
         CLOSE_RIGHT_TAGS: string;

package/es/assets/locales/zh.ts

@@ -72,11 +72,12 @@ export const ZH = {
         "SMALL_SIZE": "小尺寸",
         "MODIFY_PASSWORD": "修改密码",
         "LOGIN_OUT": "退出系统",
-        "CLOSE_CURRENT_TAG": "关闭当前标签页",
-        "CLOSE_LEFT_TAGS": "关闭左侧标签页",
-        "CLOSE_RIGHT_TAGS": "关闭右侧标签页",
-        "CLOSE_OTHER_TAGS": "关闭其他标签页",
-        "CLOSE_ALL_TAGE": "关闭全部标签页",
+        "REFRESH": "重新加载",
+        "CLOSE_CURRENT_TAG": "关闭当前",
+        "CLOSE_LEFT_TAGS": "关闭左侧",
+        "CLOSE_RIGHT_TAGS": "关闭右侧",
+        "CLOSE_OTHER_TAGS": "关闭其他",
+        "CLOSE_ALL_TAGE": "关闭全部",
         "SETTING_THEME": "风格设置",
         "PROJECT_SETTING": "项目配置",
         "NAV_MODE": "导航栏模式",

package/es/components/curd/index.js

@@ -3,7 +3,7 @@ import { RadioButton, RadioGroup, Button, FormItem as FormItem$1, Col as Col$1,
 import "ant-design-vue/es/form/style";
 import "ant-design-vue/es/row/style";
 import { DtCache, CacheKey, deepMerge, Pages, useGo, useRedo, Language, useAppStore, isNumber, useI18n, isString, isFunction, error, useSlots, isArray, isBoolean, isNull, dispatchResize, isObject, isNullAndUnDef, isEmpty, useTimeoutFn, useApp, off, on, windowResizeFn, useMessage } from "@dt-frames/core";
-import { isEqual, omit, cloneDeep, upperFirst, uniqBy, set } from "lodash-es";
+import { cloneDeep, isEqual, omit, upperFirst, uniqBy, set } from "lodash-es";
 import { Input, Select, TreeSelect, Radio, Checkbox, AutoComplete, Cascader, DatePicker, InputNumber, Switch, TimePicker, Slider, Rate, Divider, Col, Tooltip, Form, FormItem, Modal } from "ant-design-vue";
 import { defineStore } from "pinia";
 import "ant-design-vue/es/radio/style";
@@ -92,7 +92,7 @@ const defaultThemeConf = {
   },
   routeReuse: {
     show: true,
-    cache: true,
+    cache: false,
     canDrag: true,
     showQuick: true,
     showRedo: true,
@@ -102,7 +102,7 @@ const defaultThemeConf = {
 const useThemeStore = defineStore({
   id: "dt-theme",
   state: () => ({
-    themeConf: DtCache.getLocal(CacheKey.THEME) ?? defaultThemeConf,
+    themeConf: DtCache.getLocal(CacheKey.THEME) ?? cloneDeep(defaultThemeConf),
     pageLoading: false,
     mixSiderHasSubMenu: false
   }),
@@ -137,14 +137,22 @@ const useThemeStore = defineStore({
     },
     setMixSiderIsHasMenu(val) {
       this.mixSiderHasSubMenu = val;
+    },
+    resetState() {
+      DtCache.removeLocal(CacheKey.THEME);
+      this.themeConf = cloneDeep(defaultThemeConf);
     }
   }
 });
+function handleGotoPage(router) {
+  const go = useGo(router);
+  go(unref(router.currentRoute).path, true);
+}
 defineStore({
   id: "route-reuse",
   state: () => ({
     cacheTabList: /* @__PURE__ */ new Set(),
-    tabList: DtCache.getLocal(CacheKey.THEME)?.routeReuse?.cache ? DtCache.getLocal(CacheKey.ROUTE_REUSE) || [] : [],
+    tabList: DtCache.getLocal(CacheKey.ROUTE_REUSE) || [],
     lastDragEndIndex: 0
   }),
   getters: {
@@ -180,9 +188,9 @@ defineStore({
       }
       this.updateCacheTab();
     },
-    closeTab(path, router) {
+    closeTab(route, router) {
       const go = useGo(router);
-      const index = this.tabList.findIndex((item) => item.path === path);
+      const index = this.tabList.findIndex((item) => item.path === route.path);
       let page;
       if (index === 0) {
         if (this.tabList.length !== 1) {
@@ -191,9 +199,9 @@ defineStore({
       } else {
         page = this.tabList[index - 1];
       }
-      this.bulkCloseTabs([path]);
+      this.bulkCloseTabs([route.path]);
       this.updateCacheTab();
-      path === router.currentRoute.value.path && go(page.path);
+      route.path === router.currentRoute.value.path && go(page.path);
     },
     closeAllTab(currentRoute, router) {
       const go = useGo(router);
@@ -203,8 +211,8 @@ defineStore({
       this.updateCacheTab();
       go(route.path);
     },
-    closeLeftTabs(path) {
-      const index = this.tabList.findIndex((item) => item.path === path);
+    closeLeftTabs(route, router) {
+      const index = this.tabList.findIndex((item) => item.path === route.path);
       if (index > 0) {
         const leftTabs = this.tabList.slice(0, index);
         const pathList = [];
@@ -217,9 +225,10 @@ defineStore({
         this.bulkCloseTabs(pathList);
       }
       this.updateCacheTab();
+      handleGotoPage(router);
     },
-    closeRightTabs(path) {
-      const index = this.tabList.findIndex((item) => item.path === path);
+    closeRightTabs(route, router) {
+      const index = this.tabList.findIndex((item) => item.path === route.path);
       if (index >= 0 && index < this.tabList.length - 1) {
         const rightTabs = this.tabList.slice(index + 1, this.tabList.length);
         const pathList = [];
@@ -232,24 +241,40 @@ defineStore({
         this.bulkCloseTabs(pathList);
       }
       this.updateCacheTab();
+      handleGotoPage(router);
     },
-    closeOtherTabs(path) {
+    closeOtherTabs(route, router) {
       const pathList = [];
       for (let item of this.tabList) {
         const affix = item?.meta?.affix ?? false;
-        if (item.path !== path && !affix) {
+        if (item.path !== route.path && !affix) {
           pathList.push(item.path);
         }
       }
       this.bulkCloseTabs(pathList);
       this.updateCacheTab();
+      handleGotoPage(router);
+    },
+    closeTabByKey(path, router) {
+      const go = useGo(router);
+      const index = this.tabList.findIndex((item) => item.path === path);
+      let page;
+      if (index === 0) {
+        if (this.tabList.length !== 1) {
+          page = this.tabList[index + 1];
+        }
+      } else {
+        page = this.tabList[index - 1];
+      }
+      this.bulkCloseTabs([path]);
+      this.updateCacheTab();
+      path === router.currentRoute.value.path && go(page.path);
     },
     bulkCloseTabs(pathList) {
       this.tabList = this.tabList.filter((item) => !pathList.includes(item.fullPath));
     },
     updateCacheTab() {
-      const cacheTab = DtCache.getLocal(CacheKey.THEME)?.routeReuse?.cache;
-      cacheTab && DtCache.setLocal(CacheKey.ROUTE_REUSE, this.tabList);
+      DtCache.setLocal(CacheKey.ROUTE_REUSE, this.tabList);
       const cacheMap = /* @__PURE__ */ new Set();
       for (const tab of this.tabList) {
         if (tab.meta?.hideTab) {
@@ -273,42 +298,46 @@ defineStore({
       this.tabList.splice(oldIndex, 1);
       this.tabList.splice(newIndex, 0, currentTab);
       this.lastDragEndIndex = this.lastDragEndIndex + 1;
+    },
+    resetState() {
+      this.tabList = [];
+      this.updateCacheTab();
     }
   }
 });
 function useMenu() {
-  const { getMenuConf, setThemeConf } = useThemeStore();
-  const getCollapsedShowTitle = computed(() => getMenuConf.collapsedShowTitle);
-  const getIsSidebarType = computed(() => getMenuConf.type === MenuType.SIDE);
-  const getMenuFixed = computed(() => getMenuConf.fixed);
-  const getShowMenu = computed(() => getMenuConf.show);
+  const { setThemeConf } = useThemeStore();
+  const getCollapsedShowTitle = computed(() => useThemeStore().getMenuConf.collapsedShowTitle);
+  const getIsSidebarType = computed(() => useThemeStore().getMenuConf.type === MenuType.SIDE);
+  const getMenuFixed = computed(() => useThemeStore().getMenuConf.fixed);
+  const getShowMenu = computed(() => useThemeStore().getMenuConf.show);
   const getShowSidebar = computed(() => {
     return unref(getSplit) || unref(getShowMenu) && unref(getMenuMode) !== MenuMode.HORIZONTAL;
   });
-  const getMenuHidden = computed(() => getMenuConf.hidden);
-  const getMenuTheme = computed(() => getMenuConf.theme);
-  const getTrigger = computed(() => getMenuConf.trigger);
-  const getCanDrag = computed(() => getMenuConf.canDrag);
+  const getMenuHidden = computed(() => useThemeStore().getMenuConf.hidden);
+  const getMenuTheme = computed(() => useThemeStore().getMenuConf.theme);
+  const getTrigger = computed(() => useThemeStore().getMenuConf.trigger);
+  const getCanDrag = computed(() => useThemeStore().getMenuConf.canDrag);
   const getIsMixMode = computed(() => {
     return unref(getMenuMode) === MenuMode.INLINE && unref(getMenuType) === MenuType.MIX;
   });
   const getIsMixSidebar = computed(() => unref(getMenuType) === MenuType.MIX_SIDEBAR);
   const getMenuWidth = computed(() => {
     if (unref(getIsMixMode)) {
-      return Number(getMenuConf.menuWidth) - 40;
+      return Number(useThemeStore().getMenuConf.menuWidth) - 40;
     } else if (unref(getIsMixSidebar)) {
-      return Number(getMenuConf.menuWidth) - 10;
+      return Number(useThemeStore().getMenuConf.menuWidth) - 10;
     } else {
-      return Number(getMenuConf.menuWidth);
+      return Number(useThemeStore().getMenuConf.menuWidth);
     }
   });
-  const getMixSideTrigger = computed(() => getMenuConf.mixSideTrigger);
-  const getLogoWidth = computed(() => unref(getIsMixSidebar) ? "80px" : getMenuConf.menuWidth);
-  const getMenuType = computed(() => getMenuConf.type);
+  const getMixSideTrigger = computed(() => useThemeStore().getMenuConf.mixSideTrigger);
+  const getLogoWidth = computed(() => unref(getIsMixSidebar) ? "80px" : useThemeStore().getMenuConf.menuWidth);
+  const getMenuType = computed(() => useThemeStore().getMenuConf.type);
   const getIsTopMenu = computed(() => unref(getMenuType) === MenuType.TOP_MENU);
-  const getMenuMode = computed(() => getMenuConf.mode);
-  const getSplit = computed(() => getMenuConf.split);
-  const getCollapsed = computed(() => getMenuConf.collapsed);
+  const getMenuMode = computed(() => useThemeStore().getMenuConf.mode);
+  const getSplit = computed(() => useThemeStore().getMenuConf.split);
+  const getCollapsed = computed(() => useThemeStore().getMenuConf.collapsed);
   const getIsHorizontal = computed(() => unref(getMenuMode) === MenuMode.HORIZONTAL);
   const setThemeStore = (conf = {}) => setThemeConf(conf);
   const toggleCollapsed = () => setThemeStore({
@@ -316,7 +345,7 @@ function useMenu() {
       collapsed: !unref(getCollapsed)
     }
   });
-  const getMiniWidthNumber = computed(() => getMenuConf.collapsedShowTitle ? 80 : 48);
+  const getMiniWidthNumber = computed(() => useThemeStore().getMenuConf.collapsedShowTitle ? 80 : 48);
   const getRealWidth = computed(() => {
     return unref(getCollapsed) ? unref(getMiniWidthNumber) : unref(getMenuWidth);
   });
@@ -410,7 +439,6 @@ function useHeader() {
   const getHeaderHeight = computed(() => {
     let height = 0;
     height += HEADER_HEIGHT;
-    console.log(getMultipleTabPosIsTop);
     if (unref(getShowMultipleTab) && !unref(getSplit) && !unref(getMultipleTabPosIsTop)) {
       height += TABS_HEIGHT;
     }
@@ -902,9 +930,15 @@ const _sfc_main$b = {
           _disabled = disabled(unref(getValues).model);
         return _disabled;
       });
+      const getSize = () => {
+        if (component === "Switch" && unref(getUiSize) === UiSize.LARGE) {
+          return "default";
+        }
+        return unref(getUiSize) === UiSize.MIDDLE ? "default" : unref(getUiSize);
+      };
       const itemProps = {
         allowClear: _sProps?.allowClear ?? appConf.ui.form.allowClear,
-        size: unref(getUiSize) === UiSize.MIDDLE ? "default" : unref(getUiSize),
+        size: getSize(),
         ...unref(getComponentProps),
         disabled: unref(getDisable)
       };
@@ -1609,10 +1643,7 @@ const BasicProps = {
   loading: {
     type: Object,
     default: () => {
-      return {
-        onSearch: ref(false),
-        onReset: ref(false)
-      };
+      return {};
     }
   },
   onSearch: {
@@ -2016,8 +2047,6 @@ function useModal(props, setModalData) {
   };
   watchEffect(() => {
     const data = dataTransfer[unref(uidRef)];
-    if (!data)
-      return;
     if (!setModalData || !isFunction(setModalData))
       return;
     nextTick(() => {
@@ -2136,7 +2165,6 @@ function useDragMove(context) {
       const screenHeight = document.documentElement.clientHeight;
       const dragDomWidth = dragDom.offsetWidth;
       const dragDomheight = dragDom.offsetHeight;
-      console.log(dragDomWidth, dragDomheight, screenHeight, screenWidth);
       const minDragDomLeft = dragDom.offsetLeft;
       const maxDragDomLeft = screenWidth - dragDom.offsetLeft - dragDomWidth;
       const minDragDomTop = dragDom.offsetTop;
@@ -2710,8 +2738,8 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       if (props.buttons && props.buttons.length)
         return props.buttons;
       let buttonActions = [
-        { 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" }
+        { t: "\u5173\u95ED", label: 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" }
       ];
       if (!props.showSave)
         buttonActions = buttonActions.filter((btn) => btn.flag !== "OK");
@@ -3007,7 +3035,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         "formProps",
         "schemas"
       ]),
-      destroyOnClose: true
+      destroyOnClose: true,
+      maskClosable: false
     });
     function handleSave() {
       props?.onSave();
@@ -3061,13 +3090,11 @@ function useCurd(curdOpt) {
       }, null)]
     })]));
   };
-  function add() {
+  function openAddDialog() {
     title.value = t("ADD") + " - " + oriTitle;
     openModal();
   }
-  function del({
-    row
-  }) {
+  function del(row) {
     const {
       primaryKey = "id",
       onDeletes
@@ -3076,9 +3103,7 @@ function useCurd(curdOpt) {
       onDeletes([row[primaryKey]]);
     }
   }
-  function update({
-    row
-  }) {
+  function openUpdateDialog(row) {
     const {
       primaryKey = "id",
       onQueryById
@@ -3116,9 +3141,9 @@ function useCurd(curdOpt) {
     }
   }
   const instance = {
-    add,
+    openAddDialog,
     del,
-    update,
+    openUpdateDialog,
     dels,
     closeModal,
     setModalProps,

package/es/components/curd/src/components/Curd.d.ts

@@ -124,10 +124,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
                 type: import("vue").PropType<{
                     [key: string]: import("vue").Ref<boolean>;
                 }>;
-                default: () => {
-                    onSearch: import("vue").Ref<boolean>;
-                    onReset: import("vue").Ref<boolean>;
-                };
+                default: () => {};
             };
             onSearch: {
                 type: import("vue").PropType<(params: import("@dt-frames/core").Recordable<any>) => void>;
@@ -1172,10 +1169,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
                 type: import("vue").PropType<{
                     [key: string]: import("vue").Ref<boolean>;
                 }>;
-                default: () => {
-                    onSearch: import("vue").Ref<boolean>;
-                    onReset: import("vue").Ref<boolean>;
-                };
+                default: () => {};
             };
             onSearch: {
                 type: import("vue").PropType<(params: import("@dt-frames/core").Recordable<any>) => void>;

package/es/components/curd/src/hooks/useCurd.d.ts

@@ -2,9 +2,9 @@ import { Recordable } from "@dt-frames/core";
 import { ExtractPropTypes, PropType } from "vue";
 import { basicProps } from "../props";
 export declare function useCurd(curdOpt: Partial<ExtractPropTypes<typeof basicProps>>): {
-    add: () => void;
-    del: ({ row }: Recordable) => void;
-    update: ({ row }: Recordable) => void;
+    openAddDialog: () => void;
+    del: (row: Recordable) => void;
+    openUpdateDialog: (row: Recordable) => void;
     dels: (ids?: PropType<String | Number>[]) => void;
     closeModal: () => void;
     setModalProps: (props: Partial<ExtractPropTypes<{

package/es/components/curd/src/props.d.ts

@@ -129,10 +129,7 @@ export declare const basicProps: {
                 type: PropType<{
                     [key: string]: Ref<boolean>;
                 }>;
-                default: () => {
-                    onSearch: Ref<boolean>;
-                    onReset: Ref<boolean>;
-                };
+                default: () => {};
             };
             onSearch: {
                 type: PropType<(params: import("@dt-frames/core").Recordable<any>) => void>;

package/es/components/curd/src/types/curd.type.d.ts

@@ -3,16 +3,10 @@ import { basicProps } from '../../../modal/src/props';
 import { Recordable } from "@dt-frames/core";
 import { ExtractPropTypes, PropType } from "vue";
 export declare type CurdActionType = {
-    add: () => void;
-    del: (params: {
-        row: Recordable;
-        index: Number;
-    }) => void;
+    openAddDialog: () => void;
+    del: (row: Recordable) => void;
     dels: (ids: PropType<String | Number>[]) => void;
-    update: (params: {
-        row: Recordable;
-        index: Number;
-    }) => void;
+    openUpdateDialog: (row: Recordable) => void;
     closeModal: () => void;
     setModalProps: (props: Partial<ExtractPropTypes<typeof basicProps>>) => void;
     curdFormMethods: FormActionType;