@dt-frames/ui 2.0.16 → 2.0.18

package/es/components/drawer/index.d.ts

@@ -67,6 +67,7 @@ declare const DtDrawer: import('../../utils/withInstall').SFCWithInstall<import(
     };
     props: any;
     propsRef: import("vue").Ref<{
+        t?: string;
         loading?: boolean;
         loadingText?: string;
         visible?: boolean;
@@ -1600,7 +1601,7 @@ declare const DtDrawer: import('../../utils/withInstall').SFCWithInstall<import(
             "text-anchor"?: import("csstype").TextAnchorProperty;
             "vector-effect"?: import("csstype").VectorEffectProperty;
         };
-        title?: string;
+        title?: string | ((data: import("@dt-frames/core").Recordable<any>) => string);
         wrapClassName?: string;
         class?: string;
         wrapStyle?: {
@@ -7711,7 +7712,7 @@ declare const DtDrawer: import('../../utils/withInstall').SFCWithInstall<import(
             t?: string;
             label: string;
             color?: "" | "error" | "warning" | "success";
-            type?: "default" | "dashed" | "text" | "primary" | "ghost" | "link";
+            type?: "link" | "default" | "dashed" | "text" | "primary" | "ghost";
             class?: string;
             disabled?: boolean;
             show?: boolean;
@@ -7732,13 +7733,11 @@ declare const DtDrawer: import('../../utils/withInstall').SFCWithInstall<import(
     getMergeProps: import("vue").ComputedRef<any>;
     getshowFooter: import("vue").ComputedRef<boolean>;
     getProps: import("vue").ComputedRef<import("./src/types/index.type").DrawerProps>;
-    getScrollContentStyle: import("vue").ComputedRef<import("vue").CSSProperties>;
     handleSave: () => void;
     handleCancel: (e?: Event) => Promise<void>;
     setDrawerProps: (props: Partial<import("./src/types/index.type").DrawerProps>) => void;
     drawerMethods: import("./src/types/index.type").DrawerMethods;
     instance: import("vue").ComponentInternalInstance;
-    readonly DtScrollContainer: import('../../utils/withInstall').SFCWithInstall<import("vue").DefineComponent<{}, {}, any, import("vue").ComputedOptions, import("vue").MethodOptions, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
     DrawerHeader: import("vue").DefineComponent<{
         title: {
             type: import("vue").PropType<String | import("vue").ComputedRef<String>>;

package/es/components/drawer/index.js

@@ -1,4 +1,4 @@
-import { Drawer as Drawer$1 } from "ant-design-vue/es";
+import { Drawer } from "ant-design-vue/es";
 import "ant-design-vue/es/drawer/style";
 import { defineComponent, openBlock, createElementBlock, createElementVNode, toDisplayString, renderSlot, computed, createVNode, unref, useAttrs, ref, toRaw, getCurrentInstance, watch, createBlock, mergeProps, createSlots, withCtx, renderList, normalizeProps, guardReactiveProps, reactive, watchEffect, nextTick, onUnmounted } from "vue";
 import { useI18n, DtCache, CacheKey, deepMerge, isUnDef, isFunction, useApp, isObject, error } from "@dt-frames/core";
@@ -23,14 +23,6 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _export_sfc = (sfc, props) => {
-  const target = sfc.__vccOpts || sfc;
-  for (const [key, val] of props) {
-    target[key] = val;
-  }
-  return target;
-};
-const DrawerHeader = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/drawer/src/components/DrawerHeader.vue"]]);
 const _hoisted_1 = {
   class: "flex items-center",
   style: { gap: "10px" }
@@ -86,7 +78,6 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DrawerFooter = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/drawer/src/components/DrawerFooter.vue"]]);
 const basicProps = {
   t: {
     type: String
@@ -213,7 +204,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       { immediate: false }
     );
     return (_ctx, _cache) => {
-      const _component_ADrawer = Drawer$1;
+      const _component_ADrawer = Drawer;
       return openBlock(), createBlock(_component_ADrawer, mergeProps({
         class: "dt-drawer",
         onClose: handleCancel
@@ -230,7 +221,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         !_ctx.$slots.title ? {
           name: "title",
           fn: withCtx(() => [
-            createVNode(DrawerHeader, {
+            createVNode(_sfc_main$2, {
               title: unref(getProps).title
             }, {
               titleToolbar: withCtx(() => [
@@ -250,7 +241,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         unref(getshowFooter) ? {
           name: "footer",
           fn: withCtx(() => [
-            createVNode(DrawerFooter, {
+            createVNode(_sfc_main$1, {
               buttons: propsRef.value?.footer,
               showSave: unref(getProps).showOkBtn,
               showCancel: unref(getProps).showCancelBtn,
@@ -275,7 +266,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Drawer = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/drawer/src/index.vue"]]);
 const orgDialogProp = reactive({});
 const cbTransfer = reactive({});
 const dataTransfer = reactive({});
@@ -370,6 +360,12 @@ function useDrawer(props, setModalData) {
         return;
       }
       setModalData(data ?? {});
+      if (!data)
+        return;
+      if (props?.title && isFunction(props?.title)) {
+        let title = props.title(data);
+        methods.setDrawerProps({ title });
+      }
     });
   });
   const methods = {
@@ -393,7 +389,7 @@ const withInstall = (comp) => {
   };
   return comp;
 };
-const DtDrawer = withInstall(Drawer);
+const DtDrawer = withInstall(_sfc_main);
 export {
   DtDrawer,
   useDrawer,

package/es/components/drawer/index.less

@@ -7,4 +7,10 @@
 
 .ant-drawer-footer > div{
     float: right;
+}
+
+.ant-drawer-header-title{
+	button{
+		display: flex;
+	}
 }

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

@@ -1,5 +1,4 @@
 import { DrawerMethods, DrawerProps } from './types/index.type';
-import { CSSProperties } from 'vue';
 declare const _sfc_main: import("vue").DefineComponent<{
     t: {
         type: StringConstructor;
@@ -29,7 +28,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    maskStyle: import("vue").PropType<CSSProperties>;
+    maskStyle: import("vue").PropType<import("vue").CSSProperties>;
     closeFunc: {
         type: import("vue").PropType<any>;
         default: any;
@@ -68,6 +67,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     };
     props: any;
     propsRef: import("vue").Ref<{
+        t?: string;
         loading?: boolean;
         loadingText?: string;
         visible?: boolean;
@@ -1601,7 +1601,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
             "text-anchor"?: import("csstype").TextAnchorProperty;
             "vector-effect"?: import("csstype").VectorEffectProperty;
         };
-        title?: string;
+        title?: string | ((data: import("@dt-frames/core").Recordable<any>) => string);
         wrapClassName?: string;
         class?: string;
         wrapStyle?: {
@@ -7712,7 +7712,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
             t?: string;
             label: string;
             color?: "" | "error" | "warning" | "success";
-            type?: "default" | "dashed" | "text" | "primary" | "ghost" | "link";
+            type?: "link" | "default" | "dashed" | "text" | "primary" | "ghost";
             class?: string;
             disabled?: boolean;
             show?: boolean;
@@ -7733,13 +7733,11 @@ declare const _sfc_main: import("vue").DefineComponent<{
     getMergeProps: import("vue").ComputedRef<any>;
     getshowFooter: import("vue").ComputedRef<boolean>;
     getProps: import("vue").ComputedRef<DrawerProps>;
-    getScrollContentStyle: import("vue").ComputedRef<CSSProperties>;
     handleSave: () => void;
     handleCancel: (e?: Event) => Promise<void>;
     setDrawerProps: (props: Partial<DrawerProps>) => void;
     drawerMethods: DrawerMethods;
     instance: import("vue").ComponentInternalInstance;
-    readonly DtScrollContainer: import("../../../utils/withInstall").SFCWithInstall<import("vue").DefineComponent<{}, {}, any, import("vue").ComputedOptions, import("vue").MethodOptions, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>>;
     DrawerHeader: import("vue").DefineComponent<{
         title: {
             type: import("vue").PropType<String | import("vue").ComputedRef<String>>;
@@ -7831,7 +7829,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-    maskStyle: import("vue").PropType<CSSProperties>;
+    maskStyle: import("vue").PropType<import("vue").CSSProperties>;
     closeFunc: {
         type: import("vue").PropType<any>;
         default: any;

package/es/components/drawer/src/types/index.type.d.ts

@@ -1,6 +1,8 @@
 import { ButtonProps } from '../../../form';
+import { Recordable } from "@dt-frames/core";
 import { CSSProperties, ComputedRef } from "vue";
 export declare type DrawerProps = {
+    t?: string;
     loading?: boolean;
     loadingText?: string;
     visible?: boolean;
@@ -11,7 +13,7 @@ export declare type DrawerProps = {
     maskClosable?: boolean;
     keyboard?: boolean;
     maskStyle?: CSSProperties;
-    title?: ComputedRef<string> | string;
+    title?: ComputedRef<string> | string | ((data: Recordable) => string);
     wrapClassName?: string;
     class?: string;
     wrapStyle?: CSSProperties;

package/es/components/form/index.js

@@ -1,7 +1,7 @@
 import { RadioButton, RadioGroup, Input, Button, FormItem as FormItem$1, Col as Col$1, Row, Form as Form$1 } from "ant-design-vue/es";
 import "ant-design-vue/es/form/style";
 import "ant-design-vue/es/row/style";
-import { computed, unref, getCurrentInstance, reactive, readonly, watchEffect, nextTick, toRaw, defineComponent, useAttrs, openBlock, createBlock, mergeProps, isRef, withCtx, createElementBlock, Fragment, renderList, createTextVNode, toDisplayString, createElementVNode, createVNode, normalizeProps, guardReactiveProps, createCommentVNode, toRefs, isVNode, ref, watch, resolveDirective, normalizeStyle, withDirectives, normalizeClass, onMounted, withKeys, createSlots, renderSlot } from "vue";
+import { computed, unref, getCurrentInstance, reactive, readonly, watchEffect, nextTick, toRaw, defineComponent, useAttrs, openBlock, createBlock, mergeProps, isRef, withCtx, createElementBlock, Fragment, renderList, createTextVNode, toDisplayString, createElementVNode, createVNode, normalizeProps, guardReactiveProps, createCommentVNode, ref, toRefs, isVNode, watch, resolveDirective, normalizeStyle, withDirectives, normalizeClass, onMounted, withKeys, createSlots, renderSlot } from "vue";
 import { useAppStore, isNumber, useI18n, isString, isFunction, error, useSlots, isArray, isUnDef, isBoolean, isNull, dispatchResize, isObject, deepMerge, isNullAndUnDef, useTimeoutFn } from "@dt-frames/core";
 import { merge, isEqual, omit, cloneDeep, upperFirst, uniqBy, set } from "lodash-es";
 import { Input as Input$1, Select, TreeSelect, Radio, Checkbox, AutoComplete, Cascader, DatePicker, InputNumber, Switch, TimePicker, Slider, Rate, Divider, Col, Tooltip, Form, FormItem } from "ant-design-vue";
@@ -297,6 +297,7 @@ const _sfc_main$2 = {
     const {
       appConf
     } = useAppStore();
+    const uploadFiles = ref([]);
     const {
       schema,
       formProps
@@ -443,6 +444,9 @@ const _sfc_main$2 = {
           const [e] = args;
           const target = e ? e.target : null;
           const value = target ? isCheck ? target.checked : target.value : e;
+          if (component === "Upload") {
+            uploadFiles.value = unref(args[1]);
+          }
           if (isString(name)) {
             props.setFormModel(name, value);
           } else if (isArray(name)) {
@@ -505,6 +509,7 @@ const _sfc_main$2 = {
       }
       if (component === "Upload" && !itemProps.defaultFiles && extraName?.length) {
         itemProps.defaultFiles = unref(getValues).values?.[extraName[0]];
+        itemProps.emitSnippet = true;
       }
       itemProps.formValues = unref(getValues);
       if (["Select", "DatePicker", "MonthPicker", "WeekPicker", "RangePicker"].includes(component)) {
@@ -548,6 +553,8 @@ const _sfc_main$2 = {
       let rules = cloneDeep(defaultRules);
       const getRequired = isFunction(required) ? required(unref(getValues).model) : required;
       function validator(rule, value) {
+        if (component === "Upload" && unref(uploadFiles).map((file) => file.fileId).includes(void 0))
+          return Promise.resolve();
         const msg = rule.message || defaultMsg;
         if (value === void 0 || isNull(value) || Array.isArray(value) && value.length === 0 || typeof value === "string" && value.trim() === "" || typeof value === "object" && Reflect.has(value, "checked") && Reflect.has(value, "halfChecked") && Array.isArray(value.checked) && Array.isArray(value.halfChecked) && value.checked.length === 0 && value.halfChecked.length === 0) {
           return Promise.reject(msg);
@@ -694,6 +701,11 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     },
     colspan: {
       type: Object
+    },
+    style: {
+      type: Object,
+      default: () => {
+      }
     }
   },
   emits: ["handle-method"],
@@ -717,11 +729,17 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       let style = {
         textAlign: "right"
       };
+      let gStyle = props.style ?? {};
       if (props.mode === "dialog") {
         Object.assign(style, {
           display: "inline-block"
         });
-        return { style };
+        return {
+          style: {
+            ...gStyle,
+            ...style
+          }
+        };
       } else if (props.mode === null) {
         Object.assign(style, {
           display: "flex",
@@ -729,11 +747,19 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
           marginBottom: "20px"
         });
         return {
-          style,
+          style: {
+            ...gStyle,
+            ...style
+          },
           span: 24
         };
       }
-      return { style };
+      return {
+        style: {
+          ...props.style,
+          ...style
+        }
+      };
     });
     const getAdvanceClass = computed(() => {
       return [
@@ -969,7 +995,6 @@ function useFormEvents({
       return;
     }
     const names = unref(getSchema).map((item) => item.name).filter(Boolean);
-    const validKeys = [];
     Object.keys(values).forEach((key) => {
       const schema = unref(getSchema).find((item) => item.name === key);
       let value = values[key];
@@ -994,12 +1019,10 @@ function useFormEvents({
         } else {
           formModel[key] = value;
         }
-        validKeys.push(key);
       } else {
         formModel[key] = value;
       }
     });
-    return validateFields(validKeys);
   }
   async function validate(nameList) {
     return await unref(formElRef)?.validate(nameList);
@@ -1399,6 +1422,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       return {
         colspan,
+        style: {
+          marginLeft: "auto"
+        },
         ...{
           showAdvancedButton,
           buttonList