wlwy-package 3.2.3-httpOnlyCookie.0 → 4.0.0-beta.2

package/dist/editor/index.es.js

@@ -1,4 +1,4 @@
-import { E as Editor } from "../index-BPPIVUm2.js";
+import { E as Editor } from "../index-nd_lc6wA.js";
 export {
   Editor as default
 };

package/dist/{editor-core-C7ZO3umt.js → editor-core-BGPSxIdD.js}

@@ -1,9 +1,9 @@
 import { defineComponent, createElementBlock, openBlock, ref, shallowRef, onMounted, watch, toRaw, watchEffect, mergeModels, useCssVars, unref, useModel, computed, onBeforeUnmount, createVNode } from "vue";
 import "xe-utils";
+import { u as useI18n, b as useLocale, A as API } from "./index-5P9J8Ohq.js";
 import { theme, message } from "ant-design-vue";
 import "vue-router";
-import { u as useI18n, b as useLocale, A as API } from "./index-DtK1XQdW.js";
-import { _ as _export_sfc$1 } from "./index-BPPIVUm2.js";
+import { _ as _export_sfc$1 } from "./index-nd_lc6wA.js";
 var e = "undefined" != typeof globalThis ? globalThis : "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof self ? self : {};
 function t(e10) {
   return e10 && e10.__esModule && Object.prototype.hasOwnProperty.call(e10, "default") ? e10.default : e10;

package/dist/{index-DtK1XQdW.js → index-5P9J8Ohq.js}

@@ -4,9 +4,12 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
 import { defineStore, createPinia } from "pinia";
 import { ref, reactive, computed, toRefs, effectScope, shallowRef, watch, isRef, defineComponent, getCurrentInstance, h, Fragment, inject, onMounted, onUnmounted, createVNode, Text, unref, useAttrs, useSlots, provide, nextTick, createBlock, openBlock, resolveDynamicComponent, createElementBlock } from "vue";
 import { cookie, merge as merge$1, omit, pick, toTreeArray, clone, findTree } from "xe-utils";
-import { message, theme } from "ant-design-vue";
-import { useRouter } from "vue-router";
+import { message, FormItem, theme } from "ant-design-vue";
 import dayjs from "dayjs";
+import isBetween from "dayjs/plugin/isBetween";
+import isSameOrAfter from "dayjs/plugin/isSameOrAfter";
+import isSameOrBefore from "dayjs/plugin/isSameOrBefore";
+import { useRouter } from "vue-router";
 import utc from "dayjs/plugin/utc";
 import timezone from "dayjs/plugin/timezone";
 import * as Icons from "@ant-design/icons-vue";
@@ -181,7 +184,7 @@ const useTabsNavStoreWithOut = () => {
 function getConfig() {
   return window._CONFIG ?? {};
 }
-function getCookie(key) {
+function getCookie$1(key) {
   return cookie.get(key) || "";
 }
 function setCookie(key, value, options = {}) {
@@ -207,12 +210,164 @@ function getTopLevelDomain(url) {
 }
 function useCookie() {
   return {
-    getCookie,
+    getCookie: getCookie$1,
     setCookie,
     removeCookie,
     getCookieAll
   };
 }
+dayjs.extend(isBetween);
+dayjs.extend(isSameOrAfter);
+dayjs.extend(isSameOrBefore);
+const DEFAULT_DATETIME_FORMAT$1 = "YYYY-MM-DD HH:mm:ss";
+const DEFAULT_DATE_FORMAT$1 = "YYYY-MM-DD";
+function useDate(options = {}) {
+  const defaultFormat = options.format ?? DEFAULT_DATETIME_FORMAT$1;
+  const includeCurrent = options.includeCurrent ?? true;
+  function toDayjs(value) {
+    if (value == null || value === "") return dayjs();
+    return dayjs.isDayjs(value) ? value : dayjs(value);
+  }
+  function format2(value, pattern = defaultFormat) {
+    if (!value) return "-";
+    const d = toDayjs(value);
+    return d.isValid() ? d.format(pattern) : "-";
+  }
+  function parse2(value, pattern) {
+    return pattern ? dayjs(value, pattern) : dayjs(value);
+  }
+  function startOf(value, unit = "day") {
+    return toDayjs(value).startOf(unit);
+  }
+  function endOf(value, unit = "day") {
+    return toDayjs(value).endOf(unit);
+  }
+  function toTimestamp(value) {
+    return toDayjs(value).valueOf();
+  }
+  function fromTimestamp(ms) {
+    return dayjs(ms);
+  }
+  function recentRange(n, unit = "day", opts) {
+    const base = endOf((opts == null ? void 0 : opts.base) ?? dayjs(), "day");
+    const include = (opts == null ? void 0 : opts.includeCurrent) ?? includeCurrent;
+    let start;
+    if (unit === "day" || unit === "d") {
+      start = base.subtract(include ? n - 1 : n, "day").startOf("day");
+    } else {
+      start = base.subtract(n, unit).add(include ? 1 : 0, "day").startOf("day");
+    }
+    return [start, base];
+  }
+  const recentDays = (n, opts) => recentRange(n, "day", opts);
+  const recentMonths = (n, opts) => recentRange(n, "month", opts);
+  const recentYears = (n, opts) => recentRange(n, "year", opts);
+  const presets = {
+    last3Days: () => recentDays(3),
+    last7Days: () => recentDays(7),
+    last1Month: () => recentMonths(1),
+    last3Months: () => recentMonths(3),
+    last6Months: () => recentMonths(6),
+    last1Year: () => recentYears(1),
+    last2Years: () => recentYears(2),
+    last3Years: () => recentYears(3),
+    last5Years: () => recentYears(5),
+    last10Years: () => recentYears(10)
+  };
+  function today() {
+    const now2 = dayjs();
+    return [now2.startOf("day"), now2.endOf("day")];
+  }
+  function yesterday() {
+    const d = dayjs().subtract(1, "day");
+    return [d.startOf("day"), d.endOf("day")];
+  }
+  function thisWeek() {
+    const now2 = dayjs();
+    return [now2.startOf("week"), now2.endOf("week")];
+  }
+  function lastWeek() {
+    const d = dayjs().subtract(1, "week");
+    return [d.startOf("week"), d.endOf("week")];
+  }
+  function thisMonth() {
+    const now2 = dayjs();
+    return [now2.startOf("month"), now2.endOf("month")];
+  }
+  function lastMonth() {
+    const d = dayjs().subtract(1, "month");
+    return [d.startOf("month"), d.endOf("month")];
+  }
+  function thisYear() {
+    const now2 = dayjs();
+    return [now2.startOf("year"), now2.endOf("year")];
+  }
+  function lastYear() {
+    const d = dayjs().subtract(1, "year");
+    return [d.startOf("year"), d.endOf("year")];
+  }
+  function add(value, n, unit) {
+    return toDayjs(value).add(n, unit);
+  }
+  function subtract(value, n, unit) {
+    return toDayjs(value).subtract(n, unit);
+  }
+  function diff(a, b, unit = "day", float = false) {
+    return toDayjs(a).diff(toDayjs(b), unit, float);
+  }
+  function isBefore(a, b, unit) {
+    return toDayjs(a).isBefore(toDayjs(b), unit);
+  }
+  function isAfter(a, b, unit) {
+    return toDayjs(a).isAfter(toDayjs(b), unit);
+  }
+  function isSame(a, b, unit) {
+    return toDayjs(a).isSame(toDayjs(b), unit);
+  }
+  function isBetween2(value, start, end, unit = "day", inclusivity = "[]") {
+    return toDayjs(value).isBetween(toDayjs(start), toDayjs(end), unit, inclusivity);
+  }
+  function toTimestampRange(range) {
+    return [range[0].valueOf(), range[1].valueOf()];
+  }
+  function toFormatRange(range, pattern = defaultFormat) {
+    return [range[0].format(pattern), range[1].format(pattern)];
+  }
+  return {
+    dayjs,
+    DEFAULT_DATETIME_FORMAT: DEFAULT_DATETIME_FORMAT$1,
+    DEFAULT_DATE_FORMAT: DEFAULT_DATE_FORMAT$1,
+    toDayjs,
+    format: format2,
+    parse: parse2,
+    startOf,
+    endOf,
+    toTimestamp,
+    fromTimestamp,
+    recentRange,
+    recentDays,
+    recentMonths,
+    recentYears,
+    presets,
+    today,
+    yesterday,
+    thisWeek,
+    lastWeek,
+    thisMonth,
+    lastMonth,
+    thisYear,
+    lastYear,
+    add,
+    subtract,
+    diff,
+    isBefore,
+    isAfter,
+    isSame,
+    isBetween: isBetween2,
+    toTimestampRange,
+    toFormatRange
+  };
+}
 function bind(fn, thisArg) {
   return function wrap() {
     return fn.apply(thisArg, arguments);
@@ -2705,6 +2860,7 @@ const {
   mergeConfig
 } = axios;
 const DEFAULT_LOADING = false;
+const { getCookie } = useCookie();
 const { getLanguage: getLanguage$1 } = useLocale();
 class service {
   constructor(config2) {
@@ -2713,40 +2869,40 @@ class service {
     __publicField(this, "interceptors");
     __publicField(this, "showLoading");
     __publicField(this, "spinning");
-    __publicField(this, "systemType");
-    var _a, _b, _c, _d, _e, _f;
+    __publicField(this, "tokenKey");
+    var _a, _b, _c, _d;
     this.interceptors = config2.interceptors;
     this.showLoading = config2.showLoading || DEFAULT_LOADING;
-    const headerSystemType = ((_a = config2.headers) == null ? void 0 : _a["System-Type"]) ?? ((_b = config2.headers) == null ? void 0 : _b["system-type"]);
-    this.systemType = config2.systemType || (typeof headerSystemType === "string" ? headerSystemType : "T");
+    this.tokenKey = config2.tokenKey || "ttoken";
     delete config2.interceptors;
     delete config2.showLoading;
     delete config2.tokenKey;
-    delete config2.systemType;
-    config2.withCredentials = true;
     this.instance = axios.create(config2);
+    this.instance.interceptors.request.use((_a = this.interceptors) == null ? void 0 : _a.requestInterceptor, (_b = this.interceptors) == null ? void 0 : _b.requestInterceptorCatch);
     this.instance.interceptors.response.use((_c = this.interceptors) == null ? void 0 : _c.responseInterceptor, (_d = this.interceptors) == null ? void 0 : _d.responseInterceptorCatch);
     this.instance.interceptors.request.use(
       (config22) => {
-        var _a2;
         if (this.spinning ?? this.showLoading) {
           const commonStore = useCommonStoreWithOut();
           commonStore.setLoading(true);
         }
-        config22.headers.delete("satoken");
-        config22.headers.set("language", getLanguage$1());
-        config22.headers.set("System-Type", this.systemType);
-        config22.headers.set("timezone", Intl.DateTimeFormat().resolvedOptions().timeZone);
-        if (["POST", "PUT", "PATCH", "DELETE"].includes(((_a2 = config22.method) == null ? void 0 : _a2.toUpperCase()) || "")) {
-          config22.headers.set("X-CSRF-Protection", "1");
-        }
+        Object.assign(config22.headers, {
+          // 添加TOKEN
+          Satoken: getCookie(this.tokenKey) ?? "",
+          // 添加语言
+          language: getLanguage$1(),
+          // 添加SystemType
+          "System-Type": "T",
+          // 添加时区
+          timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+          ...config22.headers
+        });
         return config22;
       },
       (error) => {
         return error;
       }
     );
-    this.instance.interceptors.request.use((_e = this.interceptors) == null ? void 0 : _e.requestInterceptor, (_f = this.interceptors) == null ? void 0 : _f.requestInterceptorCatch);
     this.instance.interceptors.response.use(
       (response) => {
         const commonStore = useCommonStoreWithOut();
@@ -8471,14 +8627,23 @@ const DEFAULT_TEMPORAL_PATTERNS = {
   datetime: DEFAULT_DATETIME_FORMAT
 };
 const INTL_MAX_FRACTION_DIGITS = 20;
-function resolvePlaceholder() {
-  return DEFAULT_PLACEHOLDER;
+function resolvePlaceholder(emptyPlaceholder) {
+  return emptyPlaceholder ?? DEFAULT_PLACEHOLDER;
 }
 function isEmptyCellValue(value) {
   if (value === null || value === void 0) return true;
   if (value === "") return true;
   return false;
 }
+function isEmptyTemporalValue(value) {
+  if (isEmptyCellValue(value)) return true;
+  if (value === 0 || value === "0") return true;
+  if (typeof value === "string" && value.trim() === "") return true;
+  return false;
+}
+function isTemporalFormatType(type) {
+  return type === "date" || type === "time" || type === "datetime";
+}
 function preserveRawCellValue(value) {
   if (value === null || value === void 0) return "";
   return String(value);
@@ -8548,6 +8713,7 @@ function resolveNumberPrecision(precision) {
   };
 }
 function formatTemporalValue(value, temporalType, options) {
+  if (isEmptyTemporalValue(value)) return "";
   const d = coerceToValidDate(value, DEFAULT_DATE_MIN_YEAR, DEFAULT_DATE_MAX_YEAR);
   if (!d) return preserveRawCellValue(value);
   try {
@@ -8607,7 +8773,10 @@ function formatCellValueCore(value, options) {
       const n = coerceFiniteNumber(value);
       if (n === null) return preserveRawCellValue(value);
       try {
-        return new Intl.NumberFormat(void 0, resolveNumberPrecision(options.precision)).format(n);
+        return new Intl.NumberFormat(void 0, {
+          ...resolveNumberPrecision(options.precision),
+          ...options.useGrouping !== void 0 ? { useGrouping: options.useGrouping } : {}
+        }).format(n);
       } catch {
         return preserveRawCellValue(value);
       }
@@ -8654,9 +8823,13 @@ function formatCellValueCore(value, options) {
       return preserveRawCellValue(value);
   }
 }
-function formatCellValue(value, options) {
+function formatCellValue(value, options, emptyPlaceholder = DEFAULT_PLACEHOLDER) {
+  const placeholder = resolvePlaceholder(emptyPlaceholder);
   if (isEmptyCellValue(value)) {
-    return resolvePlaceholder();
+    return placeholder;
+  }
+  if (isTemporalFormatType(options.type) && isEmptyTemporalValue(value)) {
+    return placeholder;
   }
   return formatCellValueCore(value, options);
 }
@@ -8705,38 +8878,20 @@ function pickMultiple(obj, targets) {
 }
 const { t } = useI18n();
 const { isChinese } = useLocale();
-const FormItemPropsKeyMirror = {
-  span: true,
-  autoLink: true,
-  colon: true,
-  extra: true,
-  hasFeedback: true,
-  help: true,
-  htmlFor: true,
-  label: true,
-  labelAlign: true,
-  labelCol: true,
-  name: true,
-  required: true,
-  tooltip: true,
-  validateFirst: true,
-  validateStatus: true,
-  validateTrigger: true,
-  wrapperCol: true,
-  class: true,
-  style: true,
-  hidden: true,
-  noStyle: true,
-  prefixCls: true,
-  prop: true,
-  rules: true,
-  messageVariables: true,
-  offset: true,
-  labelTooltip: true,
-  labelTooltipIcon: true
-};
+const W_FORM_ITEM_EXTRA_KEYS = [
+  "span",
+  "offset",
+  "labelTooltip",
+  "labelTooltipIcon",
+  "compact"
+];
 const FormItemSlotsKey = ["extra", "help", "label"];
-const FormItemPropsKeys = Object.keys(FormItemPropsKeyMirror);
+const FormItemPropsKeys = [
+  ...Object.keys(FormItem.props ?? {}),
+  ...W_FORM_ITEM_EXTRA_KEYS,
+  "class",
+  "style"
+];
 function pickFormItemFromProps(props) {
   const result = {};
   for (const key of FormItemPropsKeys) {
@@ -8750,7 +8905,7 @@ function useFormItemProps(props) {
   const attrs = useAttrs();
   const slots = useSlots();
   const { useInjectDisabled, useInjectData } = useFormStorage();
-  const WFormModaldisabled = useInjectDisabled(false);
+  const formDisabled = useInjectDisabled(false);
   const WFormData = useInjectData();
   const attrMap = computed(() => {
     const fromAttrs = pickMultiple(kebabToCamel(attrs), {
@@ -8774,7 +8929,7 @@ function useFormItemProps(props) {
     return props.label ? t(props.label) : props.label ?? "";
   });
   const disabled = computed(() => {
-    return props.disabled || props.isDetails || WFormModaldisabled.value || false;
+    return props.disabled || props.isDetails || formDisabled.value || false;
   });
   const placeholder = computed(() => {
     return disabled.value ? "" : props.placeholder ? t(props.placeholder) : `${t("com_msg_062")}${isChinese ? "" : " "}${label.value}`;
@@ -9464,15 +9619,15 @@ export {
   useLanguageStoreWithOut as m,
   newWin as n,
   _sfc_main as o,
-  pickMultiple as p,
-  useService as q,
-  setupStore as r,
+  useService as p,
+  setupStore as q,
+  store as r,
   setConfig as s,
-  store as t,
+  useTabsNavStore as t,
   useI18n as u,
-  useTabsNavStore as v,
-  useUserPermissionStore as w,
-  useDictStore as x,
-  useLanguageStore as y,
-  useCookie as z
+  useUserPermissionStore as v,
+  useDictStore as w,
+  useLanguageStore as x,
+  useCookie as y,
+  useDate as z
 };

package/dist/{index-BPPIVUm2.js → index-nd_lc6wA.js}

@@ -22,7 +22,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   }),
   emits: /* @__PURE__ */ mergeModels(["change", "focus", "blur"], ["update:html", "update:text"]),
   setup(__props, { expose: __expose, emit: __emit }) {
-    const EditorCore = defineAsyncComponent(() => import("./editor-core-C7ZO3umt.js"));
+    const EditorCore = defineAsyncComponent(() => import("./editor-core-BGPSxIdD.js"));
     const html = useModel(__props, "html");
     const text = useModel(__props, "text");
     const props = __props;