@dt-frames/ui 2.0.18 → 2.0.20

package/es/components/form/index.js

@@ -169,14 +169,6 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _export_sfc = (sfc, props) => {
-  const target = sfc.__vccOpts || sfc;
-  for (const [key, val] of props) {
-    target[key] = val;
-  }
-  return target;
-};
-const RadioButtonGroup = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/form/src/components/radioButton.vue"]]);
 const _hoisted_1$1 = { class: "input-with-dialog" };
 const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   __name: "formInputUseDialog",
@@ -213,15 +205,14 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
           key: 0,
           class: "i mdi:close-circle",
           onClick: clearProps
-        })) : createCommentVNode("v-if", true)
+        })) : createCommentVNode("", true)
       ]);
     };
   }
 });
-const DtFormInputDialog = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/form/src/components/formInputUseDialog.vue"]]);
 const components = {
   Input: Input$1,
-  InputWithDialog: DtFormInputDialog,
+  InputWithDialog: _sfc_main$3,
   InputTextArea: Input$1.TextArea,
   InputSearch: Input$1.Search,
   InputGroup: Input$1.Group,
@@ -230,7 +221,7 @@ const components = {
   TreeSelect,
   Radio,
   RadioGroup: Radio.Group,
-  RadioButtonGroup,
+  RadioButtonGroup: _sfc_main$4,
   Checkbox,
   CheckboxGroup: Checkbox.Group,
   AutoComplete,
@@ -282,7 +273,6 @@ const _sfc_main$2 = {
     }
   },
   setup(props, {
-    emit,
     slots
   }) {
     const {
@@ -359,7 +349,8 @@ const _sfc_main$2 = {
         name,
         colon = appConf.ui.form.colon,
         suffix,
-        prefix
+        prefix,
+        description
       } = props.schema;
       const {
         labelCol,
@@ -399,7 +390,9 @@ const _sfc_main$2 = {
           "style": "flex:1; width: 100%;"
         }, [getContent()]), !!suffix && createVNode("span", {
           "class": "suffix px-2"
-        }, [getSuffix()])])]
+        }, [getSuffix()])]), description && createVNode("div", {
+          "class": "opacity-50 text-12"
+        }, [description])]
       });
     }
     function renderLabel() {
@@ -409,7 +402,7 @@ const _sfc_main$2 = {
         subLabel,
         toolTipProps = {}
       } = props.schema;
-      const renderLabel2 = subLabel ? createVNode("span", null, [createTextVNode(" "), label, createTextVNode(" "), createVNode("span", {
+      const renderLabel2 = subLabel ? createVNode("span", null, [" ", label, createTextVNode(" "), createVNode("span", {
         "class": "text-secondary opacity-50"
       }, [createTextVNode("("), subLabel, createTextVNode(")")])]) : label;
       const _toolTip = isFunction(toolTip) ? toolTip(unref(getValues).model) : toolTip;
@@ -452,8 +445,9 @@ const _sfc_main$2 = {
           } else if (isArray(name)) {
             name.map((key) => props.setFormModel(key, value));
           }
-          if (_sProps && _sProps[eventKey])
+          if (_sProps && _sProps[eventKey]) {
             _sProps[eventKey](...args, formModel);
+          }
         }
       };
       for (let it in _sProps) {
@@ -474,10 +468,12 @@ const _sfc_main$2 = {
           disabled: itemDisabled = false
         } = unref(getComponentProps);
         let _disabled = !!gDisabled || itemDisabled;
-        if (isBoolean(disabled))
+        if (isBoolean(disabled)) {
           _disabled = disabled;
-        if (isFunction(disabled))
+        }
+        if (isFunction(disabled)) {
           _disabled = disabled(unref(getValues).model);
+        }
         return _disabled;
       });
       const getSize = () => {
@@ -496,10 +492,8 @@ const _sfc_main$2 = {
         disabled: unref(getDisable)
       };
       if (component === "Select") {
-        {
-          itemProps.showSearch = true;
-          itemProps.optionFilterProp = "label";
-        }
+        itemProps.showSearch = true;
+        itemProps.optionFilterProp = "label";
       }
       if (component !== "RangePicker") {
         itemProps.placeholder = unref(getComponentProps)?.placeholder || createPlaceholder(component);
@@ -544,8 +538,9 @@ const _sfc_main$2 = {
         dynamicRules,
         required
       } = props.schema;
-      if (!component)
+      if (!component) {
         return [];
+      }
       if (isFunction(dynamicRules)) {
         return dynamicRules(unref(getValues).model);
       }
@@ -553,8 +548,9 @@ 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))
+        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);
@@ -655,7 +651,6 @@ const _sfc_main$2 = {
     };
   }
 };
-const DtFormItem = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/form/src/components/FormItem.vue"]]);
 const _hoisted_1 = {
   key: 0,
   className: "preIcon pr-1"
@@ -822,18 +817,18 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                     icon: withCtx(() => [
                       button.preIcon ? withDirectives((openBlock(), createElementBlock("span", _hoisted_1, null, 512)), [
                         [_directive_icon, button.preIcon]
-                      ]) : createCommentVNode("v-if", true)
+                      ]) : createCommentVNode("", true)
                     ]),
                     default: withCtx(() => [
                       createTextVNode(" " + toDisplayString(unref(t)(button.label)) + " ", 1),
                       button.postIcon ? withDirectives((openBlock(), createElementBlock("span", _hoisted_2, null, 512)), [
                         [_directive_icon, button.postIcon]
-                      ]) : createCommentVNode("v-if", true)
+                      ]) : createCommentVNode("", true)
                     ]),
                     _: 2
                   }, 1032, ["type", "class", "loading", "disabled", "onClick"])), [
                     [_directive_auth, getAuth(button.auth)]
-                  ]) : createCommentVNode("v-if", true)
+                  ]) : createCommentVNode("", true)
                 ], 64);
               }), 256)),
               unref(showAdvanceRef) ? (openBlock(), createBlock(_component_AButton, {
@@ -843,24 +838,22 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                 onClick: toggleAdvanced
               }, {
                 default: withCtx(() => [
-                  createCommentVNode(" \u6536\u8D77 | \u5C55\u5F00 "),
                   createElementVNode("span", _hoisted_3, toDisplayString(advancedRef.value ? unref(t)("UI.ADVANCED") : unref(t)("UI.EXPAND")), 1),
                   createElementVNode("span", {
                     class: normalizeClass(unref(getAdvanceClass))
                   }, _hoisted_5, 2)
                 ]),
                 _: 1
-              })) : createCommentVNode("v-if", true)
+              })) : createCommentVNode("", true)
             ]),
             _: 1
           }, 8, ["style"])
         ]),
         _: 1
-      }, 16)) : createCommentVNode("v-if", true);
+      }, 16)) : createCommentVNode("", true);
     };
   }
 });
-const DtFormButtons = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/form/src/components/FormButtons.vue"]]);
 const SEARCH_BTN_NAME = "UI.SEARCH";
 const RESET_BTN_NAME = "UI.RESET";
 const SEARCH_BTNS = [
@@ -961,22 +954,22 @@ function useFormEvents({
     schemaRef.value = schemaList;
   }
   function _removeSchemaByName(name, schemaList) {
-    const index2 = schemaList.findIndex((schema) => schema.name === name);
-    if (index2 !== -1) {
+    const index = schemaList.findIndex((schema) => schema.name === name);
+    if (index !== -1) {
       delete formModel[name];
-      schemaList.splice(index2, 1);
+      schemaList.splice(index, 1);
     }
   }
   function appendFormItems(schema, prefixName, first = false) {
     const schemaList = cloneDeep(unref(getSchema));
-    const index2 = schemaList.findIndex((schema2) => schema2.name === prefixName);
-    if (!prefixName || index2 === -1 || first) {
+    const index = schemaList.findIndex((schema2) => schema2.name === prefixName);
+    if (!prefixName || index === -1 || first) {
       first ? schemaList.unshift(...schema) : schemaList.push(...schema);
       schemaRef.value = schemaList;
       return;
     }
-    if (index2 !== -1) {
-      schemaList.splice(index2 + 1, 0, ...schema);
+    if (index !== -1) {
+      schemaList.splice(index + 1, 0, ...schema);
     }
     schemaRef.value = schemaList;
   }
@@ -1102,7 +1095,7 @@ function useFormValues({
           if (isArray(defaultValue2)) {
             let vals = defaultValue2.map((it) => format ? dayjs(it, format) : dayjs(it));
             if (names.length > 1) {
-              names.map((key, index2) => obj[key] = vals[index2] ?? null);
+              names.map((key, index) => obj[key] = vals[index] ?? null);
             } else {
               obj[names[0]] = vals;
             }
@@ -1111,11 +1104,11 @@ function useFormValues({
           }
         } else {
           if (names.length > 1) {
-            names.forEach((key, index2) => {
-              if (!defaultValue2 || defaultValue2.length - 1 < index2) {
+            names.forEach((key, index) => {
+              if (!defaultValue2 || defaultValue2.length - 1 < index) {
                 obj[key] = null;
               } else {
-                obj[key] = defaultValue2[index2];
+                obj[key] = defaultValue2[index];
               }
             });
           } else {
@@ -1124,7 +1117,7 @@ function useFormValues({
         }
       } else {
         names.map((it) => {
-          if (component === "TreeSelect" || (mode === "multiple" || treeCheckable) || component === "Select" && mode === "multiple") {
+          if (component === "TreeSelect" && (mode === "multiple" || treeCheckable) || component === "Select" && mode === "multiple") {
             obj[it] = [];
           } else {
             obj[it] = null;
@@ -1153,8 +1146,8 @@ function useFormActions(opt) {
     } = unref(getProps);
     let schema = [...schemas];
     if (showAdvancedButton) {
-      schema = schemas.reduce((t, it, index2) => {
-        if (index2 > minShowColumn - 1)
+      schema = schemas.reduce((t, it, index) => {
+        if (index > minShowColumn - 1)
           it.isAdvanced = isAdvanced;
         t.push(it);
         return t;
@@ -1338,7 +1331,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       formModel[key] = value;
       const { validateTrigger } = unref(getBindValue);
       if (!validateTrigger || validateTrigger === "change") {
-        validateFields([key]).catch((err) => {
+        validateFields([key]).catch(() => {
         });
       }
     }
@@ -1423,7 +1416,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return {
         colspan,
         style: {
-          marginLeft: "auto"
+          marginLeft: showAdvancedButton ? "auto" : ""
         },
         ...{
           showAdvancedButton,
@@ -1459,10 +1452,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     );
     watch(
       () => unref(getProps).model,
-      (v) => {
+      () => {
         const { model } = unref(getProps);
-        if (!model || !Object.keys(model).length)
+        if (!model || !Object.keys(model).length) {
           return;
+        }
         setFormValues(model);
       },
       {
@@ -1487,14 +1481,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           } }), {
             default: withCtx(() => [
               (openBlock(true), createElementBlock(Fragment, null, renderList(unref(getSchema), (schema) => {
-                return openBlock(), createBlock(unref(DtFormItem), {
+                return openBlock(), createBlock(unref(_sfc_main$2), {
                   key: schema.name,
                   schema,
-                  formProps: unref(getProps),
-                  formModel,
-                  defaultValues: defaultValue.value,
-                  setFormModel,
-                  formActionType: formActionMethods
+                  "form-props": unref(getProps),
+                  "form-model": formModel,
+                  "default-values": defaultValue.value,
+                  "set-form-model": setFormModel,
+                  "form-action-type": formActionMethods
                 }, createSlots({ _: 2 }, [
                   renderList(Object.keys(_ctx.$slots), (item) => {
                     return {
@@ -1504,9 +1498,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                       ])
                     };
                   })
-                ]), 1032, ["schema", "formProps", "formModel", "defaultValues"]);
+                ]), 1032, ["schema", "form-props", "form-model", "default-values"]);
               }), 128)),
-              unref(getActionsProps).buttonList?.length ? (openBlock(), createBlock(unref(DtFormButtons), mergeProps({ key: 0 }, unref(getActionsProps), { onHandleMethod: unref(handleMethod) }), null, 16, ["onHandleMethod"])) : createCommentVNode("v-if", true)
+              unref(getActionsProps).buttonList?.length ? (openBlock(), createBlock(unref(_sfc_main$1), mergeProps({ key: 0 }, unref(getActionsProps), { onHandleMethod: unref(handleMethod) }), null, 16, ["onHandleMethod"])) : createCommentVNode("", true)
             ]),
             _: 3
           }, 16)
@@ -1516,7 +1510,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/form/src/index.vue"]]);
 function useForm(props) {
   const formRef = ref(null);
   const loadedRef = ref(false);
@@ -1588,7 +1581,7 @@ function useForm(props) {
   return [register, methods];
 }
 export {
-  index as DtForm,
-  DtFormButtons,
+  _sfc_main as DtForm,
+  _sfc_main$1 as DtFormButtons,
   useForm
 };

package/es/components/form/src/components/FormItem.d.ts

@@ -71,7 +71,7 @@ declare const _sfc_main: {
                     type: NumberConstructor;
                 };
                 size: {
-                    type: PropType<"small" | "large" | "middle">;
+                    type: PropType<"large" | "small" | "middle">;
                 };
                 disabled: {
                     type: BooleanConstructor;
@@ -151,8 +151,7 @@ declare const _sfc_main: {
             type: PropType<FormActionType>;
         };
     };
-    setup(props: any, { emit, slots }: {
-        emit: any;
+    setup(props: any, { slots }: {
         slots: any;
     }): () => JSX.Element;
 };

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

@@ -1,7 +1,7 @@
-import { Recordable } from "@dt-frames/core";
-import { PropType, Ref } from "vue";
-import { ButtonProps, ColEx, FormSchema } from "./types/form.type";
-import { FormActionType } from "./types/actions.type";
+import { Recordable } from '@dt-frames/core';
+import { PropType, Ref } from 'vue';
+import { ButtonProps, ColEx, FormSchema } from './types/form.type';
+import { FormActionType } from './types/actions.type';
 export declare const BasicProps: {
     mode: {
         type: PropType<"search" | "dialog">;
@@ -16,7 +16,7 @@ export declare const BasicProps: {
         default: () => {};
     };
     layout: {
-        type: PropType<"inline" | "horizontal" | "vertical">;
+        type: PropType<"vertical" | "inline" | "horizontal">;
         default: string;
     };
     labelWidth: {
@@ -41,8 +41,8 @@ export declare const BasicProps: {
     };
     rowProps: {
         type: PropType<Partial<import("vue").ExtractPropTypes<{
-            align: PropType<"bottom" | "top" | "stretch" | "middle">;
-            justify: PropType<"space-around" | "space-between" | "center" | "end" | "start">;
+            align: PropType<"middle" | "top" | "bottom" | "stretch">;
+            justify: PropType<"center" | "space-around" | "space-between" | "end" | "start">;
             prefixCls: StringConstructor;
             gutter: {
                 type: PropType<import("ant-design-vue/lib/grid/Row").Gutter | [import("ant-design-vue/lib/grid/Row").Gutter, import("ant-design-vue/lib/grid/Row").Gutter]>;

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

@@ -56,6 +56,7 @@ declare type Schema<ComponentType, T> = {
     wrapperCol?: Partial<ColEx>;
     isAdvanced?: boolean;
     extraName?: string[];
+    description?: String;
 };
 export declare type FormSchema = Schema<'Input', Input> | Schema<'InputWithDialog', InputWithDialog> | Schema<'InputGroup', InputGroup> | Schema<'InputPassword', InputPassword> | Schema<'InputSearch', InputSearch> | Schema<'InputTextArea', InputTextArea> | Schema<'InputNumber', InputNumber> | Schema<'Select', Select> | Schema<'TreeSelect', TreeSelect> | Schema<'Radio', Radio> | Schema<'RadioButtonGroup', Radio> | Schema<'RadioGroup', RadioGroup> | Schema<'Checkbox', Checkbox> | Schema<'CheckboxGroup', CheckboxGroup> | Schema<'AutoComplete', Recordable> | Schema<'Cascader', Cascader> | Schema<'DatePicker', DatePicker> | Schema<'MonthPicker', DatePicker> | Schema<'RangePicker', RangePicker> | Schema<'WeekPicker', DatePicker> | Schema<'TimePicker', TimePicker> | Schema<'Switch', Switch> | Schema<'Slider', {
     disabled?: boolean;

package/es/components/source/index.js

@@ -135,6 +135,8 @@ function useSource(props) {
   const { t } = useI18n("UI");
   const { confirm, message } = useMessage();
   const { appConf } = useAppStore();
+  let okCode = appConf?.http?.okCode;
+  let _okCode = isArray(okCode) ? okCode : [okCode];
   const { baseUrl, api: orgApi, exportName, queryAfterUpdate, beforeUpdate, afterUpdate, authPrefix } = props;
   const pagination = ref({
     current: appConf?.ui?.table?.defaultPageNo || 1,
@@ -202,7 +204,7 @@ function useSource(props) {
         pagination.value = {
           current,
           pageSize: size || appConf?.ui?.table?.defaultPageSize,
-          total: 100
+          total
         };
       }
     } catch (err) {
@@ -278,7 +280,7 @@ function useSource(props) {
         loading.onAdd.value = true;
         try {
           const result = await fetch(api.add, { ...model }, false);
-          if (result?.code === appConf?.http?.okCode) {
+          if (_okCode.includes(result?.code)) {
             message.success(t("ADD_SUCCESS"));
             curdInstance && curdInstance.closeModal();
             if (queryAfterUpdate !== false)
@@ -294,7 +296,7 @@ function useSource(props) {
         loading.onUpdate.value = true;
         try {
           const result = await fetch(api.update, { ...model }, false);
-          if (result?.code === appConf?.http?.okCode) {
+          if (_okCode.includes(result?.code)) {
             message.success(t("UPDATE_SUCCESS"));
             curdInstance && curdInstance.closeModal();
             if (queryAfterUpdate !== false)
@@ -332,7 +334,7 @@ function useSource(props) {
       iconType: "warning",
       onOk() {
         fetch(api.deletes, toRaw(_ids), false).then((rsp) => {
-          if (rsp?.code === appConf?.http?.okCode) {
+          if (_okCode.includes(rsp?.code)) {
             message.success((isSingleDelete ? "" : t("MULTIFY")) + t("DELETE_SUCCESS"));
             !isSingleDelete && tableInstance.clearSelectedRowKeys();
             if (queryAfterUpdate !== false)