3h1-ui 2.7.0 → 2.8.1

package/es/index.js

@@ -1,5 +1,5 @@
 import { h, nextTick, createVNode, defineComponent, ref, computed, unref, watchEffect, watch, resolveComponent, openBlock, createBlock, mergeProps, withCtx, createElementBlock, Fragment, renderList, createTextVNode, toDisplayString, createSlots, renderSlot, normalizeProps, guardReactiveProps, createElementVNode, onMounted, normalizeClass, createCommentVNode, normalizeStyle, Transition, toHandlers, useSlots, withDirectives, vShow, getCurrentInstance, inject, onUnmounted, provide, onBeforeUnmount, resolveDynamicComponent, reactive, toRef, toRefs, TransitionGroup, getCurrentScope, onScopeDispose, readonly, isVNode, shallowReactive, toRaw, shallowRef, withKeys, withModifiers, render as render$1, resolveDirective, isRef, useAttrs as useAttrs$2 } from "vue";
-import { Radio, Select, Tree, TreeSelect, Cascader, Transfer, Input, Tooltip, Skeleton, Popover, Pagination, Empty, Button as Button$1, Table as Table$1, Form, FormItem, DatePicker, InputNumber, AutoComplete, Switch, Checkbox, Slider, Rate, TimePicker, Divider, Col, Popconfirm, Modal as Modal$2, Row, Dropdown, Menu, MenuItem, MenuDivider, Spin, PageHeader, Image, Badge, Tag, FormItemRest, Drawer, Space, Upload, Avatar } from "ant-design-vue";
+import { Radio, Select, Tree, TreeSelect, Cascader, Transfer, Input, Tooltip, Skeleton, Popover, Pagination, Empty, Button as Button$1, Table as Table$1, Form, FormItem, DatePicker, InputNumber, AutoComplete, Switch, Checkbox, Slider, Rate, TimePicker, Col, Popconfirm, Modal as Modal$2, Row, Dropdown, Menu, MenuItem, MenuDivider, Divider as Divider$1, Spin, PageHeader, Space, Image, Badge, Tag, FormItemRest, Drawer, Upload, Avatar } from "ant-design-vue";
 import { propTypes, isFunction as isFunction$4, isString as isString$3, isArray as isArray$3, getSlot as getSlot$1, addClass as addClass$1, removeClass as removeClass$1, getPopupContainer as getPopupContainer$1, triggerWindowResize, off, on, addResizeListener, removeResizeListener, isNumber as isNumber$2, isBoolean, isNull, extendSlots as extendSlots$1, withInstall as withInstall$2, isObject as isObject$3, dateUtil, isNullOrUnDef, isDef as isDef$1, error as error$1, deepMerge as deepMerge$1, getDynamicProps, buildProps, createBEM, forEach as forEach$1, isClient as isClient$1, filter, treeToList, eachTree, isEmpty, isServer, formatToDate, isMap as isMap$2, buildUUID, findNodeAll, getViewportOffset, warn as warn$1, isNullAndUnDef, dataURLtoBlob } from "@shy-plugins/utils";
 import { useAttrs as useAttrs$1, useRuleFormItem, useTimeoutFn as useTimeoutFn$2, useScrollTo as useScrollTo$1, useIntersectionObserver, useCopyToClipboard, useMessage, usePagination as usePagination$2, createContext as createContext$1, useContext as useContext$2, useBreakpoint, useI18n as useI18n$1, useContentHeight, useDesign as useDesign$1, useWindowSizeFn as useWindowSizeFn$1, onMountedOrActivated, useEventListener as useEventListener$1 } from "@shy-plugins/use";
 import { zxcvbn } from "@zxcvbn-ts/core";
@@ -1679,6 +1679,21 @@ var SmallDashOutlined = function SmallDashOutlined2(props2, context) {
 SmallDashOutlined.displayName = "SmallDashOutlined";
 SmallDashOutlined.inheritAttrs = false;
 const SmallDashOutlined$1 = SmallDashOutlined;
+const Divider = /* @__PURE__ */ defineComponent({
+  props: {
+    label: {
+      type: String,
+      default: () => ""
+    }
+  },
+  setup(props2, {
+    attrs
+  }) {
+    return () => createVNode("div", {
+      "class": "shy-form-divider"
+    }, [props2.label]);
+  }
+});
 var freeGlobal = typeof global == "object" && global && global.Object === Object && global;
 const freeGlobal$1 = freeGlobal;
 var freeSelf = typeof self == "object" && self && self.Object === Object && self;
@@ -7275,6 +7290,7 @@ const _sfc_main$M = /* @__PURE__ */ defineComponent({
 });
 const Table_vue_vue_type_style_index_0_scoped_7465b460_lang = "";
 const Table = /* @__PURE__ */ _export_sfc(_sfc_main$M, [["__scopeId", "data-v-7465b460"]]);
+console.log(Divider);
 const componentMap$2 = /* @__PURE__ */ new Map();
 componentMap$2.set("Input", Input);
 componentMap$2.set("InputGroup", Input.Group);
@@ -7482,7 +7498,8 @@ const _sfc_main$L = /* @__PURE__ */ defineComponent({
           type: "horizontal"
         }, componentProps, {
           orientation: "left",
-          plain: true
+          plain: true,
+          label: (schema2 == null ? void 0 : schema2.label) || ""
         });
       }
       if (schema2.component === "Input") {
@@ -10245,7 +10262,7 @@ function _sfc_render$n(_ctx, _cache, $props, $setup, $data, $options) {
             class: normalizeClass(_ctx.getToggleClass),
             onClick: _cache[0] || (_cache[0] = (...args) => _ctx.handleToggleAdvanced && _ctx.handleToggleAdvanced(...args))
           }, [
-            createVNode(_component_DownOutlined, { style: { fontSize: "10px", color: "#AED0FA " } })
+            createVNode(_component_DownOutlined, { style: { fontSize: "10px", color: "#2991ff " } })
           ], 2)
         ], 2)) : createCommentVNode("", true)
       ];
@@ -10253,7 +10270,7 @@ function _sfc_render$n(_ctx, _cache, $props, $setup, $data, $options) {
   ], 64);
 }
 const BasicForm = /* @__PURE__ */ _export_sfc(_sfc_main$z, [["render", _sfc_render$n]]);
-const index$3 = "";
+const index$4 = "";
 function useComponentRegister(compName, comp) {
   add(compName, comp);
   tryOnUnmounted(() => {
@@ -10855,7 +10872,7 @@ function useTree(treeDataRef, getFieldNames) {
 function _isSlot$1(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
 }
-const prefixCls = "context-menu";
+const prefixCls$1 = "context-menu";
 const props$4 = {
   width: {
     type: Number,
@@ -10974,11 +10991,11 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
         if (!children || children.length === 0) {
           return createVNode(Fragment, null, [createVNode(Menu.Item, {
             "disabled": disabled,
-            "class": `${prefixCls}__item`,
+            "class": `${prefixCls$1}__item`,
             "key": label
           }, {
             default: () => [createVNode(ItemContent, contentProps, null)]
-          }), divider ? createVNode(Divider, {
+          }), divider ? createVNode(Divider$1, {
             "key": `d-${label}`
           }, null) : null]);
         }
@@ -10987,7 +11004,7 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
         return createVNode(Menu.SubMenu, {
           "key": label,
           "disabled": disabled,
-          "popupClassName": `${prefixCls}__popup`
+          "popupClassName": `${prefixCls$1}__popup`
         }, {
           title: () => createVNode(ItemContent, contentProps, null),
           default: () => renderMenuItem(children)
@@ -11003,7 +11020,7 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
         items
       } = props2;
       return createVNode("div", {
-        "class": prefixCls
+        "class": prefixCls$1
       }, [createVNode(Menu, {
         "inlineIndent": 12,
         "mode": "vertical",
@@ -11469,7 +11486,7 @@ const _sfc_main$w = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const index$2 = "";
+const index$3 = "";
 const _sfc_main$v = /* @__PURE__ */ defineComponent({
   __name: "DeptTree",
   props: {
@@ -11715,6 +11732,64 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
   ], 2);
 }
 const PageWrapper = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["render", _sfc_render$l]]);
+const prefixCls = "shy-basic-page-second";
+const PageSecond = /* @__PURE__ */ defineComponent({
+  props: {
+    title: {
+      type: String,
+      default: () => "Title"
+    },
+    isShowCancelButton: {
+      type: Boolean,
+      default: () => true
+    },
+    isShowConfirmButton: {
+      type: Boolean,
+      default: () => true
+    }
+  },
+  emits: ["click-return"],
+  setup(props2, {
+    slots,
+    emit
+  }) {
+    const handleClick = () => {
+      emit("click-return");
+    };
+    return () => {
+      var _a2;
+      return createVNode("div", {
+        "class": `${prefixCls}-wrapper`
+      }, [createVNode("div", {
+        "class": `${prefixCls}-header`
+      }, [createVNode(ArrowLeftOutlined$1, {
+        "class": `${prefixCls}-header-icon`,
+        "onClick": handleClick
+      }, null), createVNode("div", {
+        "class": `${prefixCls}-header-title`
+      }, [props2.title])]), createVNode("div", {
+        "class": `${prefixCls}-body`
+      }, [(_a2 = slots.default) == null ? void 0 : _a2.call(slots)]), createVNode("div", {
+        "class": `${prefixCls}-footer`
+      }, [createVNode(Space, null, {
+        default: () => {
+          var _a3, _b, _c;
+          return [(_a3 = slots.beforeCancelButton) == null ? void 0 : _a3.call(slots), props2.isShowCancelButton ? createVNode(_sfc_main$K, {
+            "size": "small"
+          }, {
+            default: () => [createTextVNode("取消")]
+          }) : null, (_b = slots.afterCancelButton) == null ? void 0 : _b.call(slots), props2.isShowConfirmButton ? createVNode(_sfc_main$K, {
+            "type": "primary",
+            "size": "small"
+          }, {
+            default: () => [createTextVNode("确定")]
+          }) : null, (_c = slots.beforeConfirmButton) == null ? void 0 : _c.call(slots)];
+        }
+      })])]);
+    };
+  }
+});
+const index$2 = "";
 const PageWrapperFixedHeightKey = "PageWrapperFixedHeight";
 const _sfc_main$s = defineComponent({
   name: "EditTableHeaderIcon",
@@ -11850,6 +11925,7 @@ const DEFAULT_FILTER_FN = defaultFilterFn;
 let DEFAULT_ALIGN = "left";
 const INDEX_COLUMN_FLAG = "INDEX";
 const ACTION_COLUMN_FLAG = "ACTION";
+const ACTION_COLUMN_WIDTH = 160;
 const setConstConfig = (config) => {
   DEFAULT_ALIGN = config.align;
 };
@@ -12607,6 +12683,7 @@ function handleActionColumn(propsRef, columns) {
     columns.push({
       ...columns[hasIndex],
       fixed: "right",
+      width: ACTION_COLUMN_WIDTH,
       ...actionColumn,
       flag: ACTION_COLUMN_FLAG
     });
@@ -13282,8 +13359,8 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
     const headEl = tableEl.querySelector(".ant-table-thead ");
     if (!headEl)
       return;
-    let paddingHeight = 32;
-    let paginationHeight = 2;
+    let paddingHeight = 30;
+    let paginationHeight = 10;
     if (!isBoolean(pagination) && tableData.length !== 0) {
       paginationEl = tableEl.querySelector(".ant-pagination");
       if (paginationEl) {
@@ -13306,7 +13383,7 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
     }
     let headerHeight = 0;
     if (headEl) {
-      headerHeight = headEl.offsetHeight;
+      headerHeight = headEl.offsetHeight + 1;
     }
     let bottomIncludeBody = 0;
     if (unref(wrapRef) && isCanResizeParent) {
@@ -13524,7 +13601,7 @@ const _sfc_main$p = defineComponent({
     CheckboxGroup: Checkbox.Group,
     DragOutlined: DragOutlined$1,
     ScrollContainer: ScrollContainer$1,
-    Divider,
+    Divider: Divider$1,
     Icon: Icon2
   },
   emits: ["columns-change"],
@@ -14387,13 +14464,25 @@ function useTableFooter(propsRef, scrollRef, tableElRef, getDataSourceRef) {
   return { getFooterProps };
 }
 function useTableForm(propsRef, slots, fetch, getLoading) {
+  const getFormConfig = computed(() => {
+    const { formConfig } = unref(propsRef);
+    formConfig == null ? void 0 : formConfig.schemas.forEach((item) => {
+      if (item.component === "Input") {
+        item.componentProps = {
+          showCount: false,
+          ...(item == null ? void 0 : item.componentProps) || {}
+        };
+      }
+    });
+    return formConfig;
+  });
   const getFormProps = computed(() => {
     const { formConfig } = unref(propsRef);
     const { submitButtonOptions } = formConfig || {};
     return {
       showAdvancedButton: true,
       rowProps: { gutter: 20 },
-      ...formConfig,
+      ...getFormConfig.value,
       submitButtonOptions: {
         loading: unref(getLoading),
         ...submitButtonOptions
@@ -14440,7 +14529,7 @@ const basicProps$3 = reactive({
   },
   showTableSetting: { type: Boolean, default: true },
   autoCreateKey: { type: Boolean, default: true },
-  striped: { type: Boolean, default: true },
+  striped: { type: Boolean, default: false },
   showSummary: Boolean,
   summaryFunc: {
     type: [Function, Array],
@@ -14489,6 +14578,8 @@ const basicProps$3 = reactive({
   },
   // 使用搜索表单
   useSearchForm: propTypes.bool,
+  // 使用表格内边距
+  useTableWrapper: propTypes.bool.def(true),
   // 表单配置
   formConfig: {
     type: Object,
@@ -14532,7 +14623,7 @@ const basicProps$3 = reactive({
     type: [String, Function],
     default: ""
   },
-  bordered: propTypes.bool.def(true),
+  bordered: propTypes.bool.def(false),
   pagination: {
     type: [Object, Boolean],
     default: null
@@ -14731,6 +14822,7 @@ const _sfc_main$i = defineComponent({
         attrs.class,
         {
           [`${prefixCls2}-form-container`]: values.useSearchForm,
+          [`${prefixCls2}-table-wrapper`]: values.useTableWrapper,
           [`${prefixCls2}--inset`]: values.inset
         }
       ];
@@ -14821,7 +14913,8 @@ function _sfc_render$b(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Table = resolveComponent("Table");
   return openBlock(), createElementBlock("div", {
     ref: "wrapRef",
-    class: normalizeClass(_ctx.getWrapperClass)
+    class: normalizeClass(_ctx.getWrapperClass),
+    style: { "background-color": "#fff" }
   }, [
     _ctx.getBindValues.useSearchForm ? (openBlock(), createBlock(_component_BasicForm, mergeProps({
       key: 0,
@@ -14999,7 +15092,7 @@ const _sfc_main$g = defineComponent({
   components: {
     Icon: Icon2,
     PopConfirmButton: _sfc_main$J,
-    Divider,
+    Divider: Divider$1,
     Dropdown: _sfc_main$h,
     MoreOutlined: MoreOutlined$1,
     Tooltip
@@ -15717,6 +15810,19 @@ const basicProps$2 = {
     default: () => ({})
   }
 };
+const DescriptionGroup = /* @__PURE__ */ defineComponent({
+  props: {
+    label: {
+      type: String,
+      default: () => ""
+    }
+  },
+  setup(props2) {
+    return () => createVNode("div", {
+      "class": "shy-form-divider"
+    }, [props2.label]);
+  }
+});
 const Description = /* @__PURE__ */ defineComponent({
   name: "Description",
   props: basicProps$2,
@@ -15742,19 +15848,31 @@ const Description = /* @__PURE__ */ defineComponent({
     const rows = computed(() => {
       return getProps.value.schema.map((item) => {
         var _a2, _b;
-        return createVNode("div", {
-          "class": `${prefixCls2}-row`,
-          "style": {
-            flex: `0 0 ${(((_a2 = item == null ? void 0 : item.colProps) == null ? void 0 : _a2.span) || basicColProps) / 24 * 100}%`
-          }
-        }, [createVNode("span", {
-          "style": {
-            width: `${getProps.value.labelWidth}px`
-          },
-          "class": `${prefixCls2}-label`
-        }, [slots[`${item.field}Label`] ? slots[`${item.field}Label`]() : item.label, ((_b = getProps.value) == null ? void 0 : _b.isShowColon) ? ":" : ""]), createVNode("span", {
-          "class": `${prefixCls2}-value`
-        }, [slots[`${item.field}Value`] ? slots[`${item.field}Value`]() : getProps.value.data[item.field]])]);
+        if ((item == null ? void 0 : item.component) === "Divider") {
+          return createVNode(Divider$1, null, null);
+        } else if ((item == null ? void 0 : item.component) === "Group") {
+          return createVNode("div", {
+            "style": {
+              flex: "0 0 100%"
+            }
+          }, [createVNode(DescriptionGroup, {
+            "label": item == null ? void 0 : item.label
+          }, null)]);
+        } else {
+          return createVNode("div", {
+            "class": `${prefixCls2}-row`,
+            "style": {
+              flex: `0 0 ${(((_a2 = item == null ? void 0 : item.colProps) == null ? void 0 : _a2.span) || basicColProps) / 24 * 100}%`
+            }
+          }, [createVNode("span", {
+            "style": {
+              width: `${getProps.value.labelWidth}px`
+            },
+            "class": `${prefixCls2}-label`
+          }, [slots[`${item.field}Label`] ? slots[`${item.field}Label`]() : item.label, ((_b = getProps.value) == null ? void 0 : _b.isShowColon) ? ":" : ""]), createVNode("span", {
+            "class": `${prefixCls2}-value`
+          }, [slots[`${item.field}Value`] ? slots[`${item.field}Value`]() : getProps.value.data[item.field]])]);
+        }
       });
     });
     emit("register", {
@@ -20436,6 +20554,7 @@ export {
   LazyContainer,
   Loading,
   PageFooter,
+  PageSecond,
   PageWrapper,
   PageWrapperFixedHeightKey,
   _sfc_main$J as PopConfirmButton,

package/es/style.css

@@ -25042,9 +25042,9 @@ span.iconify {
   left: 0;
   display: block;
   margin-top: -0.5px;
-  width: calc(50% - 16px);
+  width: calc(50% - 19px);
   height: 1px;
-  background: #f0f0f0;
+  background: #e2e2e3;
   content: '';
 }
 .shy-basic-form-toggle-right__line {
@@ -25053,18 +25053,18 @@ span.iconify {
   right: 0;
   display: block;
   margin-top: -0.5px;
-  width: calc(50% - 16px);
+  width: calc(50% - 19px);
   height: 1px;
-  background: #f0f0f0;
+  background: #e2e2e3;
   content: '';
 }
 .shy-basic-form-toggle-icon {
   display: flex;
   justify-content: center;
   align-items: center;
-  width: 32px;
-  height: 12px;
-  border: 1px solid #aed0fa;
+  width: 36px;
+  height: 16px;
+  border: 1px solid #2991ff;
   border-radius: 0;
   transition: all 0.1;
   cursor: pointer;
@@ -25108,6 +25108,24 @@ span.iconify {
 }
 .shy-form-action .ant-form-item-control-input-content button {
   margin: 0 5px;
+}
+.shy-form-divider {
+  display: flex;
+  align-items: center;
+  height: 30px;
+  font-size: 14px;
+  font-weight: 600;
+  font-family: PingFangSC-Semibold;
+  color: #131415;
+  line-height: 16px;
+}
+.shy-form-divider::after {
+  display: inline-block;
+  margin-left: 8px;
+  width: 2px;
+  height: 14px;
+  content: '';
+  background: #2991ff;
 }.shy-search[data-v-6d3f2554] {
   position: relative;
   display: flex;
@@ -25243,6 +25261,37 @@ span.iconify {
 }
 .shy-page-wrapper--dense .shy-page-wrapper-content {
   margin: 0;
+}.shy-basic-page-second-wrapper {
+  height: 100%;
+  padding: 15px;
+  overflow: hidden;
+}
+.shy-basic-page-second-header {
+  display: flex;
+  align-items: center;
+  line-height: 40px;
+  height: 40px;
+}
+.shy-basic-page-second-header-icon {
+  font-size: 16px;
+}
+.shy-basic-page-second-header-title {
+  margin-left: 30px;
+  font-size: 20px;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  color: #131415;
+}
+.shy-basic-page-second-body {
+  height: calc(100% - 40px - 50px);
+  overflow: auto;
+}
+.shy-basic-page-second-footer {
+  display: flex;
+  justify-content: flex-end;
+  align-items: flex-end;
+  height: 50px;
+  flex: none;
 }.shy-basic-table-header-cell__help {
   margin-left: 8px;
   color: rgba(0, 0, 0, 0.65) !important;
@@ -25429,6 +25478,9 @@ span.iconify {
   width: 100%;
   height: 100%;
 }
+.shy-basic-table-table-wrapper {
+  padding: 15px;
+}
 .shy-basic-table-row__striped td {
   background-color: #fafafa;
 }
@@ -25512,7 +25564,6 @@ span.iconify {
 }.shy-basic-description-wrapper {
   display: flex;
   flex-flow: row wrap;
-  height: 100%;
   overflow-y: auto;
 }
 .shy-basic-description-label {
@@ -25532,6 +25583,24 @@ span.iconify {
   display: flex;
   margin: 8px 0;
   overflow: hidden;
+}
+.shy-form-divider {
+  display: flex;
+  align-items: center;
+  height: 30px;
+  font-size: 14px;
+  font-weight: 600;
+  font-family: PingFangSC-Semibold;
+  color: #131415;
+  line-height: 16px;
+}
+.shy-form-divider::after {
+  display: inline-block;
+  margin-left: 8px;
+  width: 2px;
+  height: 14px;
+  content: '';
+  background: #2991ff;
 }.shy-basic-drawer-footer {
   position: absolute;
   bottom: 0;

package/es/ui/src/Description/src/DescriptionGroup.d.ts

@@ -0,0 +1,14 @@
+declare const _default: import("vue").DefineComponent<{
+    label: {
+        type: StringConstructor;
+        default: () => string;
+    };
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    label: {
+        type: StringConstructor;
+        default: () => string;
+    };
+}>>, {
+    label: string;
+}>;
+export default _default;

package/es/ui/src/Description/src/props.d.ts

@@ -1,10 +1,11 @@
 import { PropType } from 'vue';
 export interface Schema {
-    label: string;
-    field: string;
+    label?: string;
+    field?: string;
     colProps?: {
         span: number;
     };
+    component?: 'Divider' | 'Group';
 }
 export declare const basicColProps = 24;
 export declare const basicProps: {

package/es/ui/src/Page/index.d.ts

@@ -1,4 +1,5 @@
 import PageFooter from './src/PageFooter.vue';
 import PageWrapper from './src/PageWrapper.vue';
-export { PageFooter, PageWrapper };
+import PageSecond from './src/PageSecond';
+export { PageFooter, PageWrapper, PageSecond };
 export declare const PageWrapperFixedHeightKey = "PageWrapperFixedHeight";

package/es/ui/src/Page/src/PageSecond.d.ts

@@ -0,0 +1,34 @@
+declare const _default: import("vue").DefineComponent<{
+    title: {
+        type: StringConstructor;
+        default: () => string;
+    };
+    isShowCancelButton: {
+        type: BooleanConstructor;
+        default: () => boolean;
+    };
+    isShowConfirmButton: {
+        type: BooleanConstructor;
+        default: () => boolean;
+    };
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "click-return"[], "click-return", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    title: {
+        type: StringConstructor;
+        default: () => string;
+    };
+    isShowCancelButton: {
+        type: BooleanConstructor;
+        default: () => boolean;
+    };
+    isShowConfirmButton: {
+        type: BooleanConstructor;
+        default: () => boolean;
+    };
+}>> & {
+    "onClick-return"?: (...args: any[]) => any;
+}, {
+    title: string;
+    isShowCancelButton: boolean;
+    isShowConfirmButton: boolean;
+}>;
+export default _default;

package/es/ui/src/Table/src/const.d.ts

@@ -20,4 +20,5 @@ export declare const DEFAULT_FILTER_FN: (data: Partial<Recordable<string[]>>) =>
 export declare let DEFAULT_ALIGN: string;
 export declare const INDEX_COLUMN_FLAG = "INDEX";
 export declare const ACTION_COLUMN_FLAG = "ACTION";
+export declare const ACTION_COLUMN_WIDTH = 160;
 export declare const setConstConfig: (config: any) => void;

package/es/ui/src/Table/src/props.d.ts

@@ -341,6 +341,41 @@ export declare const basicProps: {
         default?: boolean | object | (() => boolean) | ((props: Record<string, unknown>) => boolean);
         validator?: (value: boolean) => boolean;
     };
+    useTableWrapper: {
+        readonly validate: (fn: import("vue-types/dist/types").ValidatorFunction<unknown>) => import("vue-types").VueTypeValidableDef<boolean> & {
+            default: boolean;
+        } & {
+            validator: import("vue-types/dist/types").ValidatorFunction<unknown>;
+        };
+        _vueTypes_name: string;
+        type?: import("vue-types/dist/types").Prop<boolean> | import("vue-types/dist/types").Prop<boolean>[];
+        readonly def: (def?: boolean) => import("vue-types").VueTypeValidableDef<boolean> & {
+            default: boolean;
+        };
+        readonly isRequired: {
+            readonly validate: (fn: import("vue-types/dist/types").ValidatorFunction<unknown>) => import("vue-types").VueTypeValidableDef<boolean> & {
+                default: boolean;
+            } & {
+                required: true;
+            } & {
+                validator: import("vue-types/dist/types").ValidatorFunction<unknown>;
+            };
+            _vueTypes_name: string;
+            type?: import("vue-types/dist/types").Prop<boolean> | import("vue-types/dist/types").Prop<boolean>[];
+            readonly def: (def?: boolean) => import("vue-types").VueTypeValidableDef<boolean> & {
+                default: boolean;
+            } & {
+                required: true;
+            };
+            readonly isRequired: any;
+            required: true;
+            default: (boolean | object | (() => boolean) | ((props: Record<string, unknown>) => boolean)) & boolean;
+            validator?: (value: boolean) => boolean;
+        };
+        required?: boolean;
+        default: (boolean | object | (() => boolean) | ((props: Record<string, unknown>) => boolean)) & boolean;
+        validator?: (value: boolean) => boolean;
+    };
     formConfig: {
         type: ((new (...args: any[]) => Partial<FormProps>) | (() => Partial<FormProps>)) | ((new (...args: any[]) => Partial<FormProps>) | (() => Partial<FormProps>))[];
         default: any;

package/lib/index.js

@@ -1681,6 +1681,21 @@ var SmallDashOutlined = function SmallDashOutlined2(props2, context) {
 SmallDashOutlined.displayName = "SmallDashOutlined";
 SmallDashOutlined.inheritAttrs = false;
 const SmallDashOutlined$1 = SmallDashOutlined;
+const Divider = /* @__PURE__ */ vue.defineComponent({
+  props: {
+    label: {
+      type: String,
+      default: () => ""
+    }
+  },
+  setup(props2, {
+    attrs
+  }) {
+    return () => vue.createVNode("div", {
+      "class": "shy-form-divider"
+    }, [props2.label]);
+  }
+});
 var freeGlobal = typeof global == "object" && global && global.Object === Object && global;
 const freeGlobal$1 = freeGlobal;
 var freeSelf = typeof self == "object" && self && self.Object === Object && self;
@@ -7277,6 +7292,7 @@ const _sfc_main$M = /* @__PURE__ */ vue.defineComponent({
 });
 const Table_vue_vue_type_style_index_0_scoped_7465b460_lang = "";
 const Table = /* @__PURE__ */ _export_sfc(_sfc_main$M, [["__scopeId", "data-v-7465b460"]]);
+console.log(Divider);
 const componentMap$2 = /* @__PURE__ */ new Map();
 componentMap$2.set("Input", antDesignVue.Input);
 componentMap$2.set("InputGroup", antDesignVue.Input.Group);
@@ -7310,7 +7326,7 @@ componentMap$2.set("StrengthMeter", StrengthMeter);
 componentMap$2.set("IconPicker", _sfc_main$P);
 componentMap$2.set("InputCountDown", CountdownInput);
 componentMap$2.set("Table", Table);
-componentMap$2.set("Divider", antDesignVue.Divider);
+componentMap$2.set("Divider", Divider);
 function add(compName, component) {
   componentMap$2.set(compName, component);
 }
@@ -7484,7 +7500,8 @@ const _sfc_main$L = /* @__PURE__ */ vue.defineComponent({
           type: "horizontal"
         }, componentProps, {
           orientation: "left",
-          plain: true
+          plain: true,
+          label: (schema2 == null ? void 0 : schema2.label) || ""
         });
       }
       if (schema2.component === "Input") {
@@ -7731,7 +7748,7 @@ const _sfc_main$L = /* @__PURE__ */ vue.defineComponent({
         return vue.createVNode(antDesignVue.Col, {
           "span": 24
         }, {
-          default: () => [vue.createVNode(antDesignVue.Divider, vue.unref(getComponentsProps), _isSlot$3(_slot = renderLabelHelpMessage()) ? _slot : {
+          default: () => [vue.createVNode(Divider, vue.unref(getComponentsProps), _isSlot$3(_slot = renderLabelHelpMessage()) ? _slot : {
             default: () => [_slot]
           })]
         });
@@ -10247,7 +10264,7 @@ function _sfc_render$n(_ctx, _cache, $props, $setup, $data, $options) {
             class: vue.normalizeClass(_ctx.getToggleClass),
             onClick: _cache[0] || (_cache[0] = (...args) => _ctx.handleToggleAdvanced && _ctx.handleToggleAdvanced(...args))
           }, [
-            vue.createVNode(_component_DownOutlined, { style: { fontSize: "10px", color: "#AED0FA " } })
+            vue.createVNode(_component_DownOutlined, { style: { fontSize: "10px", color: "#2991ff " } })
           ], 2)
         ], 2)) : vue.createCommentVNode("", true)
       ];
@@ -10255,7 +10272,7 @@ function _sfc_render$n(_ctx, _cache, $props, $setup, $data, $options) {
   ], 64);
 }
 const BasicForm = /* @__PURE__ */ _export_sfc(_sfc_main$z, [["render", _sfc_render$n]]);
-const index$3 = "";
+const index$4 = "";
 function useComponentRegister(compName, comp) {
   add(compName, comp);
   tryOnUnmounted(() => {
@@ -10857,7 +10874,7 @@ function useTree(treeDataRef, getFieldNames) {
 function _isSlot$1(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !vue.isVNode(s);
 }
-const prefixCls = "context-menu";
+const prefixCls$1 = "context-menu";
 const props$4 = {
   width: {
     type: Number,
@@ -10976,7 +10993,7 @@ const _sfc_main$x = /* @__PURE__ */ vue.defineComponent({
         if (!children || children.length === 0) {
           return vue.createVNode(vue.Fragment, null, [vue.createVNode(antDesignVue.Menu.Item, {
             "disabled": disabled,
-            "class": `${prefixCls}__item`,
+            "class": `${prefixCls$1}__item`,
             "key": label
           }, {
             default: () => [vue.createVNode(ItemContent, contentProps, null)]
@@ -10989,7 +11006,7 @@ const _sfc_main$x = /* @__PURE__ */ vue.defineComponent({
         return vue.createVNode(antDesignVue.Menu.SubMenu, {
           "key": label,
           "disabled": disabled,
-          "popupClassName": `${prefixCls}__popup`
+          "popupClassName": `${prefixCls$1}__popup`
         }, {
           title: () => vue.createVNode(ItemContent, contentProps, null),
           default: () => renderMenuItem(children)
@@ -11005,7 +11022,7 @@ const _sfc_main$x = /* @__PURE__ */ vue.defineComponent({
         items
       } = props2;
       return vue.createVNode("div", {
-        "class": prefixCls
+        "class": prefixCls$1
       }, [vue.createVNode(antDesignVue.Menu, {
         "inlineIndent": 12,
         "mode": "vertical",
@@ -11471,7 +11488,7 @@ const _sfc_main$w = /* @__PURE__ */ vue.defineComponent({
     };
   }
 });
-const index$2 = "";
+const index$3 = "";
 const _sfc_main$v = /* @__PURE__ */ vue.defineComponent({
   __name: "DeptTree",
   props: {
@@ -11717,6 +11734,64 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
   ], 2);
 }
 const PageWrapper = /* @__PURE__ */ _export_sfc(_sfc_main$t, [["render", _sfc_render$l]]);
+const prefixCls = "shy-basic-page-second";
+const PageSecond = /* @__PURE__ */ vue.defineComponent({
+  props: {
+    title: {
+      type: String,
+      default: () => "Title"
+    },
+    isShowCancelButton: {
+      type: Boolean,
+      default: () => true
+    },
+    isShowConfirmButton: {
+      type: Boolean,
+      default: () => true
+    }
+  },
+  emits: ["click-return"],
+  setup(props2, {
+    slots,
+    emit
+  }) {
+    const handleClick = () => {
+      emit("click-return");
+    };
+    return () => {
+      var _a2;
+      return vue.createVNode("div", {
+        "class": `${prefixCls}-wrapper`
+      }, [vue.createVNode("div", {
+        "class": `${prefixCls}-header`
+      }, [vue.createVNode(ArrowLeftOutlined$1, {
+        "class": `${prefixCls}-header-icon`,
+        "onClick": handleClick
+      }, null), vue.createVNode("div", {
+        "class": `${prefixCls}-header-title`
+      }, [props2.title])]), vue.createVNode("div", {
+        "class": `${prefixCls}-body`
+      }, [(_a2 = slots.default) == null ? void 0 : _a2.call(slots)]), vue.createVNode("div", {
+        "class": `${prefixCls}-footer`
+      }, [vue.createVNode(antDesignVue.Space, null, {
+        default: () => {
+          var _a3, _b, _c;
+          return [(_a3 = slots.beforeCancelButton) == null ? void 0 : _a3.call(slots), props2.isShowCancelButton ? vue.createVNode(_sfc_main$K, {
+            "size": "small"
+          }, {
+            default: () => [vue.createTextVNode("取消")]
+          }) : null, (_b = slots.afterCancelButton) == null ? void 0 : _b.call(slots), props2.isShowConfirmButton ? vue.createVNode(_sfc_main$K, {
+            "type": "primary",
+            "size": "small"
+          }, {
+            default: () => [vue.createTextVNode("确定")]
+          }) : null, (_c = slots.beforeConfirmButton) == null ? void 0 : _c.call(slots)];
+        }
+      })])]);
+    };
+  }
+});
+const index$2 = "";
 const PageWrapperFixedHeightKey = "PageWrapperFixedHeight";
 const _sfc_main$s = vue.defineComponent({
   name: "EditTableHeaderIcon",
@@ -11852,6 +11927,7 @@ const DEFAULT_FILTER_FN = defaultFilterFn;
 let DEFAULT_ALIGN = "left";
 const INDEX_COLUMN_FLAG = "INDEX";
 const ACTION_COLUMN_FLAG = "ACTION";
+const ACTION_COLUMN_WIDTH = 160;
 const setConstConfig = (config) => {
   DEFAULT_ALIGN = config.align;
 };
@@ -12609,6 +12685,7 @@ function handleActionColumn(propsRef, columns) {
     columns.push({
       ...columns[hasIndex],
       fixed: "right",
+      width: ACTION_COLUMN_WIDTH,
       ...actionColumn,
       flag: ACTION_COLUMN_FLAG
     });
@@ -13284,8 +13361,8 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
     const headEl = tableEl.querySelector(".ant-table-thead ");
     if (!headEl)
       return;
-    let paddingHeight = 32;
-    let paginationHeight = 2;
+    let paddingHeight = 30;
+    let paginationHeight = 10;
     if (!utils.isBoolean(pagination) && tableData.length !== 0) {
       paginationEl = tableEl.querySelector(".ant-pagination");
       if (paginationEl) {
@@ -13308,7 +13385,7 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef, getDa
     }
     let headerHeight = 0;
     if (headEl) {
-      headerHeight = headEl.offsetHeight;
+      headerHeight = headEl.offsetHeight + 1;
     }
     let bottomIncludeBody = 0;
     if (vue.unref(wrapRef) && isCanResizeParent) {
@@ -14389,13 +14466,25 @@ function useTableFooter(propsRef, scrollRef, tableElRef, getDataSourceRef) {
   return { getFooterProps };
 }
 function useTableForm(propsRef, slots, fetch, getLoading) {
+  const getFormConfig = vue.computed(() => {
+    const { formConfig } = vue.unref(propsRef);
+    formConfig == null ? void 0 : formConfig.schemas.forEach((item) => {
+      if (item.component === "Input") {
+        item.componentProps = {
+          showCount: false,
+          ...(item == null ? void 0 : item.componentProps) || {}
+        };
+      }
+    });
+    return formConfig;
+  });
   const getFormProps = vue.computed(() => {
     const { formConfig } = vue.unref(propsRef);
     const { submitButtonOptions } = formConfig || {};
     return {
       showAdvancedButton: true,
       rowProps: { gutter: 20 },
-      ...formConfig,
+      ...getFormConfig.value,
       submitButtonOptions: {
         loading: vue.unref(getLoading),
         ...submitButtonOptions
@@ -14442,7 +14531,7 @@ const basicProps$3 = vue.reactive({
   },
   showTableSetting: { type: Boolean, default: true },
   autoCreateKey: { type: Boolean, default: true },
-  striped: { type: Boolean, default: true },
+  striped: { type: Boolean, default: false },
   showSummary: Boolean,
   summaryFunc: {
     type: [Function, Array],
@@ -14491,6 +14580,8 @@ const basicProps$3 = vue.reactive({
   },
   // 使用搜索表单
   useSearchForm: utils.propTypes.bool,
+  // 使用表格内边距
+  useTableWrapper: utils.propTypes.bool.def(true),
   // 表单配置
   formConfig: {
     type: Object,
@@ -14534,7 +14625,7 @@ const basicProps$3 = vue.reactive({
     type: [String, Function],
     default: ""
   },
-  bordered: utils.propTypes.bool.def(true),
+  bordered: utils.propTypes.bool.def(false),
   pagination: {
     type: [Object, Boolean],
     default: null
@@ -14733,6 +14824,7 @@ const _sfc_main$i = vue.defineComponent({
         attrs.class,
         {
           [`${prefixCls2}-form-container`]: values.useSearchForm,
+          [`${prefixCls2}-table-wrapper`]: values.useTableWrapper,
           [`${prefixCls2}--inset`]: values.inset
         }
       ];
@@ -14823,7 +14915,8 @@ function _sfc_render$b(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_Table = vue.resolveComponent("Table");
   return vue.openBlock(), vue.createElementBlock("div", {
     ref: "wrapRef",
-    class: vue.normalizeClass(_ctx.getWrapperClass)
+    class: vue.normalizeClass(_ctx.getWrapperClass),
+    style: { "background-color": "#fff" }
   }, [
     _ctx.getBindValues.useSearchForm ? (vue.openBlock(), vue.createBlock(_component_BasicForm, vue.mergeProps({
       key: 0,
@@ -15719,6 +15812,19 @@ const basicProps$2 = {
     default: () => ({})
   }
 };
+const DescriptionGroup = /* @__PURE__ */ vue.defineComponent({
+  props: {
+    label: {
+      type: String,
+      default: () => ""
+    }
+  },
+  setup(props2) {
+    return () => vue.createVNode("div", {
+      "class": "shy-form-divider"
+    }, [props2.label]);
+  }
+});
 const Description = /* @__PURE__ */ vue.defineComponent({
   name: "Description",
   props: basicProps$2,
@@ -15744,19 +15850,31 @@ const Description = /* @__PURE__ */ vue.defineComponent({
     const rows = vue.computed(() => {
       return getProps.value.schema.map((item) => {
         var _a2, _b;
-        return vue.createVNode("div", {
-          "class": `${prefixCls2}-row`,
-          "style": {
-            flex: `0 0 ${(((_a2 = item == null ? void 0 : item.colProps) == null ? void 0 : _a2.span) || basicColProps) / 24 * 100}%`
-          }
-        }, [vue.createVNode("span", {
-          "style": {
-            width: `${getProps.value.labelWidth}px`
-          },
-          "class": `${prefixCls2}-label`
-        }, [slots[`${item.field}Label`] ? slots[`${item.field}Label`]() : item.label, ((_b = getProps.value) == null ? void 0 : _b.isShowColon) ? ":" : ""]), vue.createVNode("span", {
-          "class": `${prefixCls2}-value`
-        }, [slots[`${item.field}Value`] ? slots[`${item.field}Value`]() : getProps.value.data[item.field]])]);
+        if ((item == null ? void 0 : item.component) === "Divider") {
+          return vue.createVNode(antDesignVue.Divider, null, null);
+        } else if ((item == null ? void 0 : item.component) === "Group") {
+          return vue.createVNode("div", {
+            "style": {
+              flex: "0 0 100%"
+            }
+          }, [vue.createVNode(DescriptionGroup, {
+            "label": item == null ? void 0 : item.label
+          }, null)]);
+        } else {
+          return vue.createVNode("div", {
+            "class": `${prefixCls2}-row`,
+            "style": {
+              flex: `0 0 ${(((_a2 = item == null ? void 0 : item.colProps) == null ? void 0 : _a2.span) || basicColProps) / 24 * 100}%`
+            }
+          }, [vue.createVNode("span", {
+            "style": {
+              width: `${getProps.value.labelWidth}px`
+            },
+            "class": `${prefixCls2}-label`
+          }, [slots[`${item.field}Label`] ? slots[`${item.field}Label`]() : item.label, ((_b = getProps.value) == null ? void 0 : _b.isShowColon) ? ":" : ""]), vue.createVNode("span", {
+            "class": `${prefixCls2}-value`
+          }, [slots[`${item.field}Value`] ? slots[`${item.field}Value`]() : getProps.value.data[item.field]])]);
+        }
       });
     });
     emit("register", {
@@ -20437,6 +20555,7 @@ exports.IconPicker = _sfc_main$P;
 exports.LazyContainer = LazyContainer;
 exports.Loading = Loading;
 exports.PageFooter = PageFooter;
+exports.PageSecond = PageSecond;
 exports.PageWrapper = PageWrapper;
 exports.PageWrapperFixedHeightKey = PageWrapperFixedHeightKey;
 exports.PopConfirmButton = _sfc_main$J;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "2.7.0",
+  "version": "2.8.1",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -31,8 +31,8 @@
     "vue-types": "^5.0.2",
     "vxe-table": "^4.3.6",
     "xe-utils": "^3.5.7",
-    "@shy-plugins/use": "1.0.3",
-    "@shy-plugins/utils": "1.0.14"
+    "@shy-plugins/utils": "1.0.14",
+    "@shy-plugins/use": "1.0.3"
   },
   "types": "es/ui/index.d.ts",
   "devDependencies": {