@dt-frames/ui 1.0.16 → 1.0.20

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

@@ -90,6 +90,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
     registerForm: (formInstance: import("../../../forms").FormActionType) => void;
     getFormValues: () => Recordable<any>;
     setFormValues: (values: Recordable<any>) => Promise<void>;
+    validate: (nameList?: (string | number)[]) => Promise<any>;
     handleSave: () => void;
     DtForm: import("vue").DefineComponent<{
         mode: {

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

@@ -3044,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({
@@ -3312,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]
@@ -3777,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)) {
@@ -5223,7 +5219,11 @@ var _sfc_main$J = defineComponent({
       }
       if (isFunction(render2)) {
         let afterRenderData = render2(record, index, text);
-        renderText.value = isVnode(afterRenderData) ? createVNode(Fragment, null, [afterRenderData]) : afterRenderData;
+        if (afterRenderData.__v_isRef) {
+          renderText = afterRenderData;
+        } else {
+          renderText.value = isVnode(afterRenderData) ? createVNode(Fragment, null, [afterRenderData]) : afterRenderData;
+        }
       }
     }
     renderCell();
@@ -5284,7 +5284,8 @@ var _sfc_main$I = defineComponent({
       type: Object,
       default: () => ({})
     },
-    index: Number
+    index: Number,
+    dataSource: Array
   },
   setup(props) {
     const table = getTableInstance();
@@ -5317,6 +5318,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);
@@ -5342,7 +5346,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) {
@@ -5362,10 +5367,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();
     }
@@ -5429,7 +5438,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)) {
@@ -5463,7 +5472,8 @@ function renderEditCell(column) {
       value,
       record,
       column,
-      index
+      index,
+      dataSource
     });
   };
 }
@@ -5731,7 +5741,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;
     });
@@ -6725,6 +6735,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 {
@@ -6791,6 +6807,7 @@ const _sfc_main$A = defineComponent({
         rowKey: unref(getProps).rowKey,
         columns: unref(getViewColumns),
         tableLayout: "fixed",
+        class: unref(tableClass),
         customRow
       };
     });
@@ -6820,10 +6837,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
@@ -6970,6 +6984,8 @@ function useSource(opt) {
       search();
   }
   function search() {
+    if (!queryPage)
+      return;
     const { fetch } = useFetch(queryPage, baseUrl);
     loading.onQuerypage.value = true;
     fetch(toRaw(baseData)).then((rsp) => {
@@ -6992,6 +7008,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)
@@ -7000,10 +7018,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)
@@ -7012,6 +7034,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)
@@ -7112,7 +7136,7 @@ const _sfc_main$z = /* @__PURE__ */ defineComponent({
       ]),
       destroyOnClose: true
     });
-    const [registerForm, { getFormValues, setFormValues }] = useForm({
+    const [registerForm, { getFormValues, setFormValues, validate }] = useForm({
       ...props.formProps || {},
       schemas: props.schemas,
       mode: "dialog"
@@ -7126,8 +7150,11 @@ const _sfc_main$z = /* @__PURE__ */ defineComponent({
       var _a;
       if (props.curd && isFunction((_a = props.curd) == null ? void 0 : _a.onAdd)) {
         let obj = Object.assign({}, props.formsVal.value || {}, getFormValues());
-        let pro = obj.id ? props.curd.onUpdate(obj) : props.curd.onAdd(obj);
-        pro == null ? void 0 : pro.then((rsp) => closeModal());
+        validate().then((rsp) => {
+          let pro = obj.id ? props.curd.onUpdate(obj) : props.curd.onAdd(obj);
+          pro == null ? void 0 : pro.then((rsp2) => closeModal());
+        }).catch((err) => {
+        });
       }
     }
     return (_ctx, _cache) => {
@@ -8785,7 +8812,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.16",
+	"version": "1.0.20",
 	"keywords": [
 		"ui",
 		"dt-ui"