@dt-frames/ui 1.0.15 → 1.0.16

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

@@ -144,7 +144,6 @@ declare const _sfc_main: import("vue").DefineComponent<{
         getFormBindValue: import("vue").ComputedRef<Recordable<any>>;
         getFormClass: import("vue").ComputedRef<(string | {
             'basic-form--compact': boolean;
-            'basic-form--search': boolean;
         })[]>;
         formModel: Recordable<any>;
         getLayout: import("vue").ComputedRef<"vertical" | "horizontal" | "inline">;

package/es/components/forms/src/hooks/helper.d.ts

@@ -1,6 +1,8 @@
 import { ComponentType } from "../types/form.type";
 import type { ValidationRule } from 'ant-design-vue/lib/form/Form';
 export declare function createPlaceholder(component: ComponentType): "" | "请输入" | "请选择" | "请设置图标";
+export declare const SINGLE_DATA_TYPE: string[];
+export declare const MULTIFY_DATA_TYPE: string[];
 export declare function setComponentRuleType(rule: ValidationRule, component: ComponentType, valueFormat: string): void;
 export declare function handleInputNumberValue(component?: ComponentType, val?: any): any;
 export declare const datePickerType: string[];

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

@@ -54,7 +54,6 @@ declare const _default: import("vue").DefineComponent<{
     getFormBindValue: import("vue").ComputedRef<Recordable<any>>;
     getFormClass: import("vue").ComputedRef<(string | {
         'basic-form--compact': boolean;
-        'basic-form--search': boolean;
     })[]>;
     formModel: Recordable<any>;
     getLayout: import("vue").ComputedRef<"vertical" | "horizontal" | "inline">;

package/es/index.js

@@ -2050,7 +2050,7 @@ function useModalOut() {
       if (!data)
         return;
       if (openOnSet) {
-        dataTransfer[id] = toRaw(data);
+        dataTransfer[id] = { ...toRaw(data) };
         return;
       }
       const equal = isEqual(toRaw(dataTransfer[id]), toRaw(data));
@@ -2894,8 +2894,10 @@ function createPlaceholder(component) {
   }
   return "";
 }
+const SINGLE_DATA_TYPE = ["DatePicker", "MonthPicker", "WeekPicker", "TimePicker"];
+const MULTIFY_DATA_TYPE = ["RangePicker"];
 function setComponentRuleType(rule, component, valueFormat) {
-  if (["DatePicker", "MonthPicker", "WeekPicker", "TimePicker"].includes(component)) {
+  if (SINGLE_DATA_TYPE.includes(component)) {
     rule.type = valueFormat ? "string" : "object";
   } else if (["RangePicker", "Upload", "CheckboxGroup", "TimePicker"].includes(component)) {
     rule.type = "array";
@@ -2916,7 +2918,7 @@ function handleInputNumberValue(component, val) {
   }
   return val;
 }
-const datePickerType = ["DatePicker", "MonthPicker", "WeekPicker", "TimePicker", "RangePicker"];
+const datePickerType = [...SINGLE_DATA_TYPE, ...MULTIFY_DATA_TYPE];
 const BasicProps$1 = {
   mode: {
     type: String,
@@ -3757,6 +3759,12 @@ function useFormValues({
       if (!key || Array.isArray(value) && value.length === 0 || isFunction(value)) {
         continue;
       }
+      const schema = unref(getSchema).filter((it) => it.name === key)[0];
+      if (SINGLE_DATA_TYPE.includes(schema == null ? void 0 : schema.component)) {
+        value = dayjs(value).valueOf();
+      } else if (MULTIFY_DATA_TYPE.includes(schema == null ? void 0 : schema.component)) {
+        value = value.map((item) => dayjs(item).valueOf());
+      }
       if (isString(value)) {
         value = value.trim();
       }
@@ -3803,6 +3811,8 @@ function useFormValues({
           }
         }
       } else {
+        if (!names)
+          return;
         names.forEach((key, index) => {
           let defaultV = null;
           if (component === "TreeSelect" && (mode === "multiple" || treeCheckable) || component === "Select" && mode === "multiple") {
@@ -3819,6 +3829,100 @@ function useFormValues({
     initDefault
   };
 }
+var weekday$1 = { exports: {} };
+(function(module, exports) {
+  !function(e, t) {
+    module.exports = t();
+  }(commonjsGlobal, function() {
+    return function(e, t) {
+      t.prototype.weekday = function(e2) {
+        var t2 = this.$locale().weekStart || 0, i = this.$W, n = (i < t2 ? i + 7 : i) - t2;
+        return this.$utils().u(e2) ? n : this.subtract(n, "day").add(e2, "day");
+      };
+    };
+  });
+})(weekday$1);
+var weekday = weekday$1.exports;
+var localeData$1 = { exports: {} };
+(function(module, exports) {
+  !function(n, e) {
+    module.exports = e();
+  }(commonjsGlobal, function() {
+    return function(n, e, t) {
+      var r = e.prototype, o = function(n2) {
+        return n2 && (n2.indexOf ? n2 : n2.s);
+      }, u = function(n2, e2, t2, r2, u2) {
+        var i2 = n2.name ? n2 : n2.$locale(), a2 = o(i2[e2]), s2 = o(i2[t2]), f = a2 || s2.map(function(n3) {
+          return n3.slice(0, r2);
+        });
+        if (!u2)
+          return f;
+        var d = i2.weekStart;
+        return f.map(function(n3, e3) {
+          return f[(e3 + (d || 0)) % 7];
+        });
+      }, i = function() {
+        return t.Ls[t.locale()];
+      }, a = function(n2, e2) {
+        return n2.formats[e2] || function(n3) {
+          return n3.replace(/(\[[^\]]+])|(MMMM|MM|DD|dddd)/g, function(n4, e3, t2) {
+            return e3 || t2.slice(1);
+          });
+        }(n2.formats[e2.toUpperCase()]);
+      }, s = function() {
+        var n2 = this;
+        return { months: function(e2) {
+          return e2 ? e2.format("MMMM") : u(n2, "months");
+        }, monthsShort: function(e2) {
+          return e2 ? e2.format("MMM") : u(n2, "monthsShort", "months", 3);
+        }, firstDayOfWeek: function() {
+          return n2.$locale().weekStart || 0;
+        }, weekdays: function(e2) {
+          return e2 ? e2.format("dddd") : u(n2, "weekdays");
+        }, weekdaysMin: function(e2) {
+          return e2 ? e2.format("dd") : u(n2, "weekdaysMin", "weekdays", 2);
+        }, weekdaysShort: function(e2) {
+          return e2 ? e2.format("ddd") : u(n2, "weekdaysShort", "weekdays", 3);
+        }, longDateFormat: function(e2) {
+          return a(n2.$locale(), e2);
+        }, meridiem: this.$locale().meridiem, ordinal: this.$locale().ordinal };
+      };
+      r.localeData = function() {
+        return s.bind(this)();
+      }, t.localeData = function() {
+        var n2 = i();
+        return { firstDayOfWeek: function() {
+          return n2.weekStart || 0;
+        }, weekdays: function() {
+          return t.weekdays();
+        }, weekdaysShort: function() {
+          return t.weekdaysShort();
+        }, weekdaysMin: function() {
+          return t.weekdaysMin();
+        }, months: function() {
+          return t.months();
+        }, monthsShort: function() {
+          return t.monthsShort();
+        }, longDateFormat: function(e2) {
+          return a(n2, e2);
+        }, meridiem: n2.meridiem, ordinal: n2.ordinal };
+      }, t.months = function() {
+        return u(i(), "months");
+      }, t.monthsShort = function() {
+        return u(i(), "monthsShort", "months", 3);
+      }, t.weekdays = function(n2) {
+        return u(i(), "weekdays", null, null, n2);
+      }, t.weekdaysShort = function(n2) {
+        return u(i(), "weekdaysShort", "weekdays", 3, n2);
+      }, t.weekdaysMin = function(n2) {
+        return u(i(), "weekdaysMin", "weekdays", 2, n2);
+      };
+    };
+  });
+})(localeData$1);
+var localeData = localeData$1.exports;
+dayjs.extend(weekday);
+dayjs.extend(localeData);
 function useFormEvents({
   emit,
   getSchema,
@@ -4028,7 +4132,7 @@ const _sfc_main$N = defineComponent({
       const { style, mode } = unref(getProps);
       return {
         style: deepMerge({
-          padding: mode === "dialog" ? "20px" : null
+          padding: mode === "dialog" ? "20px 30px" : null
         }, style)
       };
     });
@@ -4054,9 +4158,9 @@ const _sfc_main$N = defineComponent({
       const getCompact = compact === null ? mode === "dialog" ? false : true : compact;
       return [
         "basic-form",
+        `basic-form--${mode}`,
         {
-          "basic-form--compact": getCompact,
-          "basic-form--search": mode === "search" || mode === void 0 ? true : false
+          "basic-form--compact": getCompact
         }
       ];
     });
@@ -4976,11 +5080,12 @@ function useRowSelection(propsRef, emit) {
       return null;
     }
     return {
-      ...rowSelection,
       selectedRowKeys: toRaw(unref(selectedRowKeysRef)),
       onChange: (selectedRowKeys) => {
         setSelectedRowKeys(selectedRowKeys);
-      }
+      },
+      preserveSelectedRowKeys: true,
+      ...omit(rowSelection, ["onChange"])
     };
   });
   watch(() => {
@@ -5079,8 +5184,20 @@ var _sfc_main$J = defineComponent({
           dict,
           date,
           number,
-          percent
+          percent,
+          struc
         } = render2;
+        if (struc) {
+          const {
+            appConf
+          } = useAppStore();
+          let apiStruc = appConf.structure[struc];
+          if (!apiStruc) {
+            error(`${struc}\u672A\u5728structure\u4E2D\u914D\u7F6E`);
+          } else {
+            renderText = getDictValueByCode(text, apiStruc);
+          }
+        }
         if (dict) {
           renderText = getDictValueByCode(text, dict);
         }
@@ -6410,6 +6527,7 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef) {
     bodyEl.style.height = "unset";
     if (unref(propsRef).dataSource.length === 0)
       return;
+    filterSource.value = [];
     await nextTick();
     let headerHeight = 0, paginationHeight = 2, footerHeight = 0, titleHeight = (_b = (_a = tableEl.querySelector(".ant-table-title")) == null ? void 0 : _a.offsetHeight) != null ? _b : 0, marginHeight = 15;
     const headEl = tableEl.querySelector(".ant-table-thead ");
@@ -7075,6 +7193,7 @@ function useCurd(curdOpt) {
     } = curdOpt;
     curd.onQueryById(row[primaryKey]).then((rsp) => {
       formsVal.value = rsp;
+      nextTick(() => dispatchResize());
     });
     openModal();
   }

package/package.json

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