@dt-frames/ui 2.0.6 → 2.0.8

package/es/components/curd/index.js

@@ -4,7 +4,7 @@ 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 { 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 { 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";
 import "ant-design-vue/es/cascader/style";
@@ -50,7 +50,6 @@ var UiSize = /* @__PURE__ */ ((UiSize2) => {
   return UiSize2;
 })(UiSize || {});
 const defaultThemeConf = {
-  cache: false,
   content: {
     contentMode: ContentMode.FULL
   },
@@ -132,7 +131,8 @@ const useThemeStore = defineStore({
   },
   actions: {
     setThemeConf(options = {}) {
-      this.themeConf = deepMerge(this.themeConf, options);
+      let newThemeConf = deepMerge(this.themeConf, options);
+      this.themeConf = deepMerge(defaultThemeConf, newThemeConf);
       DtCache.setLocal(CacheKey.THEME, this.themeConf);
     },
     setMixSiderIsHasMenu(val) {
@@ -152,7 +152,7 @@ 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: {
@@ -633,14 +633,6 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _export_sfc = (sfc, props) => {
-  const target = sfc.__vccOpts || sfc;
-  for (const [key, val] of props) {
-    target[key] = val;
-  }
-  return target;
-};
-const RadioButtonGroup = /* @__PURE__ */ _export_sfc(_sfc_main$d, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/form/src/components/radioButton.vue"]]);
 const _hoisted_1$2 = { class: "input-with-dialog" };
 const _sfc_main$c = /* @__PURE__ */ defineComponent({
   __name: "formInputUseDialog",
@@ -676,15 +668,14 @@ const _sfc_main$c = /* @__PURE__ */ defineComponent({
           key: 0,
           class: "i mdi:close-circle",
           onClick: clearProps
-        })) : createCommentVNode("v-if", true)
+        })) : createCommentVNode("", true)
       ]);
     };
   }
 });
-const DtFormInputDialog = /* @__PURE__ */ _export_sfc(_sfc_main$c, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/form/src/components/formInputUseDialog.vue"]]);
 const components = {
   Input,
-  InputWithDialog: DtFormInputDialog,
+  InputWithDialog: _sfc_main$c,
   InputTextArea: Input.TextArea,
   InputSearch: Input.Search,
   InputGroup: Input.Group,
@@ -693,7 +684,7 @@ const components = {
   TreeSelect,
   Radio,
   RadioGroup: Radio.Group,
-  RadioButtonGroup,
+  RadioButtonGroup: _sfc_main$d,
   Checkbox,
   CheckboxGroup: Checkbox.Group,
   AutoComplete,
@@ -939,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)
       };
@@ -1078,7 +1075,6 @@ const _sfc_main$b = {
     };
   }
 };
-const DtFormItem = /* @__PURE__ */ _export_sfc(_sfc_main$b, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/form/src/components/FormItem.vue"]]);
 const _hoisted_1$1 = {
   key: 0,
   className: "preIcon pr-1"
@@ -1201,18 +1197,18 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
                     icon: withCtx(() => [
                       button.preIcon ? withDirectives((openBlock(), createElementBlock("span", _hoisted_1$1, null, 512)), [
                         [_directive_icon, button.preIcon]
-                      ]) : createCommentVNode("v-if", true)
+                      ]) : createCommentVNode("", true)
                     ]),
                     default: withCtx(() => [
                       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)
+                      ]) : createCommentVNode("", true)
                     ]),
                     _: 2
                   }, 1032, ["type", "class", "loading", "disabled", "onClick"])), [
                     [_directive_auth, button.auth]
-                  ]) : createCommentVNode("v-if", true)
+                  ]) : createCommentVNode("", true)
                 ], 64);
               }), 256)),
               unref(showAdvanceRef) ? (openBlock(), createBlock(_component_AButton, {
@@ -1222,24 +1218,22 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
                 onClick: toggleAdvanced
               }, {
                 default: withCtx(() => [
-                  createCommentVNode(" \u6536\u8D77 | \u5C55\u5F00 "),
                   createElementVNode("span", _hoisted_3, toDisplayString(advancedRef.value ? unref(t)("UI.ADVANCED") : unref(t)("UI.EXPAND")), 1),
                   createElementVNode("span", {
                     class: normalizeClass(unref(getAdvanceClass))
                   }, _hoisted_5, 2)
                 ]),
                 _: 1
-              })) : createCommentVNode("v-if", true)
+              })) : createCommentVNode("", true)
             ]),
             _: 1
           }, 8, ["style"])
         ]),
         _: 1
-      }, 16)) : createCommentVNode("v-if", true);
+      }, 16)) : createCommentVNode("", true);
     };
   }
 });
-const DtFormButtons = /* @__PURE__ */ _export_sfc(_sfc_main$a, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/form/src/components/FormButtons.vue"]]);
 const SEARCH_BTN_NAME = "UI.SEARCH";
 const RESET_BTN_NAME = "UI.RESET";
 const SEARCH_BTNS = [
@@ -1649,10 +1643,7 @@ const BasicProps = {
   loading: {
     type: Object,
     default: () => {
-      return {
-        onSearch: ref(false),
-        onReset: ref(false)
-      };
+      return {};
     }
   },
   onSearch: {
@@ -1863,7 +1854,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
           } }), {
             default: withCtx(() => [
               (openBlock(true), createElementBlock(Fragment, null, renderList(unref(getSchema), (schema) => {
-                return openBlock(), createBlock(unref(DtFormItem), {
+                return openBlock(), createBlock(unref(_sfc_main$b), {
                   key: schema.name,
                   schema,
                   formProps: unref(getProps),
@@ -1882,7 +1873,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
                   })
                 ]), 1032, ["schema", "formProps", "formModel", "defaultValues"]);
               }), 128)),
-              unref(getActionsProps).buttonList?.length ? (openBlock(), createBlock(unref(DtFormButtons), mergeProps({ key: 0 }, unref(getActionsProps), { onHandleMethod: unref(handleMethod) }), null, 16, ["onHandleMethod"])) : createCommentVNode("v-if", true)
+              unref(getActionsProps).buttonList?.length ? (openBlock(), createBlock(unref(_sfc_main$a), mergeProps({ key: 0 }, unref(getActionsProps), { onHandleMethod: unref(handleMethod) }), null, 16, ["onHandleMethod"])) : createCommentVNode("", true)
             ]),
             _: 3
           }, 16)
@@ -1892,7 +1883,6 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Forms = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/form/src/index.vue"]]);
 function useForm(props) {
   const formRef = ref(null);
   const loadedRef = ref(false);
@@ -1969,7 +1959,7 @@ const withInstall = (comp) => {
   };
   return comp;
 };
-const DtForm = withInstall(Forms);
+const DtForm = withInstall(_sfc_main$9);
 const orgDialogProp = reactive({});
 const cbTransfer = reactive({});
 const dataTransfer = reactive({});
@@ -2057,8 +2047,6 @@ function useModal(props, setModalData) {
   };
   watchEffect(() => {
     const data = dataTransfer[unref(uidRef)];
-    if (!data)
-      return;
     if (!setModalData || !isFunction(setModalData))
       return;
     nextTick(() => {
@@ -2273,13 +2261,12 @@ const _sfc_main$8 = {
       };
       if (!propsData?.visible)
         return null;
-      return createVNode(Modal$1, propsData, _isSlot(_slot = extendSlots(slots)) ? _slot : {
+      return createVNode(Modal, propsData, _isSlot(_slot = extendSlots(slots)) ? _slot : {
         default: () => [_slot]
       });
     };
   }
 };
-const Modal = /* @__PURE__ */ _export_sfc(_sfc_main$8, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/modal/src/components/Modal.vue"]]);
 const _sfc_main$7 = /* @__PURE__ */ defineComponent({
   __name: "CloseIcon",
   props: {
@@ -2338,7 +2325,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
             ]),
             _: 1
           }, 8, ["title"]))
-        ], 64)) : createCommentVNode("v-if", true),
+        ], 64)) : createCommentVNode("", true),
         createElementVNode("i", {
           class: "i mdi:close h-14 w-10 pr-4",
           onClick: handleCancel
@@ -2347,7 +2334,6 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const CloseIcon = /* @__PURE__ */ _export_sfc(_sfc_main$7, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/modal/src/components/CloseIcon.vue"]]);
 const isServer = typeof window === "undefined";
 const BAR_MAP = {
   vertical: {
@@ -2589,13 +2575,12 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ScrollBar = /* @__PURE__ */ _export_sfc(_sfc_main$6, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/container/src/components/scroll-bar.vue"]]);
 const _sfc_main$5 = /* @__PURE__ */ defineComponent({
   __name: "scroll-container",
   setup(__props) {
     const scrollbarRef = ref(null);
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(ScrollBar, mergeProps({
+      return openBlock(), createBlock(_sfc_main$6, mergeProps({
         ref_key: "scrollbarRef",
         ref: scrollbarRef
       }, _ctx.$attrs, { class: "w-full h-full" }), {
@@ -2607,7 +2592,6 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ScrollContainer = /* @__PURE__ */ _export_sfc(_sfc_main$5, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/container/src/scroll-container.vue"]]);
 const _sfc_main$4 = /* @__PURE__ */ defineComponent({
   __name: "slot-container",
   props: {
@@ -2626,9 +2610,8 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SlotContainer = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/container/src/slot-container.vue"]]);
-const DtScrollContainer = withInstall(ScrollContainer);
-withInstall(SlotContainer);
+const DtScrollContainer = withInstall(_sfc_main$5);
+withInstall(_sfc_main$4);
 const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   __name: "ModalWrap",
   props: {
@@ -2735,7 +2718,6 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ModalWrapper = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/modal/src/components/ModalWrap.vue"]]);
 const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   __name: "ModalFooter",
   props: {
@@ -2756,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");
@@ -2778,7 +2760,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock(Fragment, null, [
         renderSlot(_ctx.$slots, "appendFooter"),
-        createVNode(DtFormButtons, {
+        createVNode(_sfc_main$a, {
           mode: "dialog",
           buttonList: unref(buttonList),
           onHandleMethod: _cache[0] || (_cache[0] = ($event) => handleMethod($event))
@@ -2787,7 +2769,6 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ModalFooter = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/modal/src/components/ModalFooter.vue"]]);
 function useFullScreen(wrapClassName) {
   const fullScreenRef = ref(false);
   const getWrapClassName = computed(() => {
@@ -2906,14 +2887,14 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     });
     return (_ctx, _cache) => {
       const _component_ASpin = Spin;
-      return openBlock(), createBlock(Modal, mergeProps(unref(getBindValue), { onCancel: handleCancel }), createSlots({
+      return openBlock(), createBlock(_sfc_main$8, mergeProps(unref(getBindValue), { onCancel: handleCancel }), createSlots({
         default: withCtx(() => [
           createVNode(_component_ASpin, {
             spinning: unref(getBindValue).loading,
             tip: unref(getBindValue).loadingTip
           }, {
             default: withCtx(() => [
-              createVNode(ModalWrapper, mergeProps({
+              createVNode(_sfc_main$3, mergeProps({
                 useWrapper: unref(getBindValue).useWrapper,
                 fullScreen: unref(fullScreenRef),
                 ref_key: "modalWrapperRef",
@@ -2937,7 +2918,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         !_ctx.$slots.closeIcon ? {
           name: "closeIcon",
           fn: withCtx(() => [
-            createVNode(CloseIcon, {
+            createVNode(_sfc_main$7, {
               canFullscreen: unref(getBindValue).canFullscreen,
               fullScreen: unref(fullScreenRef),
               onCancel: handleCancel,
@@ -2956,7 +2937,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         !_ctx.$slots.footer ? {
           name: "footer",
           fn: withCtx(() => [
-            createVNode(ModalFooter, {
+            createVNode(_sfc_main$2, {
               buttons: propsRef.value?.footer,
               showSave: unref(getBindValue).showOkBtn,
               showCancel: unref(getBindValue).showCancelBtn,
@@ -2989,7 +2970,6 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DtModal$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/modal/src/index.vue"]]);
 const basicProps = {
   title: {
     type: Object
@@ -3062,7 +3042,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       props?.onSave();
     }
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(unref(DtModal$1), {
+      return openBlock(), createBlock(unref(_sfc_main$1), {
         onRegister: unref(registerDialog),
         onSave: _cache[0] || (_cache[0] = ($event) => handleSave())
       }, {
@@ -3074,7 +3054,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DtModal = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/curd/src/components/Curd.vue"]]);
 function useCurd(curdOpt) {
   const [register, {
     openModal,
@@ -3102,7 +3081,7 @@ function useCurd(curdOpt) {
   const DtCurdModal = () => {
     return h(createVNode("div", {
       "class": "dt-curd-modal"
-    }, [createVNode(DtModal, mergeProps(curdOpt, {
+    }, [createVNode(_sfc_main, mergeProps(curdOpt, {
       "title": title,
       "onRegister": register
     }), {
@@ -3111,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
@@ -3126,9 +3103,7 @@ function useCurd(curdOpt) {
       onDeletes([row[primaryKey]]);
     }
   }
-  function update({
-    row
-  }) {
+  function openUpdateDialog(row) {
     const {
       primaryKey = "id",
       onQueryById
@@ -3166,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;