@dt-frames/ui 2.0.4 → 2.0.6

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 as Modal$1 } from "ant-design-vue";
 import { defineStore } from "pinia";
 import "ant-design-vue/es/radio/style";
@@ -29,6 +29,7 @@ var MenuType = /* @__PURE__ */ ((MenuType2) => {
   MenuType2["SIDE"] = "sidebar";
   MenuType2["TOP_MENU"] = "top-menu";
   MenuType2["MIX"] = "mix";
+  MenuType2["MIX_SIDEBAR"] = "mix-sidebar";
   return MenuType2;
 })(MenuType || {});
 var MenuMode = /* @__PURE__ */ ((MenuMode2) => {
@@ -49,6 +50,7 @@ var UiSize = /* @__PURE__ */ ((UiSize2) => {
   return UiSize2;
 })(UiSize || {});
 const defaultThemeConf = {
+  cache: false,
   content: {
     contentMode: ContentMode.FULL
   },
@@ -80,7 +82,8 @@ const defaultThemeConf = {
     menuWidth: 240,
     trigger: true,
     type: MenuType.SIDE,
-    mode: MenuMode.INLINE
+    mode: MenuMode.INLINE,
+    mixSideTrigger: "hover"
   },
   footerOptions: {
     show: false,
@@ -90,7 +93,7 @@ const defaultThemeConf = {
   },
   routeReuse: {
     show: true,
-    cache: true,
+    cache: false,
     canDrag: true,
     showQuick: true,
     showRedo: true,
@@ -100,8 +103,9 @@ const defaultThemeConf = {
 const useThemeStore = defineStore({
   id: "dt-theme",
   state: () => ({
-    themeConf: DtCache.getLocal(CacheKey.THEME) ?? defaultThemeConf,
-    pageLoading: false
+    themeConf: DtCache.getLocal(CacheKey.THEME) ?? cloneDeep(defaultThemeConf),
+    pageLoading: false,
+    mixSiderHasSubMenu: false
   }),
   getters: {
     getThemeConf() {
@@ -121,16 +125,29 @@ const useThemeStore = defineStore({
     },
     getPageLoading() {
       return this.pageLoading;
+    },
+    getMixSiderIsHasMenu() {
+      return this.mixSiderHasSubMenu;
     }
   },
   actions: {
     setThemeConf(options = {}) {
-      let newThemeConf = deepMerge(this.themeConf, options);
-      this.themeConf = deepMerge(defaultThemeConf, newThemeConf);
+      this.themeConf = deepMerge(this.themeConf, options);
       DtCache.setLocal(CacheKey.THEME, this.themeConf);
+    },
+    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: () => ({
@@ -171,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) {
@@ -182,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);
@@ -194,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 = [];
@@ -208,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 = [];
@@ -223,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) {
@@ -264,32 +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 getMenuWidth = computed(() => unref(getIsMixMode) ? Number(getMenuConf.menuWidth) - 40 : getMenuConf.menuWidth);
-  const getLogoWidth = computed(() => getMenuConf.menuWidth);
-  const getMenuType = computed(() => getMenuConf.type);
+  const getIsMixSidebar = computed(() => unref(getMenuType) === MenuType.MIX_SIDEBAR);
+  const getMenuWidth = computed(() => {
+    if (unref(getIsMixMode)) {
+      return Number(useThemeStore().getMenuConf.menuWidth) - 40;
+    } else if (unref(getIsMixSidebar)) {
+      return Number(useThemeStore().getMenuConf.menuWidth) - 10;
+    } else {
+      return Number(useThemeStore().getMenuConf.menuWidth);
+    }
+  });
+  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({
@@ -297,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);
   });
@@ -326,7 +374,9 @@ function useMenu() {
     getRealWidth,
     getCalcContentWidth,
     getIsMixMode,
+    getIsMixSidebar,
     getCanDrag,
+    getMixSideTrigger,
     toggleCollapsed,
     setThemeStore
   };
@@ -335,12 +385,14 @@ function useMultipleTab() {
   const { getRouteReuseConf } = useThemeStore();
   const getShowMultipleTab = computed(() => getRouteReuseConf.show);
   const getShowQuick = computed(() => getRouteReuseConf.showQuick);
+  const getMultipleTabPosIsTop = computed(() => getRouteReuseConf.position === "top");
   const getShowRedo = computed(() => getRouteReuseConf.showRedo);
   const getCanCache = computed(() => getRouteReuseConf.cache);
   const getCanDrag = computed(() => getRouteReuseConf.canDrag);
   return {
     getShowMultipleTab,
     getShowQuick,
+    getMultipleTabPosIsTop,
     getShowRedo,
     getCanCache,
     getCanDrag
@@ -359,12 +411,12 @@ function useHeader() {
     getMenuMode,
     getSplit,
     getIsTopMenu,
-    getIsMixMode
+    getIsMixSidebar
   } = useMenu();
-  const { getShowMultipleTab } = useMultipleTab();
+  const { getShowMultipleTab, getMultipleTabPosIsTop } = useMultipleTab();
   const getHeaderTheme = computed(() => getHeaderConf.theme);
   const getFixed = computed(() => getHeaderConf.fixed);
-  const getShowHeaderLogo = computed(() => unref(getShowLogo) && !unref(getIsSidebarType));
+  const getShowHeaderLogo = computed(() => unref(getShowLogo) && !unref(getIsSidebarType) && !unref(getIsMixSidebar));
   const getShowSearch = computed(() => getHeaderConf.showSearch);
   const getShowHeaderTrigger = computed(() => {
     if (unref(getMenuType) === MenuType.TOP_MENU || !unref(getShowMenu) || unref(getMenuHidden)) {
@@ -382,19 +434,19 @@ function useHeader() {
   const getShowLocale = computed(() => getHeaderConf.showLocaleSwitch);
   const getShowSettingTheme = computed(() => getHeaderConf.showSettingTheme);
   const getShowFullHeaderRef = computed(() => {
-    return !unref(getIsSidebarType) && !unref(getIsTopMenu);
+    return !unref(getIsSidebarType) && !unref(getIsMixSidebar) && !unref(getIsTopMenu);
   });
   const getHeaderHeight = computed(() => {
     let height = 0;
     height += HEADER_HEIGHT;
-    if (unref(getShowMultipleTab) && !unref(getSplit)) {
+    if (unref(getShowMultipleTab) && !unref(getSplit) && !unref(getMultipleTabPosIsTop)) {
       height += TABS_HEIGHT;
     }
     return height;
   });
   const getTabsHeight = computed(() => TABS_HEIGHT);
   const getShowInsetHeaderRef = computed(() => {
-    return unref(getIsSidebarType) || unref(getIsTopMenu);
+    return unref(getIsSidebarType) || unref(getIsTopMenu) || unref(getIsMixSidebar);
   });
   const getShowBackToTop = computed(() => getHeaderConf.showBackToTop);
   const getIsZH = computed(() => {
@@ -1139,8 +1191,8 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
               (openBlock(true), createElementBlock(Fragment, null, renderList(__props.buttonList, (button) => {
                 return openBlock(), createElementBlock(Fragment, null, [
                   (button.show === void 0 ? true : button.show) ? withDirectives((openBlock(), createBlock(_component_AButton, {
+                    class: normalizeClass(["items-center", button.class]),
                     type: button.type,
-                    class: normalizeClass(button.class),
                     loading: button.loading,
                     disabled: button.disabled,
                     key: unref(key),
@@ -1152,7 +1204,7 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
                       ]) : createCommentVNode("v-if", 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("v-if", true)
@@ -1191,8 +1243,8 @@ const DtFormButtons = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__file", "D:/d
 const SEARCH_BTN_NAME = "UI.SEARCH";
 const RESET_BTN_NAME = "UI.RESET";
 const SEARCH_BTNS = [
-  { name: SEARCH_BTN_NAME, preIcon: "mdi:magnify", type: "primary" },
-  { name: RESET_BTN_NAME, preIcon: "mdi:refresh", type: "default" }
+  { label: SEARCH_BTN_NAME, preIcon: "mdi:magnify", type: "primary" },
+  { label: RESET_BTN_NAME, preIcon: "mdi:refresh", type: "default" }
 ];
 function useFormEvents({
   emits,
@@ -1478,22 +1530,29 @@ function useFormActions(opt) {
   const { getProps, defaultValue, updateSchema, getFormValues, setFormValues } = opt;
   const { appConf } = useAppStore();
   function handleAdvanced(isAdvanced) {
-    const { schemas, minShowColumn = appConf.ui.form?.minShowColumn || 2 } = unref(getProps);
-    let schema = schemas.reduce((t, it, index) => {
-      if (index > minShowColumn - 1)
-        it.isAdvanced = isAdvanced;
-      t.push(it);
-      return t;
-    }, []);
+    const {
+      schemas,
+      minShowColumn = appConf.ui.form?.minShowColumn || 2,
+      showAdvancedButton = true
+    } = unref(getProps);
+    let schema = [...schemas];
+    if (showAdvancedButton) {
+      schema = schemas.reduce((t, it, index) => {
+        if (index > minShowColumn - 1)
+          it.isAdvanced = isAdvanced;
+        t.push(it);
+        return t;
+      }, []);
+    }
     updateSchema(schema);
   }
   function handleMethod(params) {
     const { onSearch, onReset } = unref(getProps);
     if (isBoolean(params)) {
       handleAdvanced(params);
-    } else if (params.name === SEARCH_BTN_NAME) {
+    } else if (params.label === SEARCH_BTN_NAME) {
       onSearch(getFormValues());
-    } else if (params.name === RESET_BTN_NAME) {
+    } else if (params.label === RESET_BTN_NAME) {
       setFormValues(toRaw(defaultValue.value));
       onReset(getFormValues());
     } else {
@@ -1567,10 +1626,6 @@ const BasicProps = {
     type: Boolean,
     default: true
   },
-  alwaysShowLines: {
-    type: Boolean,
-    default: false
-  },
   minShowColumn: {
     type: Number,
     default: 2
@@ -2122,7 +2177,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;
@@ -2702,8 +2756,8 @@ const _sfc_main$2 = /* @__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");
@@ -3001,7 +3055,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         "formProps",
         "schemas"
       ]),
-      destroyOnClose: true
+      destroyOnClose: true,
+      maskClosable: false
     });
     function handleSave() {
       props?.onSave();

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

@@ -100,10 +100,6 @@ declare const _sfc_main: import("vue").DefineComponent<{
                 type: BooleanConstructor;
                 default: boolean;
             };
-            alwaysShowLines: {
-                type: BooleanConstructor;
-                default: boolean;
-            };
             minShowColumn: {
                 type: NumberConstructor;
                 default: number;
@@ -1152,10 +1148,6 @@ declare const _sfc_main: import("vue").DefineComponent<{
                 type: BooleanConstructor;
                 default: boolean;
             };
-            alwaysShowLines: {
-                type: BooleanConstructor;
-                default: boolean;
-            };
             minShowColumn: {
                 type: NumberConstructor;
                 default: number;

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

@@ -105,10 +105,6 @@ export declare const basicProps: {
                 type: BooleanConstructor;
                 default: boolean;
             };
-            alwaysShowLines: {
-                type: BooleanConstructor;
-                default: boolean;
-            };
             minShowColumn: {
                 type: NumberConstructor;
                 default: number;