@dt-frames/ui 2.0.4 → 2.0.5

package/es/components/form/index.d.ts

@@ -13,7 +13,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
         default: () => {};
     };
     layout: {
-        type: import("vue").PropType<"vertical" | "inline" | "horizontal">;
+        type: import("vue").PropType<"vertical" | "horizontal" | "inline">;
         default: string;
     };
     labelWidth: {
@@ -57,7 +57,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
         default: () => {};
     };
     size: {
-        type: import("vue").PropType<"middle" | "small" | "large">;
+        type: import("vue").PropType<"small" | "middle" | "large">;
         default: string;
     };
     disabled: {
@@ -76,10 +76,6 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
         type: BooleanConstructor;
         default: boolean;
     };
-    alwaysShowLines: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
     minShowColumn: {
         type: NumberConstructor;
         default: number;
@@ -149,7 +145,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                 default: () => {};
             };
             layout: {
-                type: import("vue").PropType<"vertical" | "inline" | "horizontal">;
+                type: import("vue").PropType<"vertical" | "horizontal" | "inline">;
                 default: string;
             };
             labelWidth: {
@@ -193,7 +189,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                 default: () => {};
             };
             size: {
-                type: import("vue").PropType<"middle" | "small" | "large">;
+                type: import("vue").PropType<"small" | "middle" | "large">;
                 default: string;
             };
             disabled: {
@@ -212,10 +208,6 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                 type: BooleanConstructor;
                 default: boolean;
             };
-            alwaysShowLines: {
-                type: BooleanConstructor;
-                default: boolean;
-            };
             minShowColumn: {
                 type: NumberConstructor;
                 default: number;
@@ -291,7 +283,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
             default: () => {};
         };
         layout: {
-            type: import("vue").PropType<"vertical" | "inline" | "horizontal">;
+            type: import("vue").PropType<"vertical" | "horizontal" | "inline">;
             default: string;
         };
         labelWidth: {
@@ -335,7 +327,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
             default: () => {};
         };
         size: {
-            type: import("vue").PropType<"middle" | "small" | "large">;
+            type: import("vue").PropType<"small" | "middle" | "large">;
             default: string;
         };
         disabled: {
@@ -354,10 +346,6 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
             type: BooleanConstructor;
             default: boolean;
         };
-        alwaysShowLines: {
-            type: BooleanConstructor;
-            default: boolean;
-        };
         minShowColumn: {
             type: NumberConstructor;
             default: number;
@@ -2191,8 +2179,8 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                     validator?: (rule: import("ant-design-vue/lib/form").RuleObject, value: any, callback: (error?: string) => void) => void | Promise<void>;
                 } | any;
                 required?: boolean;
-                trigger?: "blur" | "change" | ("blur" | "change")[];
                 validator?: (rule: import("ant-design-vue/lib/form").RuleObject, value: any, callback: (error?: string) => void) => void | Promise<void>;
+                trigger?: "blur" | "change" | ("blur" | "change")[];
                 transform?: (value: any) => any;
                 warningOnly?: boolean;
                 message?: (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
@@ -2230,6 +2218,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                 validateTrigger?: string | string[];
             };
             required?: boolean;
+            validator?: (rule: import("ant-design-vue/lib/form").RuleObject, value: any, callback: (error?: string) => void) => void | Promise<void>;
             trigger?: "blur" | "change" | ("blur" & ["change", "blur"]) | ("change" & ["change", "blur"]) | (("blur" | "change")[] & "blur") | (("blur" | "change")[] & "change") | {
                 [x: number]: "blur" | "change";
                 length: 2;
@@ -2301,7 +2290,6 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                 0: "change";
                 1: "blur";
             };
-            validator?: (rule: import("ant-design-vue/lib/form").RuleObject, value: any, callback: (error?: string) => void) => void | Promise<void>;
             transform?: (value: any) => any;
             warningOnly?: boolean;
             message?: (string | number | boolean | void | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
@@ -2406,7 +2394,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
             default: () => {};
         };
         layout: {
-            type: import("vue").PropType<"vertical" | "inline" | "horizontal">;
+            type: import("vue").PropType<"vertical" | "horizontal" | "inline">;
             default: string;
         };
         labelWidth: {
@@ -2450,7 +2438,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
             default: () => {};
         };
         size: {
-            type: import("vue").PropType<"middle" | "small" | "large">;
+            type: import("vue").PropType<"small" | "middle" | "large">;
             default: string;
         };
         disabled: {
@@ -2469,10 +2457,6 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
             type: BooleanConstructor;
             default: boolean;
         };
-        alwaysShowLines: {
-            type: BooleanConstructor;
-            default: boolean;
-        };
         minShowColumn: {
             type: NumberConstructor;
             default: number;
@@ -2540,7 +2524,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
             default: () => {};
         };
         layout: {
-            type: import("vue").PropType<"vertical" | "inline" | "horizontal">;
+            type: import("vue").PropType<"vertical" | "horizontal" | "inline">;
             default: string;
         };
         labelWidth: {
@@ -2584,7 +2568,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
             default: () => {};
         };
         size: {
-            type: import("vue").PropType<"middle" | "small" | "large">;
+            type: import("vue").PropType<"small" | "middle" | "large">;
             default: string;
         };
         disabled: {
@@ -2603,10 +2587,6 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
             type: BooleanConstructor;
             default: boolean;
         };
-        alwaysShowLines: {
-            type: BooleanConstructor;
-            default: boolean;
-        };
         minShowColumn: {
             type: NumberConstructor;
             default: number;
@@ -2684,7 +2664,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                 default: () => {};
             };
             layout: {
-                type: import("vue").PropType<"vertical" | "inline" | "horizontal">;
+                type: import("vue").PropType<"vertical" | "horizontal" | "inline">;
                 default: string;
             };
             labelWidth: {
@@ -2728,7 +2708,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                 default: () => {};
             };
             size: {
-                type: import("vue").PropType<"middle" | "small" | "large">;
+                type: import("vue").PropType<"small" | "middle" | "large">;
                 default: string;
             };
             disabled: {
@@ -2747,10 +2727,6 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                 type: BooleanConstructor;
                 default: boolean;
             };
-            alwaysShowLines: {
-                type: BooleanConstructor;
-                default: boolean;
-            };
             minShowColumn: {
                 type: NumberConstructor;
                 default: number;
@@ -2835,7 +2811,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                         default: () => {};
                     };
                     layout: {
-                        type: import("vue").PropType<"vertical" | "inline" | "horizontal">;
+                        type: import("vue").PropType<"vertical" | "horizontal" | "inline">;
                         default: string;
                     };
                     labelWidth: {
@@ -2879,7 +2855,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                         default: () => {};
                     };
                     size: {
-                        type: import("vue").PropType<"middle" | "small" | "large">;
+                        type: import("vue").PropType<"small" | "middle" | "large">;
                         default: string;
                     };
                     disabled: {
@@ -2898,10 +2874,6 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
                         type: BooleanConstructor;
                         default: boolean;
                     };
-                    alwaysShowLines: {
-                        type: BooleanConstructor;
-                        default: boolean;
-                    };
                     minShowColumn: {
                         type: NumberConstructor;
                         default: number;
@@ -3070,7 +3042,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
         default: () => {};
     };
     layout: {
-        type: import("vue").PropType<"vertical" | "inline" | "horizontal">;
+        type: import("vue").PropType<"vertical" | "horizontal" | "inline">;
         default: string;
     };
     labelWidth: {
@@ -3114,7 +3086,7 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
         default: () => {};
     };
     size: {
-        type: import("vue").PropType<"middle" | "small" | "large">;
+        type: import("vue").PropType<"small" | "middle" | "large">;
         default: string;
     };
     disabled: {
@@ -3133,10 +3105,6 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
         type: BooleanConstructor;
         default: boolean;
     };
-    alwaysShowLines: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
     minShowColumn: {
         type: NumberConstructor;
         default: number;
@@ -3187,10 +3155,11 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
 }>> & {
     onRegister?: (...args: any[]) => any;
 }, {
+    size: "small" | "middle" | "large";
     mode: "search" | "dialog";
     autoFetch: boolean;
     model: {};
-    layout: "vertical" | "inline" | "horizontal";
+    layout: "vertical" | "horizontal" | "inline";
     labelWidth: string | number;
     enLabelWidth: string | number;
     labelAlign: "left" | "right";
@@ -3198,12 +3167,10 @@ declare const DtForm: import('../../utils/withInstall').SFCWithInstall<import("v
     wrapperCol: {};
     rowProps: {};
     colProps: {};
-    size: "middle" | "small" | "large";
     disabled: boolean;
     compact: boolean;
     schemas: import("./src/types/form.type").FormSchema[];
     autoSearchOnEnter: boolean;
-    alwaysShowLines: boolean;
     minShowColumn: number;
     showAdvancedButton: boolean;
     allowClear: boolean;

package/es/components/form/index.js

@@ -353,12 +353,14 @@ function useMultipleTab() {
   const { getRouteReuseConf } = useThemeStore();
   const getShowMultipleTab = computed(() => getRouteReuseConf.show);
   const getShowQuick = computed(() => getRouteReuseConf.showQuick);
+  const getMultipleTabPosIsTop = computed(() => getRouteReuseConf.position === "top");
   const getShowRedo = computed(() => getRouteReuseConf.showRedo);
   const getCanCache = computed(() => getRouteReuseConf.cache);
   const getCanDrag = computed(() => getRouteReuseConf.canDrag);
   return {
     getShowMultipleTab,
     getShowQuick,
+    getMultipleTabPosIsTop,
     getShowRedo,
     getCanCache,
     getCanDrag
@@ -379,7 +381,7 @@ function useHeader() {
     getIsTopMenu,
     getIsMixSidebar
   } = useMenu();
-  const { getShowMultipleTab } = useMultipleTab();
+  const { getShowMultipleTab, getMultipleTabPosIsTop } = useMultipleTab();
   const getHeaderTheme = computed(() => getHeaderConf.theme);
   const getFixed = computed(() => getHeaderConf.fixed);
   const getShowHeaderLogo = computed(() => unref(getShowLogo) && !unref(getIsSidebarType) && !unref(getIsMixSidebar));
@@ -405,7 +407,8 @@ function useHeader() {
   const getHeaderHeight = computed(() => {
     let height = 0;
     height += HEADER_HEIGHT;
-    if (unref(getShowMultipleTab) && !unref(getSplit)) {
+    console.log(getMultipleTabPosIsTop);
+    if (unref(getShowMultipleTab) && !unref(getSplit) && !unref(getMultipleTabPosIsTop)) {
       height += TABS_HEIGHT;
     }
     return height;
@@ -599,14 +602,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",
@@ -642,15 +637,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,
-  InputWithDialog: DtFormInputDialog,
+  InputWithDialog: _sfc_main$3,
   InputTextArea: Input.TextArea,
   InputSearch: Input.Search,
   InputGroup: Input.Group,
@@ -659,7 +653,7 @@ const components = {
   TreeSelect,
   Radio,
   RadioGroup: Radio.Group,
-  RadioButtonGroup,
+  RadioButtonGroup: _sfc_main$4,
   Checkbox,
   CheckboxGroup: Checkbox.Group,
   AutoComplete,
@@ -1044,7 +1038,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"
@@ -1167,18 +1160,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, button.auth]
-                  ]) : createCommentVNode("v-if", true)
+                  ]) : createCommentVNode("", true)
                 ], 64);
               }), 256)),
               unref(showAdvanceRef) ? (openBlock(), createBlock(_component_AButton, {
@@ -1188,24 +1181,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 = [
@@ -1499,7 +1490,7 @@ function useFormActions(opt) {
     const {
       schemas,
       minShowColumn = appConf.ui.form?.minShowColumn || 2,
-      showAdvancedButton = appConf.ui.form?.showAdvancedButton || true
+      showAdvancedButton = true
     } = unref(getProps);
     let schema = [...schemas];
     if (showAdvancedButton) {
@@ -1829,7 +1820,7 @@ 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),
@@ -1848,7 +1839,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   })
                 ]), 1032, ["schema", "formProps", "formModel", "defaultValues"]);
               }), 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)
@@ -1858,7 +1849,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Forms = /* @__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);
@@ -1935,7 +1925,7 @@ const withInstall = (comp) => {
   };
   return comp;
 };
-const DtForm = withInstall(Forms);
+const DtForm = withInstall(_sfc_main);
 export {
   DtForm,
   useForm

package/es/components/form/index.less

@@ -16,6 +16,10 @@
 		}
 	}
 
+	.ant-form-item-control-input .ant-form-item-control-input-content{
+		height: 100%;
+	}
+
 	&__compact {
 		.ant-form-item-control-input-content .ant-form-item {
 			margin-bottom: 0;
@@ -81,7 +85,7 @@
 			height: 30px;
 		}
 
-		.ant-input-affix-wrapper-sm{
+		.ant-input-affix-wrapper-sm:not(.ant-input-affix-wrapper-textarea-with-clear-btn){
 			height: 30px;
 
 			.ant-input-sm{
@@ -160,7 +164,7 @@
 			font-size: 13px;
 		}
 
-		.ant-input-affix-wrapper{
+		.ant-input-affix-wrapper:not(.ant-input-affix-wrapper-textarea-with-clear-btn){
 			height: 32px;
 	
 			.ant-input{
@@ -224,7 +228,7 @@
 			font-size: 14px;
 		}
 
-		.ant-input-affix-wrapper-lg{
+		.ant-input-affix-wrapper-lg:not(.ant-input-affix-wrapper-textarea-with-clear-btn){
 			height: 34px;
 	
 			.ant-input{
@@ -292,6 +296,7 @@
 	.ant-input-number {
 		width: 100%;
 		height: 100%;
+		font-size: 13px;
 		&.ant-input-number-sm{
 			line-height: 28px;
     		font-size: 12px;