@dt-frames/ui 1.0.25 → 1.0.27

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

@@ -208,6 +208,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         }>>;
         setFormModel: (key: string, value: any) => void;
         handleMethod: (params: boolean | import("@dt-frames/core").ButtonProps) => void;
+        handleEnterPress: () => void;
         getActionsProps: import("vue").ComputedRef<Recordable<any>>;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("register" | "reset")[], "register" | "reset", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         mode: {

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

@@ -117,6 +117,7 @@ declare const _default: import("vue").DefineComponent<{
     }>>;
     setFormModel: (key: string, value: any) => void;
     handleMethod: (params: boolean | ButtonProps) => void;
+    handleEnterPress: () => void;
     getActionsProps: import("vue").ComputedRef<Recordable<any>>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("register" | "reset")[], "register" | "reset", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     mode: {

package/es/index.js

@@ -1,4 +1,4 @@
-import { defineComponent, resolveComponent, openBlock, createBlock, computed, unref, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, ref, watch, Fragment, renderList, createTextVNode, toDisplayString, KeepAlive, createVNode, withCtx, reactive, toRaw, getCurrentInstance, watchEffect, nextTick, toRefs, isVNode, inject, onUnmounted, h, provide, onMounted, onBeforeUnmount, resolveDynamicComponent, renderSlot, createCommentVNode, mergeProps, readonly, isRef, useAttrs as useAttrs$1, normalizeProps, guardReactiveProps, withDirectives, resolveDirective, render, createSlots, useSlots as useSlots$1, withModifiers, vShow, toRef, Transition } from "vue";
+import { defineComponent, resolveComponent, openBlock, createBlock, computed, unref, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, ref, watch, Fragment, renderList, createTextVNode, toDisplayString, KeepAlive, createVNode, withCtx, reactive, toRaw, getCurrentInstance, watchEffect, nextTick, toRefs, isVNode, inject, onUnmounted, h, provide, onMounted, onBeforeUnmount, resolveDynamicComponent, renderSlot, createCommentVNode, mergeProps, readonly, isRef, useAttrs as useAttrs$1, normalizeProps, guardReactiveProps, withDirectives, resolveDirective, render, withKeys, createSlots, useSlots as useSlots$1, withModifiers, vShow, toRef, Transition } from "vue";
 import { isString, isArray as isArray$1, isObject, isFunction, error, useTimeoutFn, useAttrs, useSlots, dispatchResize, BAR_MAP, off, renderThumbStyle, on, useAppStore, addResizeListener, removeResizeListener, windowResizeFn, isNumber, isBoolean, isNull, DtCache, CacheKey, deepMerge, http, getDynamicProps, getDictValueByCode, formatNumber, isVnode, getPopupContainer, isNullAndUnDef, useMessage, isEmpty, useTheme, useMenu, useHeader, useGo, Pages, localeList, changeLocale, Theme, MenuMode, MenuType, useThemeStore, ContentMode, useMultipleTab, copyText, MenuSplitTye, isUrl, openWindow, RouteReuseStore, menuList2Map, useApp } from "@dt-frames/core";
 import { InputSearch, Tooltip, Modal as Modal$1, RadioGroup, RadioButton, InputGroup, Input, Button, Select, TreeSelect, Radio, Checkbox, AutoComplete, Cascader, DatePicker, InputNumber, Switch, TimePicker, Slider, Rate, Divider, Col, Form, FormItem, Row, Popover, Spin, Dropdown, Menu, MenuItem, CheckboxGroup, Table, Upload, Image, MenuDivider, Tree, Empty, BackTop, Breadcrumb, Avatar, Drawer, SubMenu, LayoutHeader, LayoutSider, Tabs, TabPane, LayoutFooter, LayoutContent, ConfigProvider, Layout } from "ant-design-vue";
 import { isEqual, omit, cloneDeep, upperFirst, set, uniqBy, difference, get, trim } from "lodash-es";
@@ -2034,22 +2034,21 @@ function useModalOut() {
       (_a = getInstance()) == null ? void 0 : _a.setModalProps({
         visible: true
       });
-      const { data, afterClose } = params || {};
+      const { data = null, afterClose } = params || {};
       const id = unref(uid);
       cbTransfer[unref(uid)] = (rsp) => {
         if (afterClose && isFunction(afterClose)) {
           afterClose(rsp);
         }
       };
-      if (!data)
-        return;
+      let dataToRaw = isObject(data) ? { ...toRaw(data) } : data;
       if (openOnSet) {
-        dataTransfer[id] = { ...toRaw(data) };
+        dataTransfer[id] = dataToRaw;
         return;
       }
-      const equal = isEqual(toRaw(dataTransfer[id]), toRaw(data));
+      const equal = isEqual(toRaw(dataTransfer[id]), dataToRaw);
       if (!equal) {
-        dataTransfer[id] = toRaw(data);
+        dataTransfer[id] = dataToRaw;
       }
     },
     closeModal: () => {
@@ -3101,7 +3100,7 @@ var _sfc_main$Q = defineComponent({
           default: () => [createVNode("div", {
             "style": "display:flex"
           }, [createVNode("div", {
-            "style": "flex:1;"
+            "style": "flex:1; width: 100%;"
           }, [getContent()]), !!suffix && createVNode("span", {
             "class": "suffix"
           }, [getSuffix()])])]
@@ -3188,19 +3187,12 @@ var _sfc_main$Q = defineComponent({
           disabled = dynamicDisabled(unref(getValues));
         return disabled;
       });
-      const {
-        enterToSearch = appConf.ui.form.enterToSearch,
-        onSearch,
-        mode
-      } = props.formProps;
       const itemProps = {
         allowClear: appConf.ui.form.allowClear,
         getPopupContainer: (trigger) => trigger.parentNode,
         size: size || appConf.ui.form.size,
         ...unref(getComponentProps),
-        disabled: unref(getDisable),
-        onPressEnter: mode === "search" && enterToSearch ? onSearch : () => {
-        }
+        disabled: unref(getDisable)
       };
       if (!itemProps.disabled && component !== "RangePicker") {
         itemProps.placeholder = ((_a = unref(getComponentProps)) == null ? void 0 : _a.placeholder) || createPlaceholder(component);
@@ -3466,6 +3458,7 @@ function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_FormItem = resolveComponent("FormItem");
   const _component_Col = resolveComponent("Col");
   const _directive_icon = resolveDirective("icon");
+  const _directive_auth = resolveDirective("auth");
   return _ctx.show ? (openBlock(), createBlock(_component_Col, normalizeProps(mergeProps({ key: 0 }, _ctx.colOpt)), {
     default: withCtx(() => [
       createVNode(_component_FormItem, {
@@ -3477,12 +3470,11 @@ function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) {
         default: withCtx(() => [
           (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.buttonList, (button) => {
             return openBlock(), createElementBlock(Fragment, null, [
-              (button.show === void 0 ? true : button.show) ? (openBlock(), createBlock(_component_Button, {
+              (button.show === void 0 ? true : button.show) ? withDirectives((openBlock(), createBlock(_component_Button, {
                 key: 0,
                 type: button.type,
                 class: normalizeClass(button.class),
                 disabled: button.disabled,
-                permission: button.auth,
                 loading: button.loading,
                 onClick: ($event) => _ctx.handleBtnClick(button)
               }, {
@@ -3498,7 +3490,9 @@ function _sfc_render$5(_ctx, _cache, $props, $setup, $data, $options) {
                   ]) : createCommentVNode("", true)
                 ]),
                 _: 2
-              }, 1032, ["type", "class", "disabled", "permission", "loading", "onClick"])) : createCommentVNode("", true)
+              }, 1032, ["type", "class", "disabled", "loading", "onClick"])), [
+                [_directive_auth, button.auth]
+              ]) : createCommentVNode("", true)
             ], 64);
           }), 256)),
           _ctx.showAdvanceRef ? (openBlock(), createBlock(_component_Button, {
@@ -3968,6 +3962,11 @@ const _sfc_main$O = defineComponent({
         });
       }
     }
+    function handleEnterPress() {
+      if (appConf.ui.form.enterToSearch && unref(getProps).mode === "search") {
+        handleMethod(SEARCH_BTNS.filter((it) => it.name === SEARCH_BTN_NAME)[0]);
+      }
+    }
     const {
       updateSchema,
       resetSchema,
@@ -4079,6 +4078,7 @@ const _sfc_main$O = defineComponent({
       props,
       setFormModel,
       handleMethod,
+      handleEnterPress,
       getActionsProps
     };
   }
@@ -4092,7 +4092,8 @@ function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) {
     ref: "formElRef",
     class: _ctx.getFormClass,
     model: _ctx.formModel,
-    layout: _ctx.getLayout
+    layout: _ctx.getLayout,
+    onKeypress: withKeys(_ctx.handleEnterPress, ["enter"])
   }), {
     default: withCtx(() => [
       createVNode(_component_Row, normalizeProps(guardReactiveProps(_ctx.getProps.rowProps)), {
@@ -4126,7 +4127,7 @@ function _sfc_render$4(_ctx, _cache, $props, $setup, $data, $options) {
       }, 16)
     ]),
     _: 3
-  }, 16, ["class", "model", "layout"]);
+  }, 16, ["class", "model", "layout", "onKeypress"]);
 }
 var DtForm = /* @__PURE__ */ _export_sfc(_sfc_main$O, [["render", _sfc_render$4]]);
 function useForm(props) {
@@ -4774,7 +4775,7 @@ function usePagination(props) {
       pageSize: defaultPageSize,
       size: size === "small" ? "small" : "default",
       defaultPageSize,
-      showTotal: (total, range) => `\u603B\u5171${Math.ceil(total / unref(props).pagination.pageSize)}\u9875`,
+      showTotal: (total, range) => `\u603B\u5171${total}\u6761`,
       showSizeChanger: true,
       pageSizeOptions,
       showQuickJumper: true,
@@ -5358,6 +5359,7 @@ const _sfc_main$I = /* @__PURE__ */ defineComponent({
     }
     return (_ctx, _cache) => {
       const _directive_icon = resolveDirective("icon");
+      const _directive_auth = resolveDirective("auth");
       return props.expand ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(props.btns, (item) => {
         return openBlock(), createElementBlock("span", _hoisted_1$s, [
           item.ifShow ? (openBlock(), createBlock(unref(Tooltip), {
@@ -5387,7 +5389,7 @@ const _sfc_main$I = /* @__PURE__ */ defineComponent({
           createVNode(unref(Menu), { class: "dt-action-select" }, {
             default: withCtx(() => [
               (openBlock(true), createElementBlock(Fragment, null, renderList(props.btns, (item) => {
-                return openBlock(), createElementBlock(Fragment, null, [
+                return withDirectives((openBlock(), createElementBlock("span", null, [
                   item.ifShow ? (openBlock(), createBlock(unref(MenuItem), {
                     key: 0,
                     onClick: ($event) => handleAction(item)
@@ -5402,7 +5404,9 @@ const _sfc_main$I = /* @__PURE__ */ defineComponent({
                     ]),
                     _: 2
                   }, 1032, ["onClick"])) : createCommentVNode("", true)
-                ], 64);
+                ])), [
+                  [_directive_auth, item.auth]
+                ]);
               }), 256))
             ]),
             _: 1
@@ -7197,6 +7201,7 @@ function useCurd(curdOpt) {
     }), null)]));
   };
   function add() {
+    curdOpt.title = `\u65B0\u589E${curdOpt.title}`;
     formsVal.value = null;
     openModal();
   }
@@ -7227,6 +7232,7 @@ function useCurd(curdOpt) {
       primaryKey = "id",
       curd
     } = curdOpt;
+    curdOpt.title = `\u7F16\u8F91${curdOpt.title}`;
     curd.onQueryById(row[primaryKey]).then((rsp) => {
       formsVal.value = rsp;
       nextTick(() => dispatchResize());
@@ -9787,13 +9793,14 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
   __name: "menu-item-content",
   props: contentProps,
   setup(__props) {
+    const { getIsZH } = useHeader();
     return (_ctx, _cache) => {
       const _directive_icon = resolveDirective("icon");
       return openBlock(), createElementBlock("span", _hoisted_1$4, [
         withDirectives(createElementVNode("span", _hoisted_2$2, null, 512), [
           [_directive_icon, _ctx.item.icon]
         ]),
-        createTextVNode(" " + toDisplayString(_ctx.item.label), 1)
+        createTextVNode(" " + toDisplayString(unref(getIsZH) ? _ctx.item.label : _ctx.item.enLabel), 1)
       ]);
     };
   }
@@ -10208,10 +10215,10 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
 const _sfc_main$8 = /* @__PURE__ */ defineComponent({
   __name: "drag-bar",
   setup(__props) {
-    const { getMiniWidthNumber, getCollapsed, getCanDrag } = useMenu();
+    const { getCollapsed, getCanDrag, getMenuWidth } = useMenu();
     const getDragBarStyle = computed(() => {
-      if (unref(getCollapsed)) {
-        return { left: `${unref(getMiniWidthNumber)}px` };
+      if (!unref(getCollapsed)) {
+        return { left: `${unref(getMenuWidth)}px` };
       }
       return {};
     });

package/es/theme/sider/components/basic-menu/basic-menu-item.d.ts

@@ -85,6 +85,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         }>> & {
             [x: string & `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any);
         }>>;
+        getIsZH: import("vue").ComputedRef<boolean>;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         item: {
             type: ObjectConstructor;

package/es/theme/sider/components/basic-menu/basic-menu.d.ts

@@ -626,6 +626,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
                 }>> & {
                     [x: string & `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any);
                 }>>;
+                getIsZH: import("vue").ComputedRef<boolean>;
             }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
                 item: {
                     type: ObjectConstructor;
@@ -679,6 +680,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
             }>> & {
                 [x: string & `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any);
             }>>;
+            getIsZH: import("vue").ComputedRef<boolean>;
         }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
             item: {
                 type: ObjectConstructor;

package/es/theme/sider/components/basic-menu/basic-sub-menu-item.d.ts

@@ -161,6 +161,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
             }>> & {
                 [x: string & `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any);
             }>>;
+            getIsZH: import("vue").ComputedRef<boolean>;
         }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
             item: {
                 type: ObjectConstructor;
@@ -214,6 +215,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         }>> & {
             [x: string & `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any);
         }>>;
+        getIsZH: import("vue").ComputedRef<boolean>;
     }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         item: {
             type: ObjectConstructor;

package/es/theme/sider/components/basic-menu/menu-item-content.d.ts

@@ -18,6 +18,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     }>> & {
         [x: string & `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any);
     }>>;
+    getIsZH: import("vue").ComputedRef<boolean>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     item: {
         type: ObjectConstructor;

package/es/theme/sider/components/drag-bar.d.ts

@@ -1,7 +1,7 @@
 declare const _sfc_main: import("vue").DefineComponent<{}, {
-    getMiniWidthNumber: import("vue").ComputedRef<48 | 80>;
     getCollapsed: import("vue").ComputedRef<boolean>;
     getCanDrag: import("vue").ComputedRef<boolean>;
+    getMenuWidth: import("vue").ComputedRef<string | number>;
     getDragBarStyle: import("vue").ComputedRef<{
         left: string;
     } | {

package/es/theme/sider/index.d.ts

@@ -136,9 +136,9 @@ declare const _sfc_main: import("vue").DefineComponent<{}, {
         isHorizontal: boolean;
     }>;
     DragBar: import("vue").DefineComponent<{}, {
-        getMiniWidthNumber: import("vue").ComputedRef<48 | 80>;
         getCollapsed: import("vue").ComputedRef<boolean>;
         getCanDrag: import("vue").ComputedRef<boolean>;
+        getMenuWidth: import("vue").ComputedRef<string | number>;
         getDragBarStyle: import("vue").ComputedRef<{
             left: string;
         } | {

package/es/theme/sider/index.less

@@ -131,6 +131,7 @@
         margin-right: 12px;
         height: 40px !important;
         width: 28px;
+        flex: 0 0 28px;
         text-align: center;
     }
 
@@ -182,9 +183,8 @@
 }
 
 .dt-darg-bar{
-    position: absolute;
+    position: fixed;
     top: 0;
-    right: 0;
     z-index: @side-drag-z-index;
     width: 2px;
     height: 100%;

package/es/theme/theme.less

@@ -65,3 +65,7 @@
     }
 }
 
+.ant-menu-dark .ant-menu-submenu-title:focus-visible {
+    box-shadow: none;
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dt-frames/ui",
-	"version": "1.0.25",
+	"version": "1.0.27",
 	"keywords": [
 		"ui",
 		"dt-ui"