@dt-frames/ui 1.0.15 → 1.0.19

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/components/table/src/components/editable/EditTableCell.d.ts

@@ -24,6 +24,7 @@ declare const _default: import("vue").DefineComponent<{
         default: () => BasicColumn;
     };
     index: NumberConstructor;
+    dataSource: PropType<Recordable<any>[]>;
 }, {
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         value: {
@@ -48,6 +49,7 @@ declare const _default: import("vue").DefineComponent<{
             default: () => BasicColumn;
         };
         index: NumberConstructor;
+        dataSource: PropType<Recordable<any>[]>;
     }>> & {
         [x: string & `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any);
     }>>;
@@ -81,6 +83,7 @@ declare const _default: import("vue").DefineComponent<{
         default: () => BasicColumn;
     };
     index: NumberConstructor;
+    dataSource: PropType<Recordable<any>[]>;
 }>>, {
     value: string;
     column: BasicColumn;

package/es/components/table/src/components/editable/index.d.ts

@@ -1,5 +1,5 @@
 import { BasicColumn } from "../../types/table.type";
-declare function renderEditCell(column: BasicColumn): ({ text: value, record, index }: {
+declare function renderEditCell(column: BasicColumn, dataSource: any): ({ text: value, record, index }: {
     text: any;
     record: any;
     index: any;

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

@@ -268,6 +268,9 @@ declare const _default: import("vue").DefineComponent<{
         rowKey: string;
         columns: import("./types/table.type").BasicColumn[];
         tableLayout: string;
+        class: (string | {
+            'dt-table-no-pagation': boolean;
+        })[];
         customRow: (record: Recordable<any>, index: number) => {
             onClick: (e: any) => void;
             onDblclick: (event: Event) => void;

package/es/components/table/src/types/table.type.d.ts

@@ -33,6 +33,8 @@ export declare type SorterResult = {
 };
 export declare type CellFormat = ((record: Recordable, index: number, text: string) => any) | {
     dict: DictType;
+} | {
+    struc: string;
 } | {
     number: string;
 } | {

package/es/components/upload/src/upload.d.ts

@@ -1284,6 +1284,9 @@ declare const _sfc_main: import("vue").DefineComponent<{
             rowKey: string;
             columns: import("../../table/src/types/table.type").BasicColumn[];
             tableLayout: string;
+            class: (string | {
+                'dt-table-no-pagation': boolean;
+            })[];
             customRow: (record: import("@dt-frames/core").Recordable<any>, index: number) => {
                 onClick: (e: any) => void;
                 onDblclick: (event: Event) => void;

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,
@@ -3042,11 +3044,7 @@ var _sfc_main$P = defineComponent({
         props: cProps = {}
       } = schema2;
       if (isFunction(cProps)) {
-        cProps = (_a = cProps({
-          schema: schema2,
-          formModel,
-          formActionType
-        })) != null ? _a : {};
+        cProps = (_a = cProps(formModel)) != null ? _a : {};
       }
       if (schema2.component === "Divider") {
         cProps = Object.assign({
@@ -3310,7 +3308,7 @@ var _sfc_main$P = defineComponent({
           error("\u8BF7\u914D\u7F6Erender\u51FD\u6570");
           return;
         }
-        return createVNode(Col, {
+        return unref(getShow) && createVNode(Col, {
           "span": 24
         }, _isSlot(_slot2 = render2(values)) ? _slot2 : {
           default: () => [_slot2]
@@ -3757,6 +3755,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();
       }
@@ -3769,7 +3773,7 @@ function useFormValues({
     const obj = {};
     schema.forEach((item) => {
       const { props = {}, name, component } = item;
-      let { defaultValue: defaultValue2, mode, format, treeCheckable } = isFunction(props) ? props() : props;
+      let { defaultValue: defaultValue2, mode, format, treeCheckable } = isFunction(props) ? props({ formModel }) : props;
       const names = isString(name) ? [name] : name;
       if (defaultValue2 !== null && defaultValue2 !== void 0) {
         if (datePickerType.includes(component)) {
@@ -3803,6 +3807,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 +3825,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 +4128,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 +4154,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 +5076,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 +5180,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);
         }
@@ -5167,7 +5280,8 @@ var _sfc_main$I = defineComponent({
       type: Object,
       default: () => ({})
     },
-    index: Number
+    index: Number,
+    dataSource: Array
   },
   setup(props) {
     const table = getTableInstance();
@@ -5200,6 +5314,9 @@ var _sfc_main$I = defineComponent({
       }
       return "\u8BF7\u9009\u62E9";
     };
+    const setTableValue = () => {
+      props.dataSource[props.index][props.column.dataIndex] = unref(currentValueRef);
+    };
     const getComponentProps = computed(() => {
       var _a, _b, _c;
       const isCheckValue = unref(getIsCheckComp);
@@ -5225,7 +5342,8 @@ var _sfc_main$I = defineComponent({
         getPopupContainer: () => document.body,
         placeholder: createPlaceholderMessage(unref(getComponent)),
         ...omit(compProps, "onChange"),
-        [valueField]: value
+        [valueField]: value,
+        onBlur: setTableValue
       };
     });
     async function handleChange(e) {
@@ -5245,10 +5363,14 @@ var _sfc_main$I = defineComponent({
       const onChange = (_a = unref(getComponentProps)) == null ? void 0 : _a.onChange;
       if (onChange && isFunction$1(onChange))
         onChange(...arguments);
+      if (!["Input", "InputNumber"].includes(props.column.editComponent)) {
+        setTableValue();
+      }
       (_b = table.emit) == null ? void 0 : _b.call(table, "edit-change", {
         column: props.column,
         value: unref(currentValueRef),
-        record: toRaw(props.record)
+        record: toRaw(props.record),
+        index: props.index
       });
       handleSubmitRule();
     }
@@ -5312,7 +5434,7 @@ function _sfc_render$3(_ctx, _cache, $props, $setup, $data, $options) {
   ]);
 }
 var EditableCell = /* @__PURE__ */ _export_sfc(_sfc_main$I, [["render", _sfc_render$3]]);
-function renderEditCell(column) {
+function renderEditCell(column, dataSource) {
   return ({ text: value, record, index }) => {
     record.onValid = async () => {
       if (isArray$1(record == null ? void 0 : record.validCbs)) {
@@ -5346,7 +5468,8 @@ function renderEditCell(column) {
       value,
       record,
       column,
-      index
+      index,
+      dataSource
     });
   };
 }
@@ -5614,7 +5737,7 @@ function useColumns(propsRef, getPaginationRef) {
     const columns = cloneDeep(viewColumns);
     return columns.filter((column) => isIfShow(column)).map((column) => {
       if (column.edit) {
-        column.customRender = renderEditCell(column);
+        column.customRender = renderEditCell(column, unref(propsRef).dataSource);
       }
       return column;
     });
@@ -6410,6 +6533,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 ");
@@ -6607,6 +6731,12 @@ const _sfc_main$A = defineComponent({
     const getProps = computed(() => {
       return { ...props, ...unref(innerPropsRef) };
     });
+    const tableClass = computed(() => {
+      return [
+        "dt-table",
+        { "dt-table-no-pagation": !unref(getProps).pagination }
+      ];
+    });
     const { getLoading, setLoading } = useLoading(getProps);
     const { getPaginationInfo, setPagination, getPagination, getShowPagination, setShowPagination } = usePagination(getProps);
     const {
@@ -6673,6 +6803,7 @@ const _sfc_main$A = defineComponent({
         rowKey: unref(getProps).rowKey,
         columns: unref(getViewColumns),
         tableLayout: "fixed",
+        class: unref(tableClass),
         customRow
       };
     });
@@ -6702,10 +6833,7 @@ const _sfc_main$A = defineComponent({
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_TableRender = resolveComponent("TableRender");
   const _component_Table = resolveComponent("Table");
-  return openBlock(), createBlock(_component_Table, mergeProps({
-    ref: "tableElRef",
-    class: "dt-table"
-  }, _ctx.getBind, {
+  return openBlock(), createBlock(_component_Table, mergeProps({ ref: "tableElRef" }, _ctx.getBind, {
     rowClassName: _ctx.getRowClassName,
     onChange: _ctx.handleTableChange,
     onResizeColumn: _ctx.handleResizeColumn
@@ -6852,6 +6980,8 @@ function useSource(opt) {
       search();
   }
   function search() {
+    if (!queryPage)
+      return;
     const { fetch } = useFetch(queryPage, baseUrl);
     loading.onQuerypage.value = true;
     fetch(toRaw(baseData)).then((rsp) => {
@@ -6874,6 +7004,8 @@ function useSource(opt) {
     });
   }
   function onAdd(model) {
+    if (!add)
+      return;
     const { fetch } = useFetch(add, baseUrl);
     return fetch(model, false).then((rsp) => {
       if ((rsp == null ? void 0 : rsp.code) === 0)
@@ -6882,10 +7014,14 @@ function useSource(opt) {
     });
   }
   async function onQueryById(id) {
+    if (!queryById)
+      return;
     const { fetch } = useFetch(queryById, baseUrl);
     return await fetch({ id });
   }
   function onUpdate(model) {
+    if (!update)
+      return;
     const { fetch } = useFetch(update, baseUrl);
     return fetch(model, false).then((rsp) => {
       if ((rsp == null ? void 0 : rsp.code) === 0)
@@ -6894,6 +7030,8 @@ function useSource(opt) {
     });
   }
   function onDeletes(ids) {
+    if (!deletes)
+      return;
     const { fetch } = useFetch(deletes, baseUrl);
     fetch(toRaw(ids), false).then((rsp) => {
       if ((rsp == null ? void 0 : rsp.code) === 0)
@@ -7075,6 +7213,7 @@ function useCurd(curdOpt) {
     } = curdOpt;
     curd.onQueryById(row[primaryKey]).then((rsp) => {
       formsVal.value = rsp;
+      nextTick(() => dispatchResize());
     });
     openModal();
   }
@@ -8666,7 +8805,7 @@ const _sfc_main$s = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    const title = "\u9686\u57FA\u7A0E\u52A1\u540E\u53F0\u7BA1\u7406\u7CFB\u7EDF";
+    const title = "\u9686\u57FA\u96C6\u56E2\u6D77\u5916\u7A0E\u52A1\u7CFB\u7EDF";
     const { getCollapsedShowTitle } = useMenu();
     const getLogoClass = computed(() => {
       return [

package/es/style/components/table/index.less

@@ -172,6 +172,10 @@
     }
 }
 
+.dt-table-no-pagation .ant-table-container {
+    border-bottom: 1px solid #f0f0f0;
+}
+
 .edit-cell-rule-popover .ant-popover-inner-content{
     padding: 4px 8px;
     color: #ed6f6f;

package/package.json

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