3h1-ui 3.0.0-next.233 → 3.0.0-next.235

package/es/index.js

@@ -1,6 +1,6 @@
 import { defineComponent, createVNode, Transition, mergeProps, openBlock, createBlock, toHandlers, withCtx, renderSlot, computed, createElementBlock, normalizeClass, normalizeStyle as normalizeStyle$1, createElementVNode, ref, watch, onMounted, unref, nextTick, resolveComponent, getCurrentScope, onScopeDispose, getCurrentInstance, onUnmounted, readonly, watchEffect, Fragment, renderList, createCommentVNode, h as h$2, useSlots, resolveDynamicComponent, createTextVNode, toDisplayString, withDirectives, vShow, inject, provide, onBeforeUnmount, reactive, toRef, toRefs, TransitionGroup, shallowRef, isVNode, createSlots, normalizeProps, guardReactiveProps, toRaw, defineAsyncComponent, isRef, triggerRef, Comment, Text, cloneVNode, resolveDirective, onUpdated, withModifiers, onBeforeMount, Teleport, render as render$1, useAttrs as useAttrs$2, useCssVars } from "vue";
 import { Input, Popover, Pagination as Pagination$1, Empty as Empty$3, Tooltip as Tooltip$2, Skeleton, Modal as Modal$2, Button as Button$1, ConfigProvider, Popconfirm, PageHeader, Space, Radio, Select, Tree, TreeSelect, Cascader, Transfer, Col as Col$1, Form as Form$1, Row as Row$1, Menu, Divider as Divider$1, Spin, FormItemRest as FormItemRest$1, InputNumber, AutoComplete, Switch, Checkbox, DatePicker as DatePicker$1, TimePicker as TimePicker$1, Dropdown, CheckboxGroup, Tag, Table, TableSummary, TableSummaryRow, TableSummaryCell, Image, Badge, FormItem as FormItem$3, Progress, Alert, Upload, theme, Collapse, CollapsePanel, Slider, Rate, Drawer, Avatar, Descriptions as Descriptions$2, DescriptionsItem as DescriptionsItem$1, Breadcrumb } from "ant-design-vue";
-import { getSlot as getSlot$2, addClass as addClass$2, removeClass as removeClass$2, isString as isString$3, getPopupContainer, isArray as isArray$3, isFunction as isFunction$6, triggerWindowResize, off, on, addResizeListener, removeResizeListener, extendSlots as extendSlots$1, withInstall as withInstall$7, isNumber as isNumber$3, isBoolean as isBoolean$2, isNull, isObject as isObject$7, dateUtil, isNullOrUnDef, isDef as isDef$1, error as error$1, deepMerge as deepMerge$2, getDynamicProps, forEach as forEach$1, isClient as isClient$1, buildProps, createBEM, filter, treeToList as treeToList$1, eachTree, isEmpty, findNodeAll, buildUUID, isServer, isNullAndUnDef, formatToDate, isMap as isMap$2, getViewportOffset, warn as warn$2, downloadByUrl, dataURLtoBlob, deepMergeObjects } from "@shy-plugins/utils";
+import { getSlot as getSlot$2, addClass as addClass$2, removeClass as removeClass$2, isString as isString$3, getPopupContainer, isArray as isArray$3, isFunction as isFunction$6, triggerWindowResize, off, on, addResizeListener, removeResizeListener, extendSlots as extendSlots$1, withInstall as withInstall$7, isNumber as isNumber$3, isBoolean as isBoolean$2, isNull, isObject as isObject$7, dateUtil, isNullOrUnDef, isDef as isDef$1, error as error$1, deepMerge as deepMerge$2, isEmpty, getDynamicProps, forEach as forEach$1, isClient as isClient$1, buildProps, createBEM, filter, treeToList as treeToList$1, eachTree, findNodeAll, buildUUID, isServer, isNullAndUnDef, formatToDate, isMap as isMap$2, getViewportOffset, warn as warn$2, downloadByUrl, dataURLtoBlob, deepMergeObjects } from "@shy-plugins/utils";
 import Iconify from "@purge-icons/generated";
 import { useCopyToClipboard, useMessage, usePagination as usePagination$2, useDesign as useDesign$1, useTimeoutFn as useTimeoutFn$2, useScrollTo as useScrollTo$1, useIntersectionObserver, useTheme, useAttrs as useAttrs$1, useContentHeight, useRuleFormItem, useContext as useContext$1, createContext as createContext$2, onMountedOrActivated, useI18n as useI18n$1, useSortable } from "@shy-plugins/use";
 import { isBoolean as isBoolean$1 } from "xe-utils";
@@ -11732,7 +11732,7 @@ const FormItem$2 = /* @__PURE__ */ defineComponent({
     const isTableForm = computed(() => !!formProps2.value.formLabelInInput);
     const componentsPropsRef = ref({});
     watch(() => props2.formModel, () => {
-      var _a2, _b, _c, _d, _e;
+      var _a2, _b, _c, _d, _e, _f;
       const {
         schema: schema2,
         tableAction: tableAction2,
@@ -11782,12 +11782,13 @@ const FormItem$2 = /* @__PURE__ */ defineComponent({
         };
       }
       if (schema2.component === "Input" || schema2.component === "InputTextArea") {
-        const maxlength = (componentProps == null ? void 0 : componentProps.maxlength) === void 0 ? 100 : componentProps.maxlength;
+        const maxlength = (componentProps == null ? void 0 : componentProps.maxlength) || ((_e = config == null ? void 0 : config.Input) == null ? void 0 : _e.maxlength) || 100;
         componentProps = Object.assign({}, componentProps, {
           maxlength
         });
         componentProps.onInputEvent = (e2) => {
-          componentProps.maxlength = (componentProps == null ? void 0 : componentProps.maxlength) === void 0 ? 100 : componentProps.maxlength;
+          var _a3;
+          componentProps.maxlength = (componentProps == null ? void 0 : componentProps.maxlength) || ((_a3 = config == null ? void 0 : config.Input) == null ? void 0 : _a3.maxlength) || 100;
           if (!get$1(getValues.value.model, getValues.value.schema.field)) {
             componentProps.showCount = true;
           } else {
@@ -11796,7 +11797,7 @@ const FormItem$2 = /* @__PURE__ */ defineComponent({
         };
       }
       if (schema2.component === "Select") {
-        const label = ((_e = componentProps == null ? void 0 : componentProps.fieldNames) == null ? void 0 : _e.label) || "label";
+        const label = ((_f = componentProps == null ? void 0 : componentProps.fieldNames) == null ? void 0 : _f.label) || "label";
         componentProps = Object.assign({}, componentProps, {
           showSearch: true,
           filterOption: (input, option) => {
@@ -25748,7 +25749,7 @@ const ShyForm = /* @__PURE__ */ defineComponent({
             }
           }
           if ((_b = (_a2 = schema == null ? void 0 : schema.component) == null ? void 0 : _a2.includes) == null ? void 0 : _b.call(_a2, "Input")) {
-            schema.defaultValue = schema.defaultValue || "";
+            schema.defaultValue = !isEmpty(schema.defaultValue) ? schema.defaultValue : "";
           }
           if (schema.component === "Table") {
             schema.defaultValue = schema.defaultValue || reactive([]);
@@ -49538,6 +49539,15 @@ const Descriptions = /* @__PURE__ */ defineComponent({
       if (isArray$3(group)) {
         let _slot2;
         const props3 = pick$1(unref(getProps), ["bordered"]);
+        const isAllShowFalse = group.every((schema) => {
+          const {
+            isShow: isShow2,
+            isIfShow: isIfShow2
+          } = getShow(schema);
+          return !isShow2 || !isIfShow2;
+        });
+        if (isAllShowFalse)
+          return null;
         return createVNode(Descriptions$1, props3, _isSlot(_slot2 = group.map((schema) => renderDescriptionsItem(schema))) ? _slot2 : {
           default: () => [_slot2]
         });

package/es/style.css

@@ -10048,8 +10048,9 @@ div.vxe-table--tooltip-wrapper.vxe-table--valid-error.old-cell-valid {
 }
 .shy-basic-descriptions .group {
   display: flex;
-  flex-grow: 0;
-  flex-shrink: 0;
+  flex-grow: 0 !important;
+  flex-shrink: 0 !important;
+  flex-wrap: wrap !important;
   overflow: hidden;
   flex: calc(var(--col-span) - var(--gap));
   width: calc(var(--col-span) - var(--gap));
@@ -10057,8 +10058,9 @@ div.vxe-table--tooltip-wrapper.vxe-table--valid-error.old-cell-valid {
 }
 .shy-basic-descriptions-divider {
   display: flex;
-  flex-grow: 0;
-  flex-shrink: 0;
+  flex-grow: 0 !important;
+  flex-shrink: 0 !important;
+  flex-wrap: wrap !important;
   overflow: hidden;
   flex: calc(var(--col-span) - var(--gap));
   width: calc(var(--col-span) - var(--gap));
@@ -10071,8 +10073,9 @@ div.vxe-table--tooltip-wrapper.vxe-table--valid-error.old-cell-valid {
 }
 .shy-basic-descriptions-group {
   display: flex;
-  flex-grow: 0;
-  flex-shrink: 0;
+  flex-grow: 0 !important;
+  flex-shrink: 0 !important;
+  flex-wrap: wrap !important;
   overflow: hidden;
   flex: calc(var(--col-span) - var(--gap));
   width: calc(var(--col-span) - var(--gap));
@@ -10093,8 +10096,9 @@ div.vxe-table--tooltip-wrapper.vxe-table--valid-error.old-cell-valid {
 }
 .shy-basic-descriptions-custom {
   display: flex;
-  flex-grow: 0;
-  flex-shrink: 0;
+  flex-grow: 0 !important;
+  flex-shrink: 0 !important;
+  flex-wrap: wrap !important;
   overflow: hidden;
   flex: calc(var(--col-span) - var(--gap));
   width: calc(var(--col-span) - var(--gap));
@@ -10102,8 +10106,9 @@ div.vxe-table--tooltip-wrapper.vxe-table--valid-error.old-cell-valid {
 }
 .shy-basic-descriptions-origin {
   display: flex;
-  flex-grow: 0;
-  flex-shrink: 0;
+  flex-grow: 0 !important;
+  flex-shrink: 0 !important;
+  flex-wrap: wrap !important;
   overflow: hidden;
   flex: calc(var(--col-span) - var(--gap));
   width: calc(var(--col-span) - var(--gap));

package/lib/index.js

@@ -11756,7 +11756,7 @@ const FormItem$2 = /* @__PURE__ */ vue.defineComponent({
     const isTableForm = vue.computed(() => !!formProps2.value.formLabelInInput);
     const componentsPropsRef = vue.ref({});
     vue.watch(() => props2.formModel, () => {
-      var _a2, _b, _c, _d, _e;
+      var _a2, _b, _c, _d, _e, _f;
       const {
         schema: schema2,
         tableAction: tableAction2,
@@ -11806,12 +11806,13 @@ const FormItem$2 = /* @__PURE__ */ vue.defineComponent({
         };
       }
       if (schema2.component === "Input" || schema2.component === "InputTextArea") {
-        const maxlength = (componentProps == null ? void 0 : componentProps.maxlength) === void 0 ? 100 : componentProps.maxlength;
+        const maxlength = (componentProps == null ? void 0 : componentProps.maxlength) || ((_e = config == null ? void 0 : config.Input) == null ? void 0 : _e.maxlength) || 100;
         componentProps = Object.assign({}, componentProps, {
           maxlength
         });
         componentProps.onInputEvent = (e2) => {
-          componentProps.maxlength = (componentProps == null ? void 0 : componentProps.maxlength) === void 0 ? 100 : componentProps.maxlength;
+          var _a3;
+          componentProps.maxlength = (componentProps == null ? void 0 : componentProps.maxlength) || ((_a3 = config == null ? void 0 : config.Input) == null ? void 0 : _a3.maxlength) || 100;
           if (!get$1(getValues.value.model, getValues.value.schema.field)) {
             componentProps.showCount = true;
           } else {
@@ -11820,7 +11821,7 @@ const FormItem$2 = /* @__PURE__ */ vue.defineComponent({
         };
       }
       if (schema2.component === "Select") {
-        const label = ((_e = componentProps == null ? void 0 : componentProps.fieldNames) == null ? void 0 : _e.label) || "label";
+        const label = ((_f = componentProps == null ? void 0 : componentProps.fieldNames) == null ? void 0 : _f.label) || "label";
         componentProps = Object.assign({}, componentProps, {
           showSearch: true,
           filterOption: (input, option) => {
@@ -25772,7 +25773,7 @@ const ShyForm = /* @__PURE__ */ vue.defineComponent({
             }
           }
           if ((_b = (_a2 = schema == null ? void 0 : schema.component) == null ? void 0 : _a2.includes) == null ? void 0 : _b.call(_a2, "Input")) {
-            schema.defaultValue = schema.defaultValue || "";
+            schema.defaultValue = !utils$1.isEmpty(schema.defaultValue) ? schema.defaultValue : "";
           }
           if (schema.component === "Table") {
             schema.defaultValue = schema.defaultValue || vue.reactive([]);
@@ -49562,6 +49563,15 @@ const Descriptions = /* @__PURE__ */ vue.defineComponent({
       if (utils$1.isArray(group)) {
         let _slot2;
         const props3 = pick$1(vue.unref(getProps), ["bordered"]);
+        const isAllShowFalse = group.every((schema) => {
+          const {
+            isShow: isShow2,
+            isIfShow: isIfShow2
+          } = getShow(schema);
+          return !isShow2 || !isIfShow2;
+        });
+        if (isAllShowFalse)
+          return null;
         return vue.createVNode(Descriptions$1, props3, _isSlot(_slot2 = group.map((schema) => renderDescriptionsItem(schema))) ? _slot2 : {
           default: () => [_slot2]
         });

package/lib/style.css

@@ -10048,8 +10048,9 @@ div.vxe-table--tooltip-wrapper.vxe-table--valid-error.old-cell-valid {
 }
 .shy-basic-descriptions .group {
   display: flex;
-  flex-grow: 0;
-  flex-shrink: 0;
+  flex-grow: 0 !important;
+  flex-shrink: 0 !important;
+  flex-wrap: wrap !important;
   overflow: hidden;
   flex: calc(var(--col-span) - var(--gap));
   width: calc(var(--col-span) - var(--gap));
@@ -10057,8 +10058,9 @@ div.vxe-table--tooltip-wrapper.vxe-table--valid-error.old-cell-valid {
 }
 .shy-basic-descriptions-divider {
   display: flex;
-  flex-grow: 0;
-  flex-shrink: 0;
+  flex-grow: 0 !important;
+  flex-shrink: 0 !important;
+  flex-wrap: wrap !important;
   overflow: hidden;
   flex: calc(var(--col-span) - var(--gap));
   width: calc(var(--col-span) - var(--gap));
@@ -10071,8 +10073,9 @@ div.vxe-table--tooltip-wrapper.vxe-table--valid-error.old-cell-valid {
 }
 .shy-basic-descriptions-group {
   display: flex;
-  flex-grow: 0;
-  flex-shrink: 0;
+  flex-grow: 0 !important;
+  flex-shrink: 0 !important;
+  flex-wrap: wrap !important;
   overflow: hidden;
   flex: calc(var(--col-span) - var(--gap));
   width: calc(var(--col-span) - var(--gap));
@@ -10093,8 +10096,9 @@ div.vxe-table--tooltip-wrapper.vxe-table--valid-error.old-cell-valid {
 }
 .shy-basic-descriptions-custom {
   display: flex;
-  flex-grow: 0;
-  flex-shrink: 0;
+  flex-grow: 0 !important;
+  flex-shrink: 0 !important;
+  flex-wrap: wrap !important;
   overflow: hidden;
   flex: calc(var(--col-span) - var(--gap));
   width: calc(var(--col-span) - var(--gap));
@@ -10102,8 +10106,9 @@ div.vxe-table--tooltip-wrapper.vxe-table--valid-error.old-cell-valid {
 }
 .shy-basic-descriptions-origin {
   display: flex;
-  flex-grow: 0;
-  flex-shrink: 0;
+  flex-grow: 0 !important;
+  flex-shrink: 0 !important;
+  flex-wrap: wrap !important;
   overflow: hidden;
   flex: calc(var(--col-span) - var(--gap));
   width: calc(var(--col-span) - var(--gap));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "3h1-ui",
-  "version": "3.0.0-next.233",
+  "version": "3.0.0-next.235",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -29,9 +29,9 @@
     "vue-json-pretty": "^2.2.3",
     "vxe-table": "^4.3.6",
     "xe-utils": "^3.5.7",
-    "@shy-plugins/use": "1.0.1-next.5",
     "@shy-plugins/tinymce": "^1.0.6",
-    "@shy-plugins/utils": "1.0.0-next.1"
+    "@shy-plugins/utils": "1.0.0-next.1",
+    "@shy-plugins/use": "1.0.1-next.5"
   },
   "types": "es/ui/index.d.ts",
   "devDependencies": {