wlwy-package 3.2.3-httpOnlyCookie.0 → 3.2.4

package/dist/types/packages/components/table/warnDeprecated.d.ts

@@ -4,3 +4,5 @@ export declare function warnPropConflict(key: string, namespace: 'toolbar' | 'pa
 export declare function warnShowToolbarConflict(): void;
 /** toolbar slot 与显式关闭工具栏冲突时，以 slot 为准 */
 export declare function warnToolbarSlotConflict(source: 'showToolbar' | 'toolbar.hideToolbar'): void;
+/** 默认单元格渲染依赖 field 取值，缺失时仅开发环境报错，不阻塞运行 */
+export declare function warnMissingFieldForDefaultCell(title?: string): void;

package/dist/types/packages/hooks/private/src/useRenderCell.d.ts

@@ -14,7 +14,7 @@ export type RenderCellFormatByType = {
     type: 'datetime';
 } & TemporalExtra) | ({
     type: 'number';
-} & Pick<FormatCellNumberOptions, 'precision'>) | ({
+} & Pick<FormatCellNumberOptions, 'precision' | 'useGrouping'>) | ({
     type: 'percent';
 } & Pick<FormatCellPercentOptions, 'valueScale'>) | ({
     type: 'boolean';
@@ -26,10 +26,10 @@ export type RenderCellFormatByType = {
 }) | ({
     type: 'i18n';
 } & Pick<FormatCellI18nOptions, 'values'>)
-/** @deprecated 请改用 `type: 'number'` 且 `precision: 2` */
- | {
+/** 金额：等价于 `number` + 默认 `precision: 2` + 千分位；有 `precision` 时以传入为准 */
+ | ({
     type: 'amount';
-};
+} & Pick<FormatCellNumberOptions, 'precision'>);
 /** @deprecated 旧版平铺 props，由 {@link toFormatCellOptions} 自动映射 */
 export type RenderCellLegacyProps = {
     /** @deprecated 请改用 `format` */
@@ -51,6 +51,8 @@ export type RenderCellLegacyProps = {
 export type RenderCellFormatType = NonNullable<RenderCellFormatByType['type']>;
 export type RenderCellProps = {
     field?: FieldPath;
+    /** 空值占位符，默认由 {@link formatCellValue} 处理为 `-` */
+    emptyPlaceholder?: string;
 } & RenderCellFormatByType & Partial<RenderCellLegacyProps>;
 export declare function resolveLegacyEnumMap(props: RenderCellProps, context: {
     translate: (key: string) => string;

package/dist/types/packages/utils/formatCellValue.d.ts

@@ -20,6 +20,8 @@ export interface FormatCellNumberOptions {
     type: 'number';
     /** 小数位数：0 为整数，1 为一位小数，以此类推 */
     precision?: number;
+    /** 是否使用千分位分组；未传则跟随 `Intl.NumberFormat` 默认（通常为 true） */
+    useGrouping?: boolean;
 }
 export interface FormatCellPercentOptions {
     type: 'percent';
@@ -78,5 +80,7 @@ export declare function formatCellValueCore(value: unknown, options: FormatCellO
 /**
  * 表格/描述列表等场景的单元格格式化：按 `options.type` 输出字符串；
  * 无法识别为日期/数字等时 **原样字符串化**，不使用 `Invalid Date`。
+ *
+ * @param emptyPlaceholder 空值占位符，默认 `-`；日期/时间类型额外将 `0` / `'0'` 视为空
  */
-export declare function formatCellValue(value: unknown, options: FormatCellOptions): string;
+export declare function formatCellValue(value: unknown, options: FormatCellOptions, emptyPlaceholder?: string): string;

package/dist/wlwy-package.es.js

@@ -2,12 +2,12 @@ import { h, reactive, toRefs, markRaw, ref, computed, unref, nextTick, watch, on
 import { App, message, theme, Tooltip, Switch, ConfigProvider, Spin, Button, Card, Row, DatePicker, Descriptions, Modal, Select, Statistic, Form, UploadDragger, Upload, Space, Col, FormItem, Input, InputPassword, InputNumber, Textarea, CheckboxGroup, Checkbox, RadioGroup, RangePicker, TimePicker, InputGroup, Image as Image$1, Dropdown, Menu, Progress, PageHeader, MenuItem, Tabs, TabPane, SubMenu, LayoutSider, LayoutFooter, Badge, Drawer, Alert, List, ListItem, LayoutHeader, Avatar, MenuDivider, Skeleton, Layout, LayoutContent } from "ant-design-vue";
 import zhCn from "ant-design-vue/es/locale/zh_CN.js";
 import enUs from "ant-design-vue/es/locale/en_US.js";
-import { u as useI18n, a as useCommonStore, A as API, c as config, b as useLocale, d as useTabsNavStoreWithOut, e as useUserPermissionStoreWithOut, f as useDictStoreWithOut, _ as _sfc_main$19, g as useCommonStoreWithOut, h as useFormStorage, i as formatCellValue, k as kebabToCamel, j as useFormItemProps, p as pickMultiple, l as isExternalLink, n as newWin, m as useLanguageStoreWithOut, o as _sfc_main$1a, s as setConfig } from "./index-DtK1XQdW.js";
-import { D, E, r, t, C, z, x, y, B, q, v, w } from "./index-DtK1XQdW.js";
+import { u as useI18n, a as useCommonStore, A as API, c as config, b as useLocale, d as useTabsNavStoreWithOut, e as useUserPermissionStoreWithOut, f as useDictStoreWithOut, _ as _sfc_main$19, g as useCommonStoreWithOut, h as useFormStorage, i as formatCellValue, k as kebabToCamel, j as useFormItemProps, p as pickMultiple, l as isExternalLink, n as newWin, m as useLanguageStoreWithOut, o as _sfc_main$1a, s as setConfig } from "./index-KquGST1J.js";
+import { D, E, r, t, C, z, x, y, B, q, v, w } from "./index-KquGST1J.js";
 import { clone, debounce, omit, get, pick, merge, isEmpty, set } from "xe-utils";
 import { RouterLink, useRouter } from "vue-router";
-import { _ as _export_sfc } from "./index-BPPIVUm2.js";
-import { E as E2 } from "./index-BPPIVUm2.js";
+import { _ as _export_sfc } from "./index-DVGXAKlY.js";
+import { E as E2 } from "./index-DVGXAKlY.js";
 import { DownOutlined, UpOutlined } from "@ant-design/icons-vue";
 import * as VxeUITable from "vxe-table";
 import { VxeColumn, VxeUI, VxeToolbar, VxeTable } from "vxe-table";
@@ -2367,7 +2367,12 @@ function toFormatCellOptions(props, context) {
   const legacy = props;
   const temporalFormat = resolveTemporalFormat(props);
   if (renderType === "amount") {
-    return { type: "number", precision: 2 };
+    const p = props;
+    return {
+      type: "number",
+      precision: p.precision ?? legacy.precision ?? 2,
+      useGrouping: true
+    };
   }
   if (renderType) {
     switch (renderType) {
@@ -2387,7 +2392,11 @@ function toFormatCellOptions(props, context) {
       }
       case "number": {
         const p = props;
-        return { type: "number", precision: p.precision ?? legacy.precision };
+        return {
+          type: "number",
+          precision: p.precision ?? legacy.precision,
+          useGrouping: p.useGrouping
+        };
       }
       case "percent": {
         const p = props;
@@ -2464,7 +2473,7 @@ function useRenderCell(props) {
       if (value === "" || value === null || value === void 0) return void 0;
       return String(value);
     }
-    return formatCellValue(value, options);
+    return formatCellValue(value, options, props.emptyPlaceholder);
   }
   return {
     getRenderValue
@@ -2482,10 +2491,12 @@ const _sfc_main$11 = /* @__PURE__ */ defineComponent({
   __name: "descriptions-item",
   props: {
     field: {},
+    emptyPlaceholder: {},
     type: {},
     format: {},
     timeZone: {},
     precision: {},
+    useGrouping: { type: Boolean },
     valueScale: {},
     trueText: {},
     falseText: {},
@@ -3357,6 +3368,9 @@ const WTABLE_VXE_DEFAULT_CONFIG = {
     pageSizes: [10, 20, 50, 100, 200, 500]
   }
 };
+function warnMissingFieldForDefaultCell(title) {
+  return;
+}
 function camelToKebab(key) {
   return key.replace(/([A-Z])/g, "-$1").toLowerCase();
 }
@@ -3672,8 +3686,8 @@ const _sfc_main$V = /* @__PURE__ */ defineComponent({
   emits: ["pageChange"],
   setup(__props, { expose: __expose, emit: __emit }) {
     useCssVars((_ctx) => ({
-      "d3b1cec8": `${unref(token).borderRadius}px`,
-      "v28fe9ce3": unref(token).colorError
+      "v7814ebd9": `${unref(token).borderRadius}px`,
+      "v0aa3c106": unref(token).colorError
     }));
     const WTABLE_EXPOSE_KEYS = /* @__PURE__ */ new Set([
       "getTableInstance",
@@ -3789,10 +3803,17 @@ const _sfc_main$V = /* @__PURE__ */ defineComponent({
       ...omit(config2.value.pager, ["currentPage", "pageSize"]),
       ...pagerDataBind.value
     }));
-    const mergedSeqConfig = computed(() => ({
-      ...config2.value.table.seqConfig,
-      startIndex: props.showPager ? (currentPage.value - 1) * pageSize.value : 0
-    }));
+    const seqOffset = computed(() => props.showPager ? (currentPage.value - 1) * pageSize.value : 0);
+    const mergedSeqConfig = computed(() => {
+      const userSeqConfig = config2.value.table.seqConfig ?? {};
+      const { startIndex: _2, seqMethod: userSeqMethod, ...rest } = userSeqConfig;
+      return {
+        ...rest,
+        seqMethod: userSeqMethod ?? ((params) => {
+          return seqOffset.value + params.rowIndex + 1;
+        })
+      };
+    });
     function getPagerState() {
       return {
         currentPage: currentPage.value,
@@ -3951,7 +3972,7 @@ const _sfc_main$V = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const WTable = /* @__PURE__ */ _export_sfc(_sfc_main$V, [["__scopeId", "data-v-dd23f899"]]);
+const WTable = /* @__PURE__ */ _export_sfc(_sfc_main$V, [["__scopeId", "data-v-5e8a9501"]]);
 const _sfc_main$U = /* @__PURE__ */ defineComponent({
   ...{
     name: "WActionColumn"
@@ -3981,9 +4002,11 @@ const _sfc_main$T = /* @__PURE__ */ defineComponent({
   },
   __name: "column",
   props: {
+    emptyPlaceholder: {},
     format: {},
     timeZone: {},
     precision: {},
+    useGrouping: { type: Boolean },
     valueScale: {},
     trueText: {},
     falseText: {},
@@ -4020,6 +4043,32 @@ const _sfc_main$T = /* @__PURE__ */ defineComponent({
     const props = __props;
     const attrs = useAttrs();
     const slots = useSlots();
+    const DEFAULT_CELL_EDIT_RENDER_NAMES = [
+      "input",
+      "$input",
+      "VxeInput",
+      "textarea",
+      "$textarea",
+      "VxeTextarea"
+    ];
+    function shouldUseDefaultCellRender(editRender) {
+      if (!editRender) return true;
+      const name = editRender.name;
+      return !!name && DEFAULT_CELL_EDIT_RENDER_NAMES.includes(name);
+    }
+    const usesDefaultCellRender = computed(() => {
+      return !slots.default && !["seq", "checkbox", "radio", "expand", "html"].includes(props.type ?? "") && !props.formatter && shouldUseDefaultCellRender(props.editRender);
+    });
+    watch(
+      () => [usesDefaultCellRender.value, props.field],
+      ([need, field]) => {
+        if (!need) return;
+        if (field === void 0 || field === null || field === "") {
+          warnMissingFieldForDefaultCell(props.title);
+        }
+      },
+      { immediate: true }
+    );
     const extraSlotNames = computed(() => Object.keys(slots).filter((name) => name !== "default"));
     const columnShowOverflow = computed(() => {
       const explicit = attrs.showOverflow ?? attrs["show-overflow"];
@@ -4111,19 +4160,6 @@ const _sfc_main$T = /* @__PURE__ */ defineComponent({
       }
       return isNaN(width2) ? 100 : width2;
     }
-    const DEFAULT_CELL_EDIT_RENDER_NAMES = [
-      "input",
-      "$input",
-      "VxeInput",
-      "textarea",
-      "$textarea",
-      "VxeTextarea"
-    ];
-    function shouldUseDefaultCellRender(editRender) {
-      if (!editRender) return true;
-      const name = editRender.name;
-      return !!name && DEFAULT_CELL_EDIT_RENDER_NAMES.includes(name);
-    }
     const editRanderTypeExtend = ["VxeTextarea"];
     const headerClassName = (params) => {
       if (typeof props.headerClassName === "string") {
@@ -4195,7 +4231,7 @@ const _sfc_main$T = /* @__PURE__ */ defineComponent({
             }, 1536)) : renderSlot(_ctx.$slots, "default", normalizeProps(mergeProps({ key: 1 }, { ...data })))
           ]),
           key: "1"
-        } : !["seq", "checkbox", "radio", "expand", "html"].includes(props.type ?? "") && !props.formatter && shouldUseDefaultCellRender(props.editRender) ? {
+        } : usesDefaultCellRender.value ? {
           name: "default",
           fn: withCtx((data) => [
             renderSlot(_ctx.$slots, "default", normalizeProps(guardReactiveProps({ ...data })), () => [
@@ -11106,7 +11142,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     useCssVars((_ctx) => ({
-      "da3013c6": unref(token).colorPrimary
+      "e8971a06": unref(token).colorPrimary
     }));
     const { t: t3 } = useI18n();
     const defaultsOption = [
@@ -11142,7 +11178,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
       Modal.confirm({
         title: t3("lang.com_msg_2684"),
         onOk: async () => {
-          const { success } = await API.POST("/auth/cas/logout");
+          const { success } = await API.GET("/auth/cas/logout");
           if (success) {
             API.GET("/auth/cas/isLogin");
           }
@@ -11271,7 +11307,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const WLayoutHeader = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-a500ba00"]]);
+const WLayoutHeader = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-69e34512"]]);
 const _hoisted_1$1 = { class: "skeleton-list" };
 const _hoisted_2$1 = { class: "search-form" };
 const _hoisted_3 = { class: "label" };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wlwy-package",
-  "version": "3.2.3-httpOnlyCookie.0",
+  "version": "3.2.4",
   "private": false,
   "type": "module",
   "main": "dist/wlwy-package.es.js",
@@ -92,4 +92,4 @@
       "git add"
     ]
   }
-}
+}