qidian-vue-ui 1.2.102 → 1.2.103

package/dist/components/crud/search/index.vue.d.ts

@@ -28,7 +28,6 @@ declare const __VLS_component: import("vue").DefineComponent<QdCrudSearchProps,
     disabled: boolean;
     readonly: boolean;
     grid: import("../..").QdGridItemProps;
-    labelAlign: "left" | "right" | "top";
     labelWidth: string | number;
     preventSubmitDefault: boolean;
     resetType: "empty" | "initial";

package/dist/components/crud/search/index.vue2.mjs

@@ -43,6 +43,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     statusIcon: { type: Boolean },
     submitWithWarningMessage: { type: Boolean },
     onValidate: { type: Function },
+    columns: {},
     gutter: {},
     grid: {}
   }, qdCrudSearchProps),

package/dist/components/crud/search/props.d.ts

@@ -25,7 +25,6 @@ export declare const qdCrudSearchProps: {
     readonly data: () => any;
     readonly disabled: undefined;
     readonly readonly: undefined;
-    readonly labelAlign: "top";
     readonly labelWidth: "auto";
     readonly requiredMarkPosition: "left";
     readonly resetType: "initial";

package/dist/components/crud/table/index.vue2.mjs

@@ -87,6 +87,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     loadingWithData: {
       type: Boolean
     },
+    disableHorizontalScroll: {
+      type: Boolean
+    },
     beforeDragSort: {
       type: Function
     },

package/dist/components/crud/tabs-table/index.vue.d.ts

@@ -190,6 +190,7 @@ declare const _default: <D extends TableRowData = TableRowData, R = unknown, P =
                 onSortChange?: ((sort: import("tdesign-vue-next").TableSort, options: import("tdesign-vue-next").SortOptions<D>) => void) | undefined;
                 selectType?: "single" | "multiple" | undefined;
                 headerBg?: boolean | undefined;
+                disableHorizontalScroll?: boolean | undefined;
                 cacheKey?: string | ((params?: unknown[] | undefined) => string) | undefined;
                 cacheTime?: number | undefined;
                 pollingInterval?: number | import("vue").Ref<number, number> | undefined;

package/dist/components/crud/tabs-table/index.vue2.mjs

@@ -43,6 +43,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     headerBg: { type: Boolean },
     tree: {},
     loadingWithData: { type: Boolean },
+    disableHorizontalScroll: { type: Boolean },
     beforeDragSort: { type: Function },
     defaultExpandedTreeNodes: {},
     treeExpandAndFoldIcon: {},

package/dist/components/dialog/form.vue.mjs

@@ -41,6 +41,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     submitWithWarningMessage: { type: Boolean },
     onReset: { type: Function },
     onValidate: { type: Function },
+    columns: {},
     gutter: {},
     grid: {},
     visible: { type: Boolean }

package/dist/components/dialog/props.d.ts

@@ -34,20 +34,10 @@ export declare const qdDialogFormProps: {
         readonly autoHeight: true;
     };
     readonly gutter: () => number[];
-    readonly grid: () => {
-        col: {
-            xs: number;
-            sm: number;
-            md: number;
-            lg: number;
-            xl: number;
-            xxl: number;
-        };
-    };
+    readonly grid: () => {};
     readonly data: () => any;
     readonly disabled: undefined;
     readonly readonly: undefined;
-    readonly labelAlign: "top";
     readonly labelWidth: "auto";
     readonly requiredMarkPosition: "left";
     readonly resetType: "initial";

package/dist/components/form/index.css

@@ -1,26 +1,54 @@
-.qd-form--descriptions[data-v-ac7409ce] .qd-grid {
+.qd-form--descriptions[data-v-7b85acc1] .qd-grid {
   border-top: 1px solid var(--td-component-border);
   border-left: 1px solid var(--td-component-border);
 }
-.qd-form--descriptions[data-v-ac7409ce] .qd-grid-item {
+.qd-form--descriptions[data-v-7b85acc1] .qd-grid-item {
   border-right: 1px solid var(--td-component-border);
   border-bottom: 1px solid var(--td-component-border);
 }
-.qd-form--descriptions[data-v-ac7409ce] .t-form__item {
+.qd-form--descriptions[data-v-7b85acc1] .qd-grid-item:has(.t-form__item > .t-form__label--top) {
+  display: grid;
+  grid-row: span 2 !important;
+  grid-template-rows: subgrid;
+}
+.qd-form--descriptions[data-v-7b85acc1] .t-form__item {
   display: flex;
   align-items: stretch;
   height: 100%;
 }
-.qd-form--descriptions[data-v-ac7409ce] .t-form__label {
+.qd-form--descriptions[data-v-7b85acc1] .t-form__item:has(> .t-form__label--top) {
+  display: contents;
+}
+.qd-form--descriptions[data-v-7b85acc1] .t-form__item:has(> .t-form__label--top) .t-form__controls {
+  height: auto;
+  min-height: min-content;
+}
+.qd-form--descriptions[data-v-7b85acc1] .t-form__item:has(> .t-form__label--top) .t-form__controls-content {
+  min-height: min-content;
+  white-space: normal;
+}
+.qd-form--descriptions[data-v-7b85acc1] .t-form__label {
   display: flex;
   flex-direction: column;
   justify-content: center;
   background-color: var(--td-bg-color-secondarycontainer);
   padding: var(--td-comp-paddingLR-m) var(--td-comp-paddingLR-l);
   height: 100%;
+}
+.qd-form--descriptions[data-v-7b85acc1] .t-form__label:not(.t-form__label--top):not([style*='width: 100%']) {
   border-right: 1px solid var(--td-component-border);
 }
-.qd-form--descriptions[data-v-ac7409ce] .t-form__controls {
+.qd-form--descriptions[data-v-7b85acc1] .t-form__label--top {
+  border-bottom: 1px solid var(--td-component-border);
+  align-items: center;
+  height: auto;
+  white-space: normal;
+}
+.qd-form--descriptions[data-v-7b85acc1] .t-form__label--top + .t-form__controls > .t-form__controls-content {
+  justify-content: center;
+  text-align: center;
+}
+.qd-form--descriptions[data-v-7b85acc1] .t-form__controls {
   flex: 1 1 0;
   overflow: hidden;
   display: flex;
@@ -30,3 +58,6 @@
   margin-left: 0 !important;
   height: 100%;
 }
+.qd-form--descriptions[data-v-7b85acc1] .t-form__controls:has(> .t-form__controls-content:empty) {
+  padding: 0 !important;
+}

package/dist/components/form/index.vue.d.ts

@@ -12,16 +12,8 @@ declare const _default: <FD extends Data = Data>(__VLS_props: NonNullable<Awaite
         }) => any;
     } & {
         default?: (props: {
-            grid: {
-                col: {
-                    xs: number;
-                    sm: number;
-                    md: number;
-                    lg: number;
-                    xl: number;
-                    xxl: number;
-                };
-            } & import("..").QdGridItemProps;
+            columns: number | undefined;
+            grid: import("..").QdGridItemProps;
             gutter: number | import("tdesign-vue-next").GutterObject | (number | import("tdesign-vue-next").GutterObject)[];
         }) => any;
     } & {

package/dist/components/form/index.vue.mjs

@@ -2,7 +2,7 @@ import './index.css'
 import _sfc_main from "./index.vue2.mjs";
 /* empty css            */
 import _export_sfc from "../../_virtual/_plugin-vue_export-helper.mjs";
-const QdForm = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ac7409ce"]]);
+const QdForm = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-7b85acc1"]]);
 export {
   QdForm as default
 };

package/dist/components/form/index.vue2.mjs

@@ -42,6 +42,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     submitWithWarningMessage: { type: Boolean },
     onReset: { type: Function },
     onValidate: { type: Function },
+    columns: {},
     gutter: {},
     grid: {}
   }, qdFormProps),
@@ -85,6 +86,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     let submitResolver;
     const reProps = computed(() => {
       const {
+        columns,
         grid,
         gutter,
         descriptions,
@@ -105,13 +107,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         externalLoad,
         formOptions: {
           ...formOptions,
-          labelAlign: descriptions ? "left" : formOptions.labelAlign,
+          labelAlign: !formOptions.labelAlign && descriptions ? "left" : formOptions.labelAlign ?? "top",
           scrollToFirstError: submitShowErrorMessage.value === false ? "" : submitScrollToFirstError.value ?? scrollToFirstError,
           onReset: reOnReset
         },
         formItems: items,
         gridOptions: {
-          grid: merge({}, qdFormGrid, grid),
+          columns,
+          grid: columns ? grid : merge({}, qdFormGrid, grid),
           gutter: descriptions ? 0 : gutter
         },
         onSubmit,
@@ -236,6 +239,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ref: "form",
         class: [
           "qd-form",
+          reProps.value.formOptions.labelAlign ? `qd-form--label-${reProps.value.formOptions.labelAlign}` : "",
           _ctx.$slots.footer ? "qd-form--has-footer" : "",
           reProps.value.descriptions ? "qd-form--descriptions" : ""
         ]

package/dist/components/form/props.d.ts

@@ -11,20 +11,10 @@ export declare const qdFormGrid: {
 };
 export declare const qdFormProps: {
     readonly gutter: () => number[];
-    readonly grid: () => {
-        col: {
-            xs: number;
-            sm: number;
-            md: number;
-            lg: number;
-            xl: number;
-            xxl: number;
-        };
-    };
+    readonly grid: () => {};
     readonly data: () => any;
     readonly disabled: undefined;
     readonly readonly: undefined;
-    readonly labelAlign: "top";
     readonly labelWidth: "auto";
     readonly requiredMarkPosition: "left";
     readonly resetType: "initial";

package/dist/components/form/props.mjs

@@ -11,11 +11,11 @@ const qdFormGrid = {
 };
 const qdFormProps = {
   gutter: () => qdFormGutter,
-  grid: () => qdFormGrid,
+  grid: () => ({}),
   data: () => ({}),
   disabled: void 0,
   readonly: void 0,
-  labelAlign: "top",
+  // labelAlign: 'top',
   labelWidth: "auto",
   requiredMarkPosition: "left",
   resetType: "initial",

package/dist/components/grid/config.d.ts

@@ -11,5 +11,6 @@ export declare const DEFAULT_BREAKPOINTS: {
     xl: number;
     xxl: number;
 };
+export declare const DEFAULT_COLUMNS = 12;
 export declare const DEFAULT_COL = 1;
 export declare const DEFAULT_ROW = 1;

package/dist/components/grid/config.mjs

@@ -14,11 +14,13 @@ const DEFAULT_BREAKPOINTS = {
   xxl: 1880
   // ≥1880px 大尺寸电脑
 };
+const DEFAULT_COLUMNS = 12;
 const DEFAULT_COL = 1;
 const DEFAULT_ROW = 1;
 export {
   DEFAULT_BREAKPOINTS,
   DEFAULT_COL,
+  DEFAULT_COLUMNS,
   DEFAULT_GRID_WIDTH,
   DEFAULT_ROW,
   PROVIDE_GRID_ITEM_PROPS_KEY,

package/dist/components/grid/index.css

@@ -1,4 +1,3 @@
-.qd-grid[data-v-8ccab0d1] {
+.qd-grid[data-v-31b0a5de] {
   display: grid;
-  grid-template-columns: repeat(12, 1fr);
 }

package/dist/components/grid/index.vue.d.ts

@@ -9,7 +9,9 @@ declare var __VLS_1: {
 type __VLS_Slots = {} & {
     default?: (props: typeof __VLS_1) => any;
 };
-declare const __VLS_component: import("vue").DefineComponent<QdGridProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<QdGridProps> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
+declare const __VLS_component: import("vue").DefineComponent<QdGridProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<QdGridProps> & Readonly<{}>, {
+    columns: number;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 declare const _default: __VLS_WithSlots<typeof __VLS_component, __VLS_Slots>;
 export default _default;
 type __VLS_WithSlots<T, S> = T & {

package/dist/components/grid/index.vue.mjs

@@ -2,7 +2,7 @@ import './index.css'
 import _sfc_main from "./index.vue2.mjs";
 /* empty css            */
 import _export_sfc from "../../_virtual/_plugin-vue_export-helper.mjs";
-const QdGrid = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8ccab0d1"]]);
+const QdGrid = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-31b0a5de"]]);
 export {
   QdGrid as default
 };

package/dist/components/grid/index.vue2.mjs

@@ -1,13 +1,14 @@
 import './index.css'
 import { defineComponent, computed, provide, useTemplateRef, ref, withDirectives, createElementBlock, openBlock, normalizeStyle, renderSlot, unref } from "vue";
 import { resizeDirective, isEmpty } from "qidian-shared";
-import { PROVIDE_GRID_ITEM_PROPS_KEY, DEFAULT_GRID_WIDTH, PROVIDE_GRID_WIDTH_KEY, DEFAULT_BREAKPOINTS } from "./config.mjs";
+import { DEFAULT_COLUMNS, PROVIDE_GRID_ITEM_PROPS_KEY, DEFAULT_GRID_WIDTH, PROVIDE_GRID_WIDTH_KEY, DEFAULT_BREAKPOINTS } from "./config.mjs";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{
     name: "QdGrid"
   },
   __name: "index",
   props: {
+    columns: { default: DEFAULT_COLUMNS },
     gutter: {},
     grid: {}
   },
@@ -41,12 +42,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         gap: `${verticalGutter}px ${horizontalGutter}px`
       };
     });
+    const gridStyle = computed(() => ({
+      ...gutterStyle.value,
+      gridTemplateColumns: `repeat(${props.columns}, minmax(0, 1fr))`
+    }));
     return (_ctx, _cache) => {
       return withDirectives((openBlock(), createElementBlock("div", {
         ref_key: "grid",
         ref: grid,
         class: "qd-grid",
-        style: normalizeStyle(gutterStyle.value)
+        style: normalizeStyle(gridStyle.value)
       }, [
         renderSlot(_ctx.$slots, "default", { gutterStyle: gutterStyle.value }, void 0, true)
       ], 4)), [

package/dist/components/grid/types.d.ts

@@ -3,6 +3,7 @@ export type GridGutterValue = number | (GutterObject & {
     span?: number;
 });
 export interface QdGridProps {
+    columns?: number;
     gutter?: TdRowProps['gutter'];
     grid?: QdGridItemProps;
 }

package/dist/components/service/table/index.css

@@ -1,19 +1,22 @@
-.qd-service-table[data-v-46eba1ae] {
+.qd-service-table[data-v-6e1b49c2] {
   height: 100%;
   display: flex;
   flex-direction: column;
 }
-.qd-service-table[data-v-46eba1ae] >  .t-table__content {
+.qd-service-table[data-v-6e1b49c2] >  .t-table__content {
   flex: 1;
 }
-.qd-service-table[data-v-46eba1ae] .t-table__tree-col:not(:has(.t-table__tree-op-icon)) {
+.qd-service-table[data-v-6e1b49c2] .t-table__tree-col:not(:has(.t-table__tree-op-icon)) {
   margin-left: calc(var(--td-font-size-body-large) + var(--td-comp-margin-s));
 }
-.qd-service-table[data-v-46eba1ae] .t-table__tree-leaf-node .t-table__tree-op-icon:empty {
+.qd-service-table[data-v-6e1b49c2] .t-table__tree-leaf-node .t-table__tree-op-icon:empty {
   width: calc(var(--td-font-size-body-large) + var(--td-comp-margin-s));
 }
-.qd-service-table--ps-x-fixed[data-v-46eba1ae] .ps__rail-x {
+.qd-service-table--ps-x-fixed[data-v-6e1b49c2] .ps__rail-x {
   position: fixed;
-  left: var(--v783492ca) !important;
-  bottom: var(--c8df1cb2) !important;
+  left: var(--v3506f85c) !important;
+  bottom: var(--v08176f86) !important;
+}
+.qd-service-table--disable-horizontal-scroll[data-v-6e1b49c2] colgroup > col {
+  width: auto !important;
 }

package/dist/components/service/table/index.vue.mjs

@@ -2,7 +2,7 @@ import './index.css'
 import _sfc_main from "./index.vue2.mjs";
 /* empty css            */
 import _export_sfc from "../../../_virtual/_plugin-vue_export-helper.mjs";
-const QdServiceTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-46eba1ae"]]);
+const QdServiceTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-6e1b49c2"]]);
 export {
   QdServiceTable as default
 };

package/dist/components/service/table/index.vue2.mjs

@@ -25,6 +25,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     loadingWithData: {
       type: Boolean
     },
+    disableHorizontalScroll: {
+      type: Boolean
+    },
     beforeDragSort: {
       type: Function
     },
@@ -303,8 +306,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     emit: __emit
   }) {
     useCssVars((_ctx) => ({
-      "v783492ca": tableContentLeft.value,
-      "c8df1cb2": outsideBottom.value
+      "v3506f85c": tableContentLeft.value,
+      "v08176f86": outsideBottom.value
     }));
     const props = __props;
     const emit = __emit;
@@ -836,7 +839,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return withDirectives((openBlock(), createBlock(resolveDynamicComponent(reProps.value.tableOptions.tree ? unref(EnhancedTable) : unref(Table)), mergeProps({
         ref: "table",
-        class: ["qd-service-table", __props.headerBg ? "" : "t-table--header-bg-inherit", unref(isOutsideTableContent) ? "" : "qd-service-table--inside-table-content", tableContentVisible.value && tableHeaderHalfVisible.value && !tableContentFullVisible.value ? "qd-service-table--ps-x-fixed" : ""],
+        class: ["qd-service-table", __props.headerBg ? "" : "t-table--header-bg-inherit", unref(isOutsideTableContent) ? "" : "qd-service-table--inside-table-content", tableContentVisible.value && tableHeaderHalfVisible.value && !tableContentFullVisible.value ? "qd-service-table--ps-x-fixed" : "", __props.disableHorizontalScroll ? "qd-service-table--disable-horizontal-scroll" : ""],
         "selected-row-keys": unref(selectedRowKeys),
         "onUpdate:selectedRowKeys": _cache[0] || (_cache[0] = ($event) => isRef(selectedRowKeys) ? selectedRowKeys.value = $event : null),
         "active-row-keys": unref(activeRowKeys),

package/dist/components/service/table/types.d.ts

@@ -25,6 +25,7 @@ export interface QdServiceTableProps<D extends TableRowData = TableRowData, R =
         delCheckChildren?: boolean | ((context: QdServiceTableDeleteCheckContext<D>) => QdServiceTableDeleteCheckResult | Promise<QdServiceTableDeleteCheckResult>);
     };
     loadingWithData?: boolean;
+    disableHorizontalScroll?: boolean;
 }
 export type QdServiceTableCol<D extends TableRowData = TableRowData> = NonNullable<QdServiceTableProps<D>['columns']>[number];
 export type QdServiceTableInstanceFunctions<D extends TableRowData = TableRowData, R = unknown, P = ServicePageParams, TP = P, Pag extends ServicePagination = ServicePagination, HasTree extends boolean = boolean> = (HasTree extends true ? EnhancedTableInstanceFunctions<D> : PrimaryTableInstanceFunctions<D> & {

package/dist/components/service-dialog-table-select/index.vue2.mjs

@@ -70,6 +70,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     loadingWithData: {
       type: Boolean
     },
+    disableHorizontalScroll: {
+      type: Boolean
+    },
     beforeDragSort: {
       type: Function
     },

package/dist/components/service-popup-table-select/index.vue2.mjs

@@ -60,6 +60,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     loadingWithData: {
       type: Boolean
     },
+    disableHorizontalScroll: {
+      type: Boolean
+    },
     beforeDragSort: {
       type: Function
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qidian-vue-ui",
-  "version": "1.2.102",
+  "version": "1.2.103",
   "description": "基于 TDesign 的 QiDian Vue UI 组件库",
   "author": "qidian",
   "license": "MIT",