wlwy-package 3.2.0 → 3.2.2

package/dist/types/packages/components/form/default/src/form.vue.d.ts

@@ -1,11 +1,5 @@
 import { type FormInstance } from 'ant-design-vue';
 import type { WFormProps } from '../type';
-declare var __VLS_11: {}, __VLS_13: {};
-type __VLS_Slots = {} & {
-    default?: (props: typeof __VLS_11) => any;
-} & {
-    default?: (props: typeof __VLS_13) => any;
-};
 declare const _default: __VLS_WithSlots<import("vue").DefineComponent<WFormProps, {
     getFormInstance: () => FormInstance | undefined;
     $: import("vue").ComponentInternalInstance;
@@ -424,7 +418,9 @@ declare const _default: __VLS_WithSlots<import("vue").DefineComponent<WFormProps
     name: string;
     labelAlign: import("ant-design-vue/es/form/interface").FormLabelAlign;
     scrollToFirstError: boolean | import("scroll-into-view-if-needed").Options<any>;
-}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, __VLS_Slots>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>, {
+    default?: ((props: {}) => any) | undefined;
+}>;
 export default _default;
 type __VLS_WithSlots<T, S> = T & {
     new (): {

package/dist/types/packages/components/form/default/type.d.ts

@@ -204,7 +204,7 @@ export interface WFormSelectInputProps extends FormItemXxProps, Pick<SelectProps
 /**
  * w-select-date-range 组件属性
  */
-export interface WFormDateRangeProps extends FormItemXxProps, Pick<DatePickerProps, 'picker'>, Pick<TimeRangePickerProps, 'presets'> {
+export interface WFormDateRangeProps extends FormItemXxProps, Pick<DatePickerProps, 'picker' | 'showTime'>, Pick<TimeRangePickerProps, 'presets'> {
     /**
      * Lable下拉选项列表
      */

package/dist/wlwy-package.es.js

@@ -837,6 +837,7 @@ const _sfc_main$17 = /* @__PURE__ */ defineComponent({
   }),
   emits: /* @__PURE__ */ mergeModels(["change", "click"], ["update:checked"]),
   setup(__props, { emit: __emit }) {
+    const { t: t3 } = useI18n();
     const checked = useModel(__props, "checked");
     const emits = __emit;
     function handleChange(checked2, event) {
@@ -852,7 +853,7 @@ const _sfc_main$17 = /* @__PURE__ */ defineComponent({
           placement: "top"
         }, {
           title: withCtx(() => [
-            createTextVNode(toDisplayString(__props.title), 1)
+            createTextVNode(toDisplayString(__props.title ? unref(t3)(__props.title) : ""), 1)
           ]),
           default: withCtx(() => [
             createVNode(unref(Switch), mergeProps({
@@ -943,7 +944,7 @@ const _sfc_main$16 = /* @__PURE__ */ defineComponent({
   }
 });
 const configProvider = /* @__PURE__ */ _export_sfc(_sfc_main$16, [["__scopeId", "data-v-f1ca2106"]]);
-const _hoisted_1$u = { class: "no-data" };
+const _hoisted_1$v = { class: "no-data" };
 const _sfc_main$15 = /* @__PURE__ */ defineComponent({
   __name: "noData",
   props: {
@@ -960,7 +961,7 @@ const _sfc_main$15 = /* @__PURE__ */ defineComponent({
       return props.msg ? t3(props.msg) : props.msg;
     });
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1$u, toDisplayString(msg.value), 1);
+      return openBlock(), createElementBlock("div", _hoisted_1$v, toDisplayString(msg.value), 1);
     };
   }
 });
@@ -2091,7 +2092,7 @@ const _sfc_main$14 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _hoisted_1$t = { class: "w-card-title" };
+const _hoisted_1$u = { class: "w-card-title" };
 const _hoisted_2$g = { class: "right" };
 const _sfc_main$13 = /* @__PURE__ */ defineComponent({
   ...{
@@ -2187,7 +2188,7 @@ const _sfc_main$13 = /* @__PURE__ */ defineComponent({
         title.value || _ctx.$slots.title ? {
           name: "title",
           fn: withCtx(() => [
-            createElementVNode("div", _hoisted_1$t, [
+            createElementVNode("div", _hoisted_1$u, [
               createElementVNode("div", {
                 class: normalizeClass(["title", { required: props.required }])
               }, [
@@ -2784,7 +2785,7 @@ const _sfc_main$Z = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _hoisted_1$s = {
+const _hoisted_1$t = {
   key: 0,
   class: "ant-upload-drag-icon"
 };
@@ -2928,7 +2929,7 @@ const _sfc_main$Y = /* @__PURE__ */ defineComponent({
         onChange: handleChange
       }), {
         default: withCtx(() => [
-          uploadIcon.value || _ctx.$slots.uploadIcon ? (openBlock(), createElementBlock("p", _hoisted_1$s, [
+          uploadIcon.value || _ctx.$slots.uploadIcon ? (openBlock(), createElementBlock("p", _hoisted_1$t, [
             renderSlot(_ctx.$slots, "uploadIcon", {}, () => [
               createVNode(unref(WIcon), { type: uploadIcon.value }, null, 8, ["type"])
             ], true)
@@ -2979,7 +2980,7 @@ const _sfc_main$Y = /* @__PURE__ */ defineComponent({
   }
 });
 const upload = /* @__PURE__ */ _export_sfc(_sfc_main$Y, [["__scopeId", "data-v-1fb3c2b7"]]);
-const _hoisted_1$r = { class: "cropper-content" };
+const _hoisted_1$s = { class: "cropper-content" };
 const _hoisted_2$e = { class: "cropper" };
 const _hoisted_3$b = ["src"];
 const _hoisted_4$a = { class: "footer-btn" };
@@ -3106,7 +3107,7 @@ const _sfc_main$X = /* @__PURE__ */ defineComponent({
         onOk: getCrop
       }, {
         default: withCtx(() => [
-          createElementVNode("div", _hoisted_1$r, [
+          createElementVNode("div", _hoisted_1$s, [
             createElementVNode("div", _hoisted_2$e, [
               createVNode(unref(M), mergeProps({
                 ref_key: "cropper",
@@ -3559,7 +3560,7 @@ const _sfc_main$W = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const _hoisted_1$q = { class: "w-table-container" };
+const _hoisted_1$r = { class: "w-table-container" };
 const _hoisted_2$d = {
   key: 0,
   class: "w-table-selection-summary"
@@ -3854,7 +3855,7 @@ const _sfc_main$V = /* @__PURE__ */ defineComponent({
       emit("pageChange", args);
     }
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1$q, [
+      return openBlock(), createElementBlock("div", _hoisted_1$r, [
         showToolbar.value ? (openBlock(), createBlock(unref(VxeToolbar), mergeProps({
           key: 0,
           ref_key: "xToolbarRef",
@@ -4218,6 +4219,10 @@ const _sfc_main$T = /* @__PURE__ */ defineComponent({
     };
   }
 });
+const _hoisted_1$q = {
+  key: 0,
+  class: "form-row-wrapper"
+};
 const _sfc_main$S = /* @__PURE__ */ defineComponent({
   ...{
     name: "WForm"
@@ -4267,6 +4272,37 @@ const _sfc_main$S = /* @__PURE__ */ defineComponent({
         offset: 0
       };
     });
+    const slots = useSlots();
+    const categorizedNodes = computed(() => {
+      var _a, _b;
+      const leftNodes = [];
+      const rightNodes = [];
+      const normalNodes = [];
+      const slotContent = (_a = slots.default) == null ? void 0 : _a.call(slots);
+      if (slotContent) {
+        for (const node of slotContent) {
+          if (typeof node !== "object" || node === null) {
+            normalNodes.push(node);
+            continue;
+          }
+          const vnode = node;
+          const flexExtra = (_b = vnode.props) == null ? void 0 : _b["flex-extra"];
+          if (flexExtra === "left") {
+            leftNodes.push(vnode);
+          } else if (flexExtra === "right") {
+            rightNodes.push(vnode);
+          } else {
+            normalNodes.push(vnode);
+          }
+        }
+      }
+      return { leftNodes, rightNodes, normalNodes };
+    });
+    const flexExtraLeftNodes = computed(() => categorizedNodes.value.leftNodes);
+    const flexExtraRightNodes = computed(() => categorizedNodes.value.rightNodes);
+    const normalSlotNodes = computed(() => categorizedNodes.value.normalNodes);
+    const hasFlexExtraLeft = computed(() => flexExtraLeftNodes.value.length > 0);
+    const hasFlexExtraRight = computed(() => flexExtraRightNodes.value.length > 0);
     const { useProvideData, useProvideDisabled, useProvideColumn, useProvideLabelCol, useProvideWrapperCol, useProvideCard } = useFormStorage();
     useProvideData(computed(() => props.model));
     useProvideDisabled(computed(() => props.disabled));
@@ -4289,25 +4325,56 @@ const _sfc_main$S = /* @__PURE__ */ defineComponent({
         model: props.model
       }), {
         default: withCtx(() => [
-          props.column && !props.card ? (openBlock(), createBlock(unref(Row), {
-            key: 0,
-            class: "form-row",
-            wrap: "",
-            gutter: props.gutter,
-            align: props.align
-          }, {
-            default: withCtx(() => [
-              renderSlot(_ctx.$slots, "default", {}, void 0, true)
-            ]),
-            _: 3
-          }, 8, ["gutter", "align"])) : renderSlot(_ctx.$slots, "default", { key: 1 }, void 0, true)
+          props.column && !props.card ? (openBlock(), createElementBlock("div", _hoisted_1$q, [
+            hasFlexExtraLeft.value ? (openBlock(), createBlock(unref(Space), {
+              key: 0,
+              class: "flex-extra-left"
+            }, {
+              default: withCtx(() => [
+                (openBlock(true), createElementBlock(Fragment, null, renderList(flexExtraLeftNodes.value, (node, index2) => {
+                  return openBlock(), createBlock(resolveDynamicComponent(node), {
+                    key: `flex-left-${index2}`
+                  });
+                }), 128))
+              ]),
+              _: 1
+            })) : createCommentVNode("", true),
+            createVNode(unref(Row), {
+              class: "form-row",
+              wrap: "",
+              gutter: props.gutter,
+              align: props.align
+            }, {
+              default: withCtx(() => [
+                (openBlock(true), createElementBlock(Fragment, null, renderList(normalSlotNodes.value, (node, index2) => {
+                  return openBlock(), createBlock(resolveDynamicComponent(node), {
+                    key: `form-item-${index2}`
+                  });
+                }), 128))
+              ]),
+              _: 1
+            }, 8, ["gutter", "align"]),
+            hasFlexExtraRight.value ? (openBlock(), createBlock(unref(Space), {
+              key: 1,
+              class: "flex-extra-right"
+            }, {
+              default: withCtx(() => [
+                (openBlock(true), createElementBlock(Fragment, null, renderList(flexExtraRightNodes.value, (node, index2) => {
+                  return openBlock(), createBlock(resolveDynamicComponent(node), {
+                    key: `flex-right-${index2}`
+                  });
+                }), 128))
+              ]),
+              _: 1
+            })) : createCommentVNode("", true)
+          ])) : renderSlot(_ctx.$slots, "default", { key: 1 }, void 0, true)
         ]),
         _: 3
       }, 16, ["scrollToFirstError", "layout", "label-align", "label-col", "wrapper-col", "disabled", "name", "model"]);
     };
   }
 });
-const WForm = /* @__PURE__ */ _export_sfc(_sfc_main$S, [["__scopeId", "data-v-1c55119b"]]);
+const WForm = /* @__PURE__ */ _export_sfc(_sfc_main$S, [["__scopeId", "data-v-6b613d1a"]]);
 const _sfc_main$R = /* @__PURE__ */ defineComponent({
   ...{
     name: "WFormCol",
@@ -5477,6 +5544,7 @@ const _sfc_main$F = /* @__PURE__ */ defineComponent({
     labelTooltip: {},
     labelTooltipIcon: {},
     picker: {},
+    showTime: { type: [Boolean, Object] },
     presets: {}
   },
   setup(__props) {
@@ -5563,9 +5631,14 @@ const _sfc_main$F = /* @__PURE__ */ defineComponent({
     });
     const offsetDays = computed(() => props.offsetDays >= 864e5 ? props.offsetDays / 864e5 : props.offsetDays);
     const showTime = computed(() => {
-      var _a, _b;
-      const v2 = ((_a = attrMap.value.default) == null ? void 0 : _a.showTime) ?? ((_b = attrMap.value.default) == null ? void 0 : _b["show-time"]);
-      return v2 !== void 0 && v2 !== false && v2 !== null;
+      const v2 = props.showTime;
+      if (v2 === true) {
+        return { defaultValue: [dayjs("00:00:00", "HH:mm:ss"), dayjs("23:59:59", "HH:mm:ss")] };
+      }
+      return v2;
+    });
+    const hasShowTime = computed(() => {
+      return props.showTime !== void 0 && props.showTime !== false && props.showTime !== null;
     });
     const dates = ref([void 0, void 0]);
     const hackValue = ref();
@@ -5595,7 +5668,7 @@ const _sfc_main$F = /* @__PURE__ */ defineComponent({
       if (val) {
         if (range === "start") {
           const start = toDayjs(val[0]);
-          dates.value[0] = showTime.value ? start : start == null ? void 0 : start.startOf("day");
+          dates.value[0] = hasShowTime.value ? start : start == null ? void 0 : start.startOf("day");
         }
         if (range === "end") {
           const end = toDayjs(val[1]);
@@ -5616,8 +5689,8 @@ const _sfc_main$F = /* @__PURE__ */ defineComponent({
         hackValue.value = form.value[props.model];
       } else {
         if (hackValue.value && !((_a = hackValue.value) == null ? void 0 : _a.some((val) => !val))) {
-          const start = showTime.value ? hackValue.value[0] : (_b = hackValue.value[0]) == null ? void 0 : _b.startOf("day");
-          const end = showTime.value ? hackValue.value[1] : (_c = hackValue.value[1]) == null ? void 0 : _c.endOf("day");
+          const start = hasShowTime.value ? hackValue.value[0] : (_b = hackValue.value[0]) == null ? void 0 : _b.startOf("day");
+          const end = hasShowTime.value ? hackValue.value[1] : (_c = hackValue.value[1]) == null ? void 0 : _c.endOf("day");
           form.value[props.model] = [start, end];
           if (startKey.value) {
             form.value[startKey.value] = start ? Number(start.format("x")) : void 0;
@@ -5691,7 +5764,7 @@ const _sfc_main$F = /* @__PURE__ */ defineComponent({
           ])
         ]),
         default: withCtx(() => [
-          createVNode(unref(RangePicker), mergeProps({ disabledDate, presets: presets.value, ...unref(attrMap).default, onCalendarChange, onOpenChange, onChange }, {
+          createVNode(unref(RangePicker), mergeProps({ disabledDate, presets: presets.value, showTime: showTime.value, ...unref(attrMap).default, onCalendarChange, onOpenChange, onChange }, {
             value: hackValue.value || unref(form)[props.model],
             disabled: unref(disabled),
             allowClear: props.allowClear,
@@ -5704,7 +5777,7 @@ const _sfc_main$F = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const dateRange = /* @__PURE__ */ _export_sfc(_sfc_main$F, [["__scopeId", "data-v-78a548c6"]]);
+const dateRange = /* @__PURE__ */ _export_sfc(_sfc_main$F, [["__scopeId", "data-v-13c65dce"]]);
 const _sfc_main$E = /* @__PURE__ */ defineComponent({
   ...{
     name: "WFormTimePicker",
@@ -6227,7 +6300,7 @@ const _sfc_main$z = /* @__PURE__ */ defineComponent({
     const keyword = ref("");
     const code = ref("");
     watch(keyword, (value) => {
-      code.value = i18nMap.value[value] ?? value;
+      code.value = i18nMap.value[value.trim()] ?? value.trim();
       form.value[props.model] = code.value;
     });
     watch(
@@ -7427,7 +7500,7 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
     const actionColSpan = computed(() => 24 - firstRowCount.value * colSpan.value);
     const fieldVnodes = computed(() => {
       var _a;
-      return flattenVNodes2(((_a = slots.default) == null ? void 0 : _a.call(slots)) ?? []).filter(isSearchField);
+      return flattenVNodes2(((_a = slots.default) == null ? void 0 : _a.call(slots)) ?? []);
     });
     const firstRowFields = computed(() => fieldVnodes.value.slice(0, firstRowCount.value));
     const moreFields = computed(() => fieldVnodes.value.slice(firstRowCount.value));
@@ -7447,15 +7520,6 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
       }
       return result;
     }
-    function isSearchField(vnode) {
-      const type = vnode.type;
-      if (!type || typeof type === "string") return false;
-      const name = String(type.name ?? type.__name ?? type.displayName ?? "");
-      if (/FormItem/i.test(name)) return true;
-      return /^WForm(?:Input|Select|Textarea|Number|Password|DatePicker|TimePicker|Radio|Checkbox|Tags|Match|I18n|Custom|Upload|DateRange|NumberRange|SelectInput|Country|Customer|Channel|Sku)/.test(
-        name
-      );
-    }
     function handleSearch() {
       var _a;
       (_a = formRef.value) == null ? void 0 : _a.validate().then(() => {
@@ -7601,7 +7665,7 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const search = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["__scopeId", "data-v-2fa2161d"]]);
+const search = /* @__PURE__ */ _export_sfc(_sfc_main$p, [["__scopeId", "data-v-f5fc66e3"]]);
 const _hoisted_1$h = { class: "w-edit-title" };
 const _hoisted_2$a = { class: "right" };
 const _sfc_main$o = /* @__PURE__ */ defineComponent({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wlwy-package",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "private": false,
   "type": "module",
   "main": "dist/wlwy-package.es.js",