@dt-frames/ui 2.0.8 → 2.0.10

package/es/components/curd/index.js

@@ -1,9 +1,9 @@
-import { toRaw, unref, computed, getCurrentInstance, reactive, readonly, watchEffect, nextTick, 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, onUnmounted, inject, h, provide, onBeforeUnmount, resolveDynamicComponent } from "vue";
+import { toRaw, unref, computed, getCurrentInstance, reactive, readonly, watchEffect, nextTick, defineComponent, useAttrs, openBlock, createBlock, mergeProps, isRef, withCtx, createElementBlock, Fragment, renderList, createTextVNode, toDisplayString, toRefs, createVNode, isVNode, ref, watch, resolveDirective, normalizeProps, normalizeStyle, withDirectives, normalizeClass, createCommentVNode, createElementVNode, onMounted, withKeys, createSlots, renderSlot, guardReactiveProps, onUnmounted, inject, h, provide, onBeforeUnmount, resolveDynamicComponent } from "vue";
 import { RadioButton, RadioGroup, Button, FormItem as FormItem$1, Col as Col$1, Row, Form as Form$1, Tooltip as Tooltip$1, Spin } from "ant-design-vue/es";
 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 { DtCache, CacheKey, deepMerge, Pages, useGo, useRedo, Language, useAppStore, isNumber, useI18n, isString, useSlots, isArray, isFunction, error, isBoolean, isNull, dispatchResize, isObject, isNullAndUnDef, isEmpty, useTimeoutFn, useApp, off, on, windowResizeFn, useMessage } from "@dt-frames/core";
+import { cloneDeep, merge, isEqual, upperFirst, uniqBy, set, omit } 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";
@@ -498,18 +498,20 @@ function useLabelWidth(schemaItemRef, propsRef) {
       layout = appConf.ui.form.layout
     } = unref(propsRef);
     let width = (unref(getIsZH) ? labelWidth ?? gLabelWidth : enLabelWidth ?? gEnLabelWidth) ?? labelWidth ?? gLabelWidth ?? 0;
-    const labelcol = { ...glabelCol, ...labelCol };
-    const wrapcol = { ...gwrapperCol, ...wrapperCol };
+    const labelcol = merge({}, glabelCol, labelCol);
+    const wrapcol = merge({}, gwrapperCol, wrapperCol);
     width = isNumber(width) ? `${width}px` : width;
     return {
-      labelCol: {
-        style: { width },
-        ...labelcol
-      },
-      wrapperCol: {
-        style: { width: layout === "vertical" ? "100%" : `calc(100% - ${width})` },
-        ...wrapcol
-      }
+      labelCol: merge(
+        {},
+        { style: { width } },
+        labelcol
+      ),
+      wrapperCol: merge(
+        {},
+        { style: { width: layout === "vertical" ? "100%" : `calc(100% - ${width})` } },
+        wrapcol
+      )
     };
   });
 }
@@ -582,7 +584,7 @@ function useFormValue(props, key = "value", changeEvent = "change", emitData) {
   });
   return [state, setState, defaultState];
 }
-const _sfc_main$d = /* @__PURE__ */ defineComponent({
+const _sfc_main$c = /* @__PURE__ */ defineComponent({
   __name: "radioButton",
   props: {
     value: {
@@ -633,49 +635,8 @@ const _sfc_main$d = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _hoisted_1$2 = { class: "input-with-dialog" };
-const _sfc_main$c = /* @__PURE__ */ defineComponent({
-  __name: "formInputUseDialog",
-  setup(__props) {
-    const { t } = useI18n("UI");
-    const attrs = useAttrs();
-    const bindProps = computed(() => {
-      return {
-        ...omit(attrs, [
-          "formValues"
-        ]),
-        disabled: true
-      };
-    });
-    function onClickInput() {
-      const { model, schema = {} } = attrs.formValues;
-      if (!schema.openDialog || !isFunction(schema.openDialog)) {
-        error(t("MUSE_FUNCTION"));
-        return;
-      }
-      schema.openDialog(model);
-    }
-    function clearProps() {
-      const { model, schema = {} } = attrs.formValues;
-      [...schema.linkProps, schema.name].forEach((it) => model[it] = null);
-    }
-    return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1$2, [
-        createElementVNode("div", { onClick: onClickInput }, [
-          createVNode(unref(Input), normalizeProps(guardReactiveProps(unref(bindProps))), null, 16)
-        ]),
-        unref(attrs).formValues?.schema?.linkProps?.length ? (openBlock(), createElementBlock("i", {
-          key: 0,
-          class: "i mdi:close-circle",
-          onClick: clearProps
-        })) : createCommentVNode("", true)
-      ]);
-    };
-  }
-});
 const components = {
   Input,
-  InputWithDialog: _sfc_main$c,
   InputTextArea: Input.TextArea,
   InputSearch: Input.Search,
   InputGroup: Input.Group,
@@ -684,7 +645,7 @@ const components = {
   TreeSelect,
   Radio,
   RadioGroup: Radio.Group,
-  RadioButtonGroup: _sfc_main$d,
+  RadioButtonGroup: _sfc_main$c,
   Checkbox,
   CheckboxGroup: Checkbox.Group,
   AutoComplete,
@@ -820,7 +781,7 @@ const _sfc_main$b = {
       const getContent = () => {
         const value = unref(getValues);
         let _con = slot ? getSlot(slots, slot, value.model) : render ? render(value.model) : renderFormItem();
-        return component === "InputGroup" || component === "Icon" ? createVNode(FormItem, {
+        return component === "InputGroup" ? createVNode(FormItem, {
           "class": "m-0"
         }, _isSlot$1(_con) ? _con : {
           default: () => [_con]
@@ -931,10 +892,13 @@ const _sfc_main$b = {
         return _disabled;
       });
       const getSize = () => {
-        if (component === "Switch" && unref(getUiSize) === UiSize.LARGE) {
+        const {
+          size = unref(getUiSize)
+        } = props.formProps;
+        if (component === "Switch" && size === UiSize.LARGE) {
           return "default";
         }
-        return unref(getUiSize) === UiSize.MIDDLE ? "default" : unref(getUiSize);
+        return size === UiSize.MIDDLE ? "default" : size;
       };
       const itemProps = {
         allowClear: _sProps?.allowClear ?? appConf.ui.form.allowClear,
@@ -1049,7 +1013,7 @@ const _sfc_main$b = {
       let _colProps = colProps || gColProps || (mode === "search" ? appConf.ui.form.searchColspan : appConf.ui.form.dialogColspan);
       const values = unref(getValues);
       if (!component) {
-        if (!render && !renderCol && !slot) {
+        if (!render && !renderCol && !slot && !colSlot) {
           error(t("NEED_RENDER"));
           return;
         }
@@ -1114,6 +1078,9 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
     isAdvanced: {
       type: Boolean,
       default: true
+    },
+    colspan: {
+      type: Object
     }
   },
   emits: ["handle-method"],
@@ -1133,6 +1100,17 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
         Object.assign(style, {
           display: "inline-block"
         });
+        return { style };
+      } else if (props.mode === null) {
+        Object.assign(style, {
+          display: "flex",
+          justifyContent: "center",
+          marginBottom: "20px"
+        });
+        return {
+          style,
+          span: 24
+        };
       }
       return { style };
     });
@@ -1155,7 +1133,7 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
       }
     }
     watch(() => props.isAdvanced, (v) => {
-      if (v) {
+      if (v || props.mode !== "search") {
         nextTick(() => toggleAdvanced());
       }
     }, {
@@ -1462,14 +1440,12 @@ function useFormValues({
   function initDefault() {
     const schema = unref(getSchema), obj = {};
     schema.forEach((item) => {
-      const { props = {}, name, component, defaultValue: gDefaultValue, extraName } = item;
+      const { props = {}, name, component, defaultValue: gDefaultValue } = item;
       const { defaultValue: itemDefaultValue, mode, format, treeCheckable } = isFunction(props) ? props(formModel) : props;
       if (!name)
         return;
       let names = [];
-      if (component === "InputWithDialog") {
-        names = [name, ...extraName];
-      } else if (isArray(name)) {
+      if (isArray(name)) {
         names = name;
       } else {
         names = [name];
@@ -1601,8 +1577,7 @@ const BasicProps = {
     default: () => ({})
   },
   size: {
-    type: String,
-    default: "small"
+    type: String
   },
   disabled: {
     type: Boolean,
@@ -1720,7 +1695,8 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
       formModel[key] = value;
       const { validateTrigger } = unref(getBindValue);
       if (!validateTrigger || validateTrigger === "change") {
-        validateFields([key]);
+        validateFields([key]).catch((err) => {
+        });
       }
     }
     function handleEnterPress() {
@@ -1790,8 +1766,19 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
         });
       }
       let colspan = mode === "search" ? getAppConf.ui.form.searchColspan : getAppConf.ui.form.dialogColspan;
+      if (mode !== "search") {
+        return {
+          colspan,
+          ...{
+            mode,
+            showAdvancedButton: false,
+            isAdvanced: false,
+            buttonList
+          }
+        };
+      }
       return {
-        ...colspan,
+        colspan,
         ...{
           showAdvancedButton,
           buttonList
@@ -1953,13 +1940,6 @@ function useForm(props) {
   };
   return [register, methods];
 }
-const withInstall = (comp) => {
-  comp.install = (app) => {
-    app.component(comp.name, comp);
-  };
-  return comp;
-};
-const DtForm = withInstall(_sfc_main$9);
 const orgDialogProp = reactive({});
 const cbTransfer = reactive({});
 const dataTransfer = reactive({});
@@ -2051,6 +2031,12 @@ function useModal(props, setModalData) {
       return;
     nextTick(() => {
       setModalData(data);
+      if (!data)
+        return;
+      if (props?.title && isFunction(props?.title)) {
+        let title = props.title(data);
+        methods.setModalProps({ title });
+      }
     });
   });
   const methods = {
@@ -2610,6 +2596,12 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     };
   }
 });
+const withInstall = (comp) => {
+  comp.install = (app) => {
+    app.component(comp.name, comp);
+  };
+  return comp;
+};
 const DtScrollContainer = withInstall(_sfc_main$5);
 withInstall(_sfc_main$4);
 const _sfc_main$3 = /* @__PURE__ */ defineComponent({
@@ -3085,7 +3077,7 @@ function useCurd(curdOpt) {
       "title": title,
       "onRegister": register
     }), {
-      default: () => [createVNode(DtForm, {
+      default: () => [createVNode(_sfc_main$9, {
         "onRegister": registerForm
       }, null)]
     })]));

package/es/components/curd/index.less

@@ -0,0 +1,2 @@
+@import '../form/index.less';
+@import '../modal/index.less';

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

@@ -82,7 +82,6 @@ declare const _sfc_main: import("vue").DefineComponent<{
             };
             size: {
                 type: import("vue").PropType<"small" | "middle" | "large">;
-                default: string;
             };
             disabled: {
                 type: BooleanConstructor;
@@ -215,7 +214,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
             default: boolean;
         };
         title: {
-            type: import("vue").PropType<String | import("vue").ComputedRef<String>>;
+            type: import("vue").PropType<String | import("vue").ComputedRef<String> | ((data: import("@dt-frames/core").Recordable<any>) => String)>;
         };
         loading: {
             type: BooleanConstructor;
@@ -316,7 +315,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
                 default: boolean;
             };
             title: {
-                type: import("vue").PropType<String | import("vue").ComputedRef<String>>;
+                type: import("vue").PropType<String | import("vue").ComputedRef<String> | ((data: import("@dt-frames/core").Recordable<any>) => String)>;
             };
             loading: {
                 type: BooleanConstructor;
@@ -425,7 +424,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
                 default: boolean;
             };
             title: {
-                type: import("vue").PropType<String | import("vue").ComputedRef<String>>;
+                type: import("vue").PropType<String | import("vue").ComputedRef<String> | ((data: import("@dt-frames/core").Recordable<any>) => String)>;
             };
             loading: {
                 type: BooleanConstructor;
@@ -529,7 +528,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
                     default: boolean;
                 };
                 title: {
-                    type: import("vue").PropType<String | import("vue").ComputedRef<String>>;
+                    type: import("vue").PropType<String | import("vue").ComputedRef<String> | ((data: import("@dt-frames/core").Recordable<any>) => String)>;
                 };
                 loading: {
                     type: BooleanConstructor;
@@ -839,6 +838,9 @@ declare const _sfc_main: import("vue").DefineComponent<{
                     type: BooleanConstructor;
                     default: boolean;
                 };
+                colspan: {
+                    type: ObjectConstructor;
+                };
             }, {
                 props: any;
                 emits: (event: "handle-method", ...args: any[]) => void;
@@ -857,6 +859,10 @@ declare const _sfc_main: import("vue").DefineComponent<{
                 showAdvanceRef: import("vue").ComputedRef<boolean>;
                 colOpt: import("vue").ComputedRef<{
                     style: import("@dt-frames/core").Recordable<any>;
+                    span?: undefined;
+                } | {
+                    style: import("@dt-frames/core").Recordable<any>;
+                    span: number;
                 }>;
                 getAdvanceClass: import("vue").ComputedRef<(string | {
                     'basic-arrow--active': boolean;
@@ -888,6 +894,9 @@ declare const _sfc_main: import("vue").DefineComponent<{
                     type: BooleanConstructor;
                     default: boolean;
                 };
+                colspan: {
+                    type: ObjectConstructor;
+                };
             }>> & {
                 "onHandle-method"?: (...args: any[]) => any;
             }, {
@@ -960,7 +969,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
             default: boolean;
         };
         title: {
-            type: import("vue").PropType<String | import("vue").ComputedRef<String>>;
+            type: import("vue").PropType<String | import("vue").ComputedRef<String> | ((data: import("@dt-frames/core").Recordable<any>) => String)>;
         };
         loading: {
             type: BooleanConstructor;
@@ -1029,6 +1038,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         loading: boolean;
         visible: boolean;
         mask: boolean;
+        keyboard: boolean;
         closable: boolean;
         destroyOnClose: boolean;
         scrollTop: boolean;
@@ -1041,7 +1051,6 @@ declare const _sfc_main: import("vue").DefineComponent<{
         showOkBtn: boolean;
         showCancelBtn: boolean;
         maskClosable: boolean;
-        keyboard: boolean;
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     title: {
@@ -1127,7 +1136,6 @@ declare const _sfc_main: import("vue").DefineComponent<{
             };
             size: {
                 type: import("vue").PropType<"small" | "middle" | "large">;
-                default: string;
             };
             disabled: {
                 type: BooleanConstructor;

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

@@ -46,7 +46,7 @@ export declare function useCurd(curdOpt: Partial<ExtractPropTypes<typeof basicPr
             default: boolean;
         };
         title: {
-            type: PropType<String | import("vue").ComputedRef<String>>;
+            type: PropType<String | import("vue").ComputedRef<String> | ((data: Recordable<any>) => String)>;
         };
         loading: {
             type: BooleanConstructor;

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

@@ -87,7 +87,6 @@ export declare const basicProps: {
             };
             size: {
                 type: PropType<"small" | "middle" | "large">;
-                default: string;
             };
             disabled: {
                 type: BooleanConstructor;