element-ps 2.0.26 → 2.0.27

package/lib/components/collapse/src/collapse.js

@@ -2,72 +2,27 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var vue = require('vue');
 require('../../../utils/index.js');
 require('../../../constants/index.js');
-require('../../../hooks/index.js');
-require('../../../tokens/index.js');
-var collapse = require('./collapse2.js');
-var pluginVue_exportHelper = require('../../../_virtual/plugin-vue_export-helper.js');
-var index = require('../../../hooks/use-namespace/index.js');
-var lodashUnified = require('lodash-unified');
+var core = require('@vueuse/core');
+var props = require('../../../utils/vue/props.js');
+var typescript = require('../../../utils/typescript.js');
 var event = require('../../../constants/event.js');
-var collapse$1 = require('../../../tokens/collapse.js');
 
-const __default__ = {
-  name: "PsCollapse"
-};
-const _sfc_main = /* @__PURE__ */ vue.defineComponent({
-  ...__default__,
-  props: collapse.collapseProps,
-  emits: collapse.collapseEmits,
-  setup(__props, { expose, emit }) {
-    const props = __props;
-    const ns = index.useNamespace("collapse");
-    const activeNames = vue.ref(lodashUnified.castArray(props.modelValue));
-    const setActiveNames = (_activeNames) => {
-      activeNames.value = _activeNames;
-      const value = props.accordion ? activeNames.value[0] : activeNames.value;
-      emit(event.UPDATE_MODEL_EVENT, value);
-      emit(event.CHANGE_EVENT, value);
-    };
-    const handleItemClick = (name) => {
-      if (props.accordion) {
-        setActiveNames([
-          (activeNames.value[0] || activeNames.value[0] === 0) && activeNames.value[0] === name ? "" : name
-        ]);
-      } else {
-        const _activeNames = [...activeNames.value];
-        const index = _activeNames.indexOf(name);
-        if (index > -1) {
-          _activeNames.splice(index, 1);
-        } else {
-          _activeNames.push(name);
-        }
-        setActiveNames(_activeNames);
-      }
-    };
-    vue.watch(() => props.modelValue, () => activeNames.value = lodashUnified.castArray(props.modelValue), { deep: true });
-    vue.provide(collapse$1.collapseContextKey, {
-      activeNames,
-      handleItemClick
-    });
-    expose({
-      activeNames,
-      setActiveNames
-    });
-    return (_ctx, _cache) => {
-      return vue.openBlock(), vue.createElementBlock("div", {
-        class: vue.normalizeClass(vue.unref(ns).b()),
-        role: "tablist",
-        "aria-multiselectable": "true"
-      }, [
-        vue.renderSlot(_ctx.$slots, "default")
-      ], 2);
-    };
+const emitChangeFn = (value) => typeof core.isNumber(value);
+const collapseProps = props.buildProps({
+  accordion: Boolean,
+  modelValue: {
+    type: props.definePropType([Array, String, Number]),
+    default: () => typescript.mutable([])
   }
 });
-var Collapse = /* @__PURE__ */ pluginVue_exportHelper["default"](_sfc_main, [["__file", "/Users/meng/workspace/element-ps/packages/components/collapse/src/collapse.vue"]]);
+const collapseEmits = {
+  [event.UPDATE_MODEL_EVENT]: emitChangeFn,
+  [event.CHANGE_EVENT]: emitChangeFn
+};
 
-exports["default"] = Collapse;
+exports.collapseEmits = collapseEmits;
+exports.collapseProps = collapseProps;
+exports.emitChangeFn = emitChangeFn;
 //# sourceMappingURL=collapse.js.map

package/lib/components/collapse/src/collapse.js.map

@@ -1 +1 @@
-{"version":3,"file":"collapse.js","sources":["../../../../../../packages/components/collapse/src/collapse.vue"],"sourcesContent":["<template>\n  <div :class=\"ns.b()\" role=\"tablist\" aria-multiselectable=\"true\">\n    <slot />\n  </div>\n</template>\n\n<script lang=\"ts\" setup>\nimport { provide, ref, watch } from 'vue'\nimport { ensureArray } from '@element-ps/utils'\nimport { CHANGE_EVENT, UPDATE_MODEL_EVENT } from '@element-ps/constants'\nimport { useNamespace } from '@element-ps/hooks'\nimport { collapseContextKey } from '@element-ps/tokens'\nimport { collapseEmits, collapseProps } from './collapse'\nimport type { CollapseActiveName } from './collapse'\n\ndefineOptions({\n  name: 'PsCollapse',\n})\nconst props = defineProps(collapseProps)\nconst emit = defineEmits(collapseEmits)\n\nconst ns = useNamespace('collapse')\nconst activeNames = ref(ensureArray(props.modelValue))\n\nconst setActiveNames = (_activeNames: CollapseActiveName[]) => {\n  activeNames.value = _activeNames\n  const value = props.accordion ? activeNames.value[0] : activeNames.value\n  emit(UPDATE_MODEL_EVENT, value)\n  emit(CHANGE_EVENT, value)\n}\n\nconst handleItemClick = (name: CollapseActiveName) => {\n  if (props.accordion) {\n    setActiveNames([\n      (activeNames.value[0] || activeNames.value[0] === 0) &&\n      activeNames.value[0] === name\n        ? ''\n        : name,\n    ])\n  } else {\n    const _activeNames = [...activeNames.value]\n    const index = _activeNames.indexOf(name)\n\n    if (index > -1) {\n      _activeNames.splice(index, 1)\n    } else {\n      _activeNames.push(name)\n    }\n    setActiveNames(_activeNames)\n  }\n}\n\nwatch(\n  () => props.modelValue,\n  () => (activeNames.value = ensureArray(props.modelValue)),\n  { deep: true }\n)\n\nprovide(collapseContextKey, {\n  activeNames,\n  handleItemClick,\n})\n\ndefineExpose({\n  /** @description active names */\n  activeNames,\n  /** @description set active names */\n  setActiveNames,\n})\n</script>\n"],"names":["useNamespace","ref","ensureArray","UPDATE_MODEL_EVENT","CHANGE_EVENT","watch","provide","collapseContextKey"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAqBA,IAAA,MAAA,EAAA,GAAAA,mBAAA,UAAA,CAAA,CAAA;AACA,IAAA,MAAA,WAAA,GAAAC,OAAA,CAAAC,uBAAA,CAAA,KAAA,CAAA,UAAA,CAAA,CAAA,CAAA;AAEA,IAAA,MAAA,cAAA,GAAA,CAAA,YAAA,KAAA;AACA,MAAA,WAAA,CAAA,KAAA,GAAA,YAAA,CAAA;AACA,MAAA,MAAA,QAAA,KAAA,CAAA,SAAA,GAAA,WAAA,CAAA,KAAA,CAAA,KAAA,WAAA,CAAA,KAAA,CAAA;AACA,MAAA,IAAA,CAAAC,0BAAA,KAAA,CAAA,CAAA;AACA,MAAA,IAAA,CAAAC,oBAAA,KAAA,CAAA,CAAA;AAAA,KACA,CAAA;AAEA,IAAA,MAAA,eAAA,GAAA,CAAA,IAAA,KAAA;AACA,MAAA,IAAA,MAAA,SAAA,EAAA;AACA,QAAA,cAAA,CAAA;AAAA,UACA,CAAA,WAAA,CAAA,KAAA,CAAA,CAAA,CAAA,IAAA,WAAA,CAAA,KAAA,CAAA,CAAA,CAAA,KAAA,CAAA,KACA,WAAA,CAAA,KAAA,CAAA,CAAA,CAAA,KAAA,IAAA,GACA,EACA,GAAA,IAAA;AAAA,SACA,CAAA,CAAA;AAAA,OACA,MAAA;AACA,QAAA,MAAA,YAAA,GAAA,CAAA,GAAA,WAAA,CAAA,KAAA,CAAA,CAAA;AACA,QAAA,MAAA,KAAA,GAAA,YAAA,CAAA,OAAA,CAAA,IAAA,CAAA,CAAA;AAEA,QAAA,IAAA,QAAA,CAAA,CAAA,EAAA;AACA,UAAA,YAAA,CAAA,MAAA,CAAA,OAAA,CAAA,CAAA,CAAA;AAAA,SACA,MAAA;AACA,UAAA,YAAA,CAAA,KAAA,IAAA,CAAA,CAAA;AAAA,SACA;AACA,QAAA,cAAA,CAAA,YAAA,CAAA,CAAA;AAAA,OACA;AAAA,KACA,CAAA;AAEA,IAAAC,SAAA,CACA,MAAA,KAAA,CAAA,UACA,EAAA,MAAA,WAAA,CAAA,KAAA,GAAAH,uBAAA,CAAA,KAAA,CAAA,UAAA,CAAA,EACA,EAAA,IAAA,EAAA,MACA,CAAA,CAAA;AAEA,IAAAI,WAAA,CAAAC,6BAAA,EAAA;AAAA,MACA,WAAA;AAAA,MACA,eAAA;AAAA,KACA,CAAA,CAAA;AAEA,IAAA,MAAA,CAAA;AAAA,MAEA,WAAA;AAAA,MAEA,cAAA;AAAA,KACA,CAAA,CAAA;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"collapse.js","sources":["../../../../../../packages/components/collapse/src/collapse.ts"],"sourcesContent":["import {\n  buildProps,\n  definePropType,\n  isNumber,\n  isString,\n  mutable,\n} from '@element-ps/utils'\nimport { CHANGE_EVENT, UPDATE_MODEL_EVENT } from '@element-ps/constants'\nimport type { ExtractPropTypes } from 'vue'\nimport type Collapse from './collapse.vue'\nimport type { Arrayable } from '@element-ps/utils'\n\nexport type CollapseActiveName = string | number\nexport type CollapseModelValue = Arrayable<CollapseActiveName>\n\nexport const emitChangeFn = (value: CollapseModelValue) =>\n  typeof isNumber(value) || isString(value) || Array.isArray(value)\n\nexport const collapseProps = buildProps({\n  accordion: Boolean,\n  modelValue: {\n    type: definePropType<CollapseModelValue>([Array, String, Number]),\n    default: () => mutable([] as const),\n  },\n} as const)\nexport type CollapseProps = ExtractPropTypes<typeof collapseProps>\n\nexport const collapseEmits = {\n  [UPDATE_MODEL_EVENT]: emitChangeFn,\n  [CHANGE_EVENT]: emitChangeFn,\n}\nexport type CollapseEmits = typeof collapseEmits\n\nexport type CollapseInstance = InstanceType<typeof Collapse>\n"],"names":["isNumber","buildProps","definePropType","mutable","UPDATE_MODEL_EVENT","CHANGE_EVENT"],"mappings":";;;;;;;;;;;AAOY,MAAC,YAAY,GAAG,CAAC,KAAK,KAAK,OAAOA,aAAQ,CAAC,KAAK,EAAE;AAClD,MAAC,aAAa,GAAGC,gBAAU,CAAC;AACxC,EAAE,SAAS,EAAE,OAAO;AACpB,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAEC,oBAAc,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AACjD,IAAI,OAAO,EAAE,MAAMC,kBAAO,CAAC,EAAE,CAAC;AAC9B,GAAG;AACH,CAAC,EAAE;AACS,MAAC,aAAa,GAAG;AAC7B,EAAE,CAACC,wBAAkB,GAAG,YAAY;AACpC,EAAE,CAACC,kBAAY,GAAG,YAAY;AAC9B;;;;;;"}

package/lib/components/collapse/src/collapse2.js

@@ -2,27 +2,72 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var vue = require('vue');
 require('../../../utils/index.js');
 require('../../../constants/index.js');
-var core = require('@vueuse/core');
-var props = require('../../../utils/vue/props.js');
-var typescript = require('../../../utils/typescript.js');
+require('../../../hooks/index.js');
+require('../../../tokens/index.js');
+var collapse = require('./collapse.js');
+var pluginVue_exportHelper = require('../../../_virtual/plugin-vue_export-helper.js');
+var index = require('../../../hooks/use-namespace/index.js');
+var lodashUnified = require('lodash-unified');
 var event = require('../../../constants/event.js');
+var collapse$1 = require('../../../tokens/collapse.js');
 
-const emitChangeFn = (value) => typeof core.isNumber(value);
-const collapseProps = props.buildProps({
-  accordion: Boolean,
-  modelValue: {
-    type: props.definePropType([Array, String, Number]),
-    default: () => typescript.mutable([])
+const __default__ = {
+  name: "PsCollapse"
+};
+const _sfc_main = /* @__PURE__ */ vue.defineComponent({
+  ...__default__,
+  props: collapse.collapseProps,
+  emits: collapse.collapseEmits,
+  setup(__props, { expose, emit }) {
+    const props = __props;
+    const ns = index.useNamespace("collapse");
+    const activeNames = vue.ref(lodashUnified.castArray(props.modelValue));
+    const setActiveNames = (_activeNames) => {
+      activeNames.value = _activeNames;
+      const value = props.accordion ? activeNames.value[0] : activeNames.value;
+      emit(event.UPDATE_MODEL_EVENT, value);
+      emit(event.CHANGE_EVENT, value);
+    };
+    const handleItemClick = (name) => {
+      if (props.accordion) {
+        setActiveNames([
+          (activeNames.value[0] || activeNames.value[0] === 0) && activeNames.value[0] === name ? "" : name
+        ]);
+      } else {
+        const _activeNames = [...activeNames.value];
+        const index = _activeNames.indexOf(name);
+        if (index > -1) {
+          _activeNames.splice(index, 1);
+        } else {
+          _activeNames.push(name);
+        }
+        setActiveNames(_activeNames);
+      }
+    };
+    vue.watch(() => props.modelValue, () => activeNames.value = lodashUnified.castArray(props.modelValue), { deep: true });
+    vue.provide(collapse$1.collapseContextKey, {
+      activeNames,
+      handleItemClick
+    });
+    expose({
+      activeNames,
+      setActiveNames
+    });
+    return (_ctx, _cache) => {
+      return vue.openBlock(), vue.createElementBlock("div", {
+        class: vue.normalizeClass(vue.unref(ns).b()),
+        role: "tablist",
+        "aria-multiselectable": "true"
+      }, [
+        vue.renderSlot(_ctx.$slots, "default")
+      ], 2);
+    };
   }
 });
-const collapseEmits = {
-  [event.UPDATE_MODEL_EVENT]: emitChangeFn,
-  [event.CHANGE_EVENT]: emitChangeFn
-};
+var Collapse = /* @__PURE__ */ pluginVue_exportHelper["default"](_sfc_main, [["__file", "/Users/meng/workspace/element-ps/packages/components/collapse/src/collapse.vue"]]);
 
-exports.collapseEmits = collapseEmits;
-exports.collapseProps = collapseProps;
-exports.emitChangeFn = emitChangeFn;
+exports["default"] = Collapse;
 //# sourceMappingURL=collapse2.js.map

package/lib/components/collapse/src/collapse2.js.map

@@ -1 +1 @@
-{"version":3,"file":"collapse2.js","sources":["../../../../../../packages/components/collapse/src/collapse.ts"],"sourcesContent":["import {\n  buildProps,\n  definePropType,\n  isNumber,\n  isString,\n  mutable,\n} from '@element-ps/utils'\nimport { CHANGE_EVENT, UPDATE_MODEL_EVENT } from '@element-ps/constants'\nimport type { ExtractPropTypes } from 'vue'\nimport type Collapse from './collapse.vue'\nimport type { Arrayable } from '@element-ps/utils'\n\nexport type CollapseActiveName = string | number\nexport type CollapseModelValue = Arrayable<CollapseActiveName>\n\nexport const emitChangeFn = (value: CollapseModelValue) =>\n  typeof isNumber(value) || isString(value) || Array.isArray(value)\n\nexport const collapseProps = buildProps({\n  accordion: Boolean,\n  modelValue: {\n    type: definePropType<CollapseModelValue>([Array, String, Number]),\n    default: () => mutable([] as const),\n  },\n} as const)\nexport type CollapseProps = ExtractPropTypes<typeof collapseProps>\n\nexport const collapseEmits = {\n  [UPDATE_MODEL_EVENT]: emitChangeFn,\n  [CHANGE_EVENT]: emitChangeFn,\n}\nexport type CollapseEmits = typeof collapseEmits\n\nexport type CollapseInstance = InstanceType<typeof Collapse>\n"],"names":["isNumber","buildProps","definePropType","mutable","UPDATE_MODEL_EVENT","CHANGE_EVENT"],"mappings":";;;;;;;;;;;AAOY,MAAC,YAAY,GAAG,CAAC,KAAK,KAAK,OAAOA,aAAQ,CAAC,KAAK,EAAE;AAClD,MAAC,aAAa,GAAGC,gBAAU,CAAC;AACxC,EAAE,SAAS,EAAE,OAAO;AACpB,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAEC,oBAAc,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AACjD,IAAI,OAAO,EAAE,MAAMC,kBAAO,CAAC,EAAE,CAAC;AAC9B,GAAG;AACH,CAAC,EAAE;AACS,MAAC,aAAa,GAAG;AAC7B,EAAE,CAACC,wBAAkB,GAAG,YAAY;AACpC,EAAE,CAACC,kBAAY,GAAG,YAAY;AAC9B;;;;;;"}
+{"version":3,"file":"collapse2.js","sources":["../../../../../../packages/components/collapse/src/collapse.vue"],"sourcesContent":["<template>\n  <div :class=\"ns.b()\" role=\"tablist\" aria-multiselectable=\"true\">\n    <slot />\n  </div>\n</template>\n\n<script lang=\"ts\" setup>\nimport { provide, ref, watch } from 'vue'\nimport { ensureArray } from '@element-ps/utils'\nimport { CHANGE_EVENT, UPDATE_MODEL_EVENT } from '@element-ps/constants'\nimport { useNamespace } from '@element-ps/hooks'\nimport { collapseContextKey } from '@element-ps/tokens'\nimport { collapseEmits, collapseProps } from './collapse'\nimport type { CollapseActiveName } from './collapse'\n\ndefineOptions({\n  name: 'PsCollapse',\n})\nconst props = defineProps(collapseProps)\nconst emit = defineEmits(collapseEmits)\n\nconst ns = useNamespace('collapse')\nconst activeNames = ref(ensureArray(props.modelValue))\n\nconst setActiveNames = (_activeNames: CollapseActiveName[]) => {\n  activeNames.value = _activeNames\n  const value = props.accordion ? activeNames.value[0] : activeNames.value\n  emit(UPDATE_MODEL_EVENT, value)\n  emit(CHANGE_EVENT, value)\n}\n\nconst handleItemClick = (name: CollapseActiveName) => {\n  if (props.accordion) {\n    setActiveNames([\n      (activeNames.value[0] || activeNames.value[0] === 0) &&\n      activeNames.value[0] === name\n        ? ''\n        : name,\n    ])\n  } else {\n    const _activeNames = [...activeNames.value]\n    const index = _activeNames.indexOf(name)\n\n    if (index > -1) {\n      _activeNames.splice(index, 1)\n    } else {\n      _activeNames.push(name)\n    }\n    setActiveNames(_activeNames)\n  }\n}\n\nwatch(\n  () => props.modelValue,\n  () => (activeNames.value = ensureArray(props.modelValue)),\n  { deep: true }\n)\n\nprovide(collapseContextKey, {\n  activeNames,\n  handleItemClick,\n})\n\ndefineExpose({\n  /** @description active names */\n  activeNames,\n  /** @description set active names */\n  setActiveNames,\n})\n</script>\n"],"names":["useNamespace","ref","ensureArray","UPDATE_MODEL_EVENT","CHANGE_EVENT","watch","provide","collapseContextKey"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAqBA,IAAA,MAAA,EAAA,GAAAA,mBAAA,UAAA,CAAA,CAAA;AACA,IAAA,MAAA,WAAA,GAAAC,OAAA,CAAAC,uBAAA,CAAA,KAAA,CAAA,UAAA,CAAA,CAAA,CAAA;AAEA,IAAA,MAAA,cAAA,GAAA,CAAA,YAAA,KAAA;AACA,MAAA,WAAA,CAAA,KAAA,GAAA,YAAA,CAAA;AACA,MAAA,MAAA,QAAA,KAAA,CAAA,SAAA,GAAA,WAAA,CAAA,KAAA,CAAA,KAAA,WAAA,CAAA,KAAA,CAAA;AACA,MAAA,IAAA,CAAAC,0BAAA,KAAA,CAAA,CAAA;AACA,MAAA,IAAA,CAAAC,oBAAA,KAAA,CAAA,CAAA;AAAA,KACA,CAAA;AAEA,IAAA,MAAA,eAAA,GAAA,CAAA,IAAA,KAAA;AACA,MAAA,IAAA,MAAA,SAAA,EAAA;AACA,QAAA,cAAA,CAAA;AAAA,UACA,CAAA,WAAA,CAAA,KAAA,CAAA,CAAA,CAAA,IAAA,WAAA,CAAA,KAAA,CAAA,CAAA,CAAA,KAAA,CAAA,KACA,WAAA,CAAA,KAAA,CAAA,CAAA,CAAA,KAAA,IAAA,GACA,EACA,GAAA,IAAA;AAAA,SACA,CAAA,CAAA;AAAA,OACA,MAAA;AACA,QAAA,MAAA,YAAA,GAAA,CAAA,GAAA,WAAA,CAAA,KAAA,CAAA,CAAA;AACA,QAAA,MAAA,KAAA,GAAA,YAAA,CAAA,OAAA,CAAA,IAAA,CAAA,CAAA;AAEA,QAAA,IAAA,QAAA,CAAA,CAAA,EAAA;AACA,UAAA,YAAA,CAAA,MAAA,CAAA,OAAA,CAAA,CAAA,CAAA;AAAA,SACA,MAAA;AACA,UAAA,YAAA,CAAA,KAAA,IAAA,CAAA,CAAA;AAAA,SACA;AACA,QAAA,cAAA,CAAA,YAAA,CAAA,CAAA;AAAA,OACA;AAAA,KACA,CAAA;AAEA,IAAAC,SAAA,CACA,MAAA,KAAA,CAAA,UACA,EAAA,MAAA,WAAA,CAAA,KAAA,GAAAH,uBAAA,CAAA,KAAA,CAAA,UAAA,CAAA,EACA,EAAA,IAAA,EAAA,MACA,CAAA,CAAA;AAEA,IAAAI,WAAA,CAAAC,6BAAA,EAAA;AAAA,MACA,WAAA;AAAA,MACA,eAAA;AAAA,KACA,CAAA,CAAA;AAEA,IAAA,MAAA,CAAA;AAAA,MAEA,WAAA;AAAA,MAEA,cAAA;AAAA,KACA,CAAA,CAAA;;;;;;;;;;;;;;;;"}

package/lib/components/date-picker/src/date-picker-com/basic-date-table.vue.d.ts

@@ -86,7 +86,7 @@ declare const _default: import("vue").DefineComponent<{
             startOf: (unit: dayjs.OpUnitType) => dayjs.Dayjs;
             endOf: (unit: dayjs.OpUnitType) => dayjs.Dayjs;
             format: (template?: string | undefined) => string;
-            diff: (date?: string | number | Date | dayjs.Dayjs | null | undefined, unit?: "year" | "month" | "date" | "dates" | "week" | "D" | "M" | "y" | "weeks" | "months" | "hours" | "minutes" | "seconds" | "s" | "millisecond" | "second" | "minute" | "hour" | "day" | "milliseconds" | "days" | "years" | "d" | "h" | "m" | "ms" | "w" | "quarter" | "quarters" | "Q" | undefined, float?: boolean | undefined) => number;
+            diff: (date?: string | number | Date | dayjs.Dayjs | null | undefined, unit?: "year" | "month" | "date" | "dates" | "week" | "D" | "M" | "y" | "weeks" | "months" | "s" | "hours" | "minutes" | "seconds" | "millisecond" | "second" | "minute" | "hour" | "day" | "milliseconds" | "days" | "years" | "d" | "h" | "m" | "ms" | "w" | "quarter" | "quarters" | "Q" | undefined, float?: boolean | undefined) => number;
             valueOf: () => number;
             unix: () => number;
             daysInMonth: () => number;
@@ -222,7 +222,7 @@ declare const _default: import("vue").DefineComponent<{
             startOf: (unit: dayjs.OpUnitType) => dayjs.Dayjs;
             endOf: (unit: dayjs.OpUnitType) => dayjs.Dayjs;
             format: (template?: string | undefined) => string;
-            diff: (date?: string | number | Date | dayjs.Dayjs | null | undefined, unit?: "year" | "month" | "date" | "dates" | "week" | "D" | "M" | "y" | "weeks" | "months" | "hours" | "minutes" | "seconds" | "s" | "millisecond" | "second" | "minute" | "hour" | "day" | "milliseconds" | "days" | "years" | "d" | "h" | "m" | "ms" | "w" | "quarter" | "quarters" | "Q" | undefined, float?: boolean | undefined) => number;
+            diff: (date?: string | number | Date | dayjs.Dayjs | null | undefined, unit?: "year" | "month" | "date" | "dates" | "week" | "D" | "M" | "y" | "weeks" | "months" | "s" | "hours" | "minutes" | "seconds" | "millisecond" | "second" | "minute" | "hour" | "day" | "milliseconds" | "days" | "years" | "d" | "h" | "m" | "ms" | "w" | "quarter" | "quarters" | "Q" | undefined, float?: boolean | undefined) => number;
             valueOf: () => number;
             unix: () => number;
             daysInMonth: () => number;
@@ -251,7 +251,7 @@ declare const _default: import("vue").DefineComponent<{
             isSameOrAfter: (date: string | number | Date | dayjs.Dayjs | null | undefined, unit?: dayjs.OpUnitType | undefined) => boolean;
             isSameOrBefore: (date: string | number | Date | dayjs.Dayjs | null | undefined, unit?: dayjs.OpUnitType | undefined) => boolean;
         } | undefined;
-        type?: ("week" | "normal" | "today" | "prev-month" | "next-month") | undefined;
+        type?: ("week" | "today" | "normal" | "prev-month" | "next-month") | undefined;
     }[][]>;
     isWeekActive: (cell: any) => boolean;
     getCellClasses: (cell: any) => string;

package/lib/components/date-picker/src/date-picker-com/panel-date-pick.vue.d.ts

@@ -87,7 +87,7 @@ declare const _default: import("vue").DefineComponent<{
         startOf: (unit: dayjs.OpUnitType) => dayjs.Dayjs;
         endOf: (unit: dayjs.OpUnitType) => dayjs.Dayjs;
         format: (template?: string | undefined) => string;
-        diff: (date?: string | number | Date | dayjs.Dayjs | null | undefined, unit?: "year" | "month" | "date" | "dates" | "week" | "D" | "M" | "y" | "weeks" | "months" | "hours" | "minutes" | "seconds" | "s" | "millisecond" | "second" | "minute" | "hour" | "day" | "milliseconds" | "days" | "years" | "d" | "h" | "m" | "ms" | "w" | "quarter" | "quarters" | "Q" | undefined, float?: boolean | undefined) => number;
+        diff: (date?: string | number | Date | dayjs.Dayjs | null | undefined, unit?: "year" | "month" | "date" | "dates" | "week" | "D" | "M" | "y" | "weeks" | "months" | "s" | "hours" | "minutes" | "seconds" | "millisecond" | "second" | "minute" | "hour" | "day" | "milliseconds" | "days" | "years" | "d" | "h" | "m" | "ms" | "w" | "quarter" | "quarters" | "Q" | undefined, float?: boolean | undefined) => number;
         valueOf: () => number;
         unix: () => number;
         daysInMonth: () => number;

package/lib/components/date-picker/src/date-picker-com/panel-date-range.vue.d.ts

@@ -85,7 +85,7 @@ declare const _default: import("vue").DefineComponent<{
         startOf: (unit: dayjs.OpUnitType) => dayjs.Dayjs;
         endOf: (unit: dayjs.OpUnitType) => dayjs.Dayjs;
         format: (template?: string | undefined) => string;
-        diff: (date?: string | number | Date | dayjs.Dayjs | null | undefined, unit?: "year" | "month" | "date" | "dates" | "week" | "D" | "M" | "y" | "weeks" | "months" | "hours" | "minutes" | "seconds" | "s" | "millisecond" | "second" | "minute" | "hour" | "day" | "milliseconds" | "days" | "years" | "d" | "h" | "m" | "ms" | "w" | "quarter" | "quarters" | "Q" | undefined, float?: boolean | undefined) => number;
+        diff: (date?: string | number | Date | dayjs.Dayjs | null | undefined, unit?: "year" | "month" | "date" | "dates" | "week" | "D" | "M" | "y" | "weeks" | "months" | "s" | "hours" | "minutes" | "seconds" | "millisecond" | "second" | "minute" | "hour" | "day" | "milliseconds" | "days" | "years" | "d" | "h" | "m" | "ms" | "w" | "quarter" | "quarters" | "Q" | undefined, float?: boolean | undefined) => number;
         valueOf: () => number;
         unix: () => number;
         daysInMonth: () => number;
@@ -156,7 +156,7 @@ declare const _default: import("vue").DefineComponent<{
         startOf: (unit: dayjs.OpUnitType) => dayjs.Dayjs;
         endOf: (unit: dayjs.OpUnitType) => dayjs.Dayjs;
         format: (template?: string | undefined) => string;
-        diff: (date?: string | number | Date | dayjs.Dayjs | null | undefined, unit?: "year" | "month" | "date" | "dates" | "week" | "D" | "M" | "y" | "weeks" | "months" | "hours" | "minutes" | "seconds" | "s" | "millisecond" | "second" | "minute" | "hour" | "day" | "milliseconds" | "days" | "years" | "d" | "h" | "m" | "ms" | "w" | "quarter" | "quarters" | "Q" | undefined, float?: boolean | undefined) => number;
+        diff: (date?: string | number | Date | dayjs.Dayjs | null | undefined, unit?: "year" | "month" | "date" | "dates" | "week" | "D" | "M" | "y" | "weeks" | "months" | "s" | "hours" | "minutes" | "seconds" | "millisecond" | "second" | "minute" | "hour" | "day" | "milliseconds" | "days" | "years" | "d" | "h" | "m" | "ms" | "w" | "quarter" | "quarters" | "Q" | undefined, float?: boolean | undefined) => number;
         valueOf: () => number;
         unix: () => number;
         daysInMonth: () => number;

package/lib/components/date-picker/src/date-picker-com/panel-month-range.vue.d.ts

@@ -67,7 +67,7 @@ declare const _default: import("vue").DefineComponent<{
         startOf: (unit: dayjs.OpUnitType) => dayjs.Dayjs;
         endOf: (unit: dayjs.OpUnitType) => dayjs.Dayjs;
         format: (template?: string | undefined) => string;
-        diff: (date?: string | number | Date | dayjs.Dayjs | null | undefined, unit?: "year" | "month" | "date" | "dates" | "week" | "D" | "M" | "y" | "weeks" | "months" | "hours" | "minutes" | "seconds" | "s" | "millisecond" | "second" | "minute" | "hour" | "day" | "milliseconds" | "days" | "years" | "d" | "h" | "m" | "ms" | "w" | "quarter" | "quarters" | "Q" | undefined, float?: boolean | undefined) => number;
+        diff: (date?: string | number | Date | dayjs.Dayjs | null | undefined, unit?: "year" | "month" | "date" | "dates" | "week" | "D" | "M" | "y" | "weeks" | "months" | "s" | "hours" | "minutes" | "seconds" | "millisecond" | "second" | "minute" | "hour" | "day" | "milliseconds" | "days" | "years" | "d" | "h" | "m" | "ms" | "w" | "quarter" | "quarters" | "Q" | undefined, float?: boolean | undefined) => number;
         valueOf: () => number;
         unix: () => number;
         daysInMonth: () => number;
@@ -138,7 +138,7 @@ declare const _default: import("vue").DefineComponent<{
         startOf: (unit: dayjs.OpUnitType) => dayjs.Dayjs;
         endOf: (unit: dayjs.OpUnitType) => dayjs.Dayjs;
         format: (template?: string | undefined) => string;
-        diff: (date?: string | number | Date | dayjs.Dayjs | null | undefined, unit?: "year" | "month" | "date" | "dates" | "week" | "D" | "M" | "y" | "weeks" | "months" | "hours" | "minutes" | "seconds" | "s" | "millisecond" | "second" | "minute" | "hour" | "day" | "milliseconds" | "days" | "years" | "d" | "h" | "m" | "ms" | "w" | "quarter" | "quarters" | "Q" | undefined, float?: boolean | undefined) => number;
+        diff: (date?: string | number | Date | dayjs.Dayjs | null | undefined, unit?: "year" | "month" | "date" | "dates" | "week" | "D" | "M" | "y" | "weeks" | "months" | "s" | "hours" | "minutes" | "seconds" | "millisecond" | "second" | "minute" | "hour" | "day" | "milliseconds" | "days" | "years" | "d" | "h" | "m" | "ms" | "w" | "quarter" | "quarters" | "Q" | undefined, float?: boolean | undefined) => number;
         valueOf: () => number;
         unix: () => number;
         daysInMonth: () => number;

package/lib/components/descriptions/index.d.ts

@@ -69,9 +69,9 @@ export declare const PsDescriptions: import("element-ps/es/utils").SFCWithInstal
     widget: StringConstructor;
 }>>, {
     title: string;
-    column: number;
-    border: boolean;
     direction: "horizontal" | "vertical";
+    border: boolean;
+    column: number;
     extra: string;
 }>> & {
     DescriptionsItem: import("vue").DefineComponent<{
@@ -150,8 +150,8 @@ export declare const PsDescriptions: import("element-ps/es/utils").SFCWithInstal
         label: string;
         width: string | number;
         minWidth: string | number;
-        className: string;
         span: number;
+        className: string;
         align: string;
         labelAlign: string;
         labelClassName: string;
@@ -234,8 +234,8 @@ export declare const PsDescriptionsItem: import("element-ps/es/utils").SFCWithIn
     label: string;
     width: string | number;
     minWidth: string | number;
-    className: string;
     span: number;
+    className: string;
     align: string;
     labelAlign: string;
     labelClassName: string;

package/lib/components/descriptions/src/description-item.d.ts

@@ -74,8 +74,8 @@ declare const _default: import("vue").DefineComponent<{
     label: string;
     width: string | number;
     minWidth: string | number;
-    className: string;
     span: number;
+    className: string;
     align: string;
     labelAlign: string;
     labelClassName: string;

package/lib/components/descriptions/src/index.vue.d.ts

@@ -70,9 +70,9 @@ declare const _default: import("vue").DefineComponent<{
     widget: StringConstructor;
 }>>, {
     title: string;
-    column: number;
-    border: boolean;
     direction: "horizontal" | "vertical";
+    border: boolean;
+    column: number;
     extra: string;
 }>;
 export default _default;

package/lib/components/dialog/index.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require('../../utils/index.js');
-var dialog$1 = require('./src/dialog2.js');
+var dialog$1 = require('./src/dialog.js');
 var useDialog = require('./src/use-dialog.js');
-var dialog = require('./src/dialog.js');
+var dialog = require('./src/dialog2.js');
 var install = require('../../utils/vue/install.js');
 
 const PsDialog = install.withInstall(dialog$1["default"]);

package/lib/components/dialog/src/dialog.js

@@ -2,69 +2,95 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('../../../utils/index.js');
-var dialogContent = require('./dialog-content.js');
-var props = require('../../../utils/vue/props.js');
+var vue = require('vue');
+var index$2 = require('../../overlay/index.js');
+require('../../../hooks/index.js');
+require('../../../tokens/index.js');
+var dialogContent = require('./dialog-content2.js');
+var dialog = require('./dialog2.js');
+var useDialog = require('./use-dialog.js');
+var pluginVue_exportHelper = require('../../../_virtual/plugin-vue_export-helper.js');
+var index = require('../../../hooks/use-namespace/index.js');
+var dialog$1 = require('../../../tokens/dialog.js');
+var index$1 = require('../../../hooks/use-draggable/index.js');
 
-const dialogProps = props.buildProps({
-  ...dialogContent.dialogContentProps,
-  appendToBody: {
-    type: Boolean,
-    default: false
-  },
-  beforeClose: {
-    type: props.definePropType(Function)
-  },
-  destroyOnClose: {
-    type: Boolean,
-    default: false
-  },
-  closeOnClickModal: {
-    type: Boolean,
-    default: true
-  },
-  closeOnPressEscape: {
-    type: Boolean,
-    default: true
-  },
-  lockScroll: {
-    type: Boolean,
-    default: true
-  },
-  modal: {
-    type: Boolean,
-    default: true
-  },
-  openDelay: {
-    type: Number,
-    default: 0
-  },
-  closeDelay: {
-    type: Number,
-    default: 0
-  },
-  top: {
-    type: String
-  },
-  modelValue: {
-    type: Boolean,
-    required: true
-  },
-  modalClass: String,
-  width: {
-    type: [String, Number]
-  },
-  zIndex: {
-    type: Number
-  },
-  trapFocus: {
-    type: Boolean,
-    default: false
-  },
-  widget: {
-    type: String
+const __default__ = {
+  name: "PsDialog"
+};
+const _sfc_main = /* @__PURE__ */ vue.defineComponent({
+  ...__default__,
+  props: dialog.dialogProps,
+  setup(__props, { expose }) {
+    const props = __props;
+    const ns = index.useNamespace("dialog");
+    const dialogRef = vue.ref();
+    const headerRef = vue.ref();
+    const {
+      visible,
+      style,
+      rendered,
+      zIndex
+    } = useDialog.useDialog(props, dialogRef);
+    vue.provide(dialog$1.dialogInjectionKey, {
+      dialogRef,
+      headerRef,
+      ns,
+      rendered,
+      style
+    });
+    const draggable = vue.computed(() => props.draggable && !props.fullscreen);
+    index$1.useDraggable(dialogRef, headerRef, draggable);
+    expose({
+      visible
+    });
+    return (_ctx, _cache) => {
+      return vue.withDirectives((vue.openBlock(), vue.createBlock(vue.unref(index$2.PsOverlay), {
+        "custom-mask-event": "",
+        mask: _ctx.modal,
+        "overlay-class": (_ctx.modalClass || "") + (_ctx.widget ? ` ps--dialog-widget-class` : ""),
+        "z-index": vue.unref(zIndex)
+      }, {
+        default: vue.withCtx(() => [
+          vue.createElementVNode("div", {
+            class: vue.normalizeClass(`${vue.unref(ns).namespace.value}-overlay-dialog`)
+          }, [
+            vue.unref(rendered) ? (vue.openBlock(), vue.createBlock(dialogContent["default"], {
+              key: 0,
+              "custom-class": _ctx.customClass,
+              center: _ctx.center,
+              "close-icon": _ctx.closeIcon,
+              draggable: vue.unref(draggable),
+              fullscreen: _ctx.fullscreen,
+              "show-close": _ctx.showClose,
+              style: vue.normalizeStyle(vue.unref(style)),
+              title: _ctx.title,
+              widget: _ctx.widget
+            }, vue.createSlots({
+              title: vue.withCtx(() => [
+                vue.renderSlot(_ctx.$slots, "title")
+              ]),
+              default: vue.withCtx(() => [
+                vue.renderSlot(_ctx.$slots, "default")
+              ]),
+              _: 2
+            }, [
+              _ctx.$slots.footer ? {
+                name: "footer",
+                fn: vue.withCtx(() => [
+                  vue.renderSlot(_ctx.$slots, "footer")
+                ])
+              } : void 0
+            ]), 1032, ["custom-class", "center", "close-icon", "draggable", "fullscreen", "show-close", "style", "title", "widget"])) : vue.createCommentVNode("v-if", true)
+          ], 2)
+        ]),
+        _: 3
+      }, 8, ["mask", "overlay-class", "z-index"])), [
+        [vue.vShow, vue.unref(visible)]
+      ]);
+    };
   }
 });
+var Dialog = /* @__PURE__ */ pluginVue_exportHelper["default"](_sfc_main, [["__file", "/Users/meng/workspace/element-ps/packages/components/dialog/src/dialog.vue"]]);
 
-exports.dialogProps = dialogProps;
+exports["default"] = Dialog;
 //# sourceMappingURL=dialog.js.map

package/lib/components/dialog/src/dialog.js.map

@@ -1 +1 @@
-{"version":3,"file":"dialog.js","sources":["../../../../../../packages/components/dialog/src/dialog.ts"],"sourcesContent":["import { buildProps, definePropType } from '@element-ps/utils'\nimport { dialogContentProps } from './dialog-content'\n\nimport type { ExtractPropTypes } from 'vue'\n\ntype DoneFn = (cancel?: boolean) => void\nexport type DialogBeforeCloseFn = (done: DoneFn) => void\n\nexport const dialogProps = buildProps({\n  ...dialogContentProps,\n  appendToBody: {\n    type: Boolean,\n    default: false,\n  },\n  beforeClose: {\n    type: definePropType<DialogBeforeCloseFn>(Function),\n  },\n  destroyOnClose: {\n    type: Boolean,\n    default: false,\n  },\n  closeOnClickModal: {\n    type: Boolean,\n    default: true,\n  },\n  closeOnPressEscape: {\n    type: Boolean,\n    default: true,\n  },\n  lockScroll: {\n    type: Boolean,\n    default: true,\n  },\n  modal: {\n    type: Boolean,\n    default: true,\n  },\n  openDelay: {\n    type: Number,\n    default: 0,\n  },\n  closeDelay: {\n    type: Number,\n    default: 0,\n  },\n  top: {\n    type: String,\n  },\n  modelValue: {\n    type: Boolean,\n    required: true,\n  },\n  modalClass: String,\n  width: {\n    type: [String, Number],\n  },\n  zIndex: {\n    type: Number,\n  },\n  trapFocus: {\n    type: Boolean,\n    default: false,\n  },\n  widget: {\n    type: String,\n  },\n} as const)\n\nexport type DialogProps = ExtractPropTypes<typeof dialogProps>\n"],"names":["buildProps","dialogContentProps","definePropType"],"mappings":";;;;;;;;AAEY,MAAC,WAAW,GAAGA,gBAAU,CAAC;AACtC,EAAE,GAAGC,gCAAkB;AACvB,EAAE,YAAY,EAAE;AAChB,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,KAAK;AAClB,GAAG;AACH,EAAE,WAAW,EAAE;AACf,IAAI,IAAI,EAAEC,oBAAc,CAAC,QAAQ,CAAC;AAClC,GAAG;AACH,EAAE,cAAc,EAAE;AAClB,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,KAAK;AAClB,GAAG;AACH,EAAE,iBAAiB,EAAE;AACrB,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,kBAAkB,EAAE;AACtB,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,KAAK,EAAE;AACT,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,IAAI;AACjB,GAAG;AACH,EAAE,SAAS,EAAE;AACb,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,CAAC;AACd,GAAG;AACH,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,MAAM;AAChB,IAAI,OAAO,EAAE,CAAC;AACd,GAAG;AACH,EAAE,GAAG,EAAE;AACP,IAAI,IAAI,EAAE,MAAM;AAChB,GAAG;AACH,EAAE,UAAU,EAAE;AACd,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,QAAQ,EAAE,IAAI;AAClB,GAAG;AACH,EAAE,UAAU,EAAE,MAAM;AACpB,EAAE,KAAK,EAAE;AACT,IAAI,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;AAC1B,GAAG;AACH,EAAE,MAAM,EAAE;AACV,IAAI,IAAI,EAAE,MAAM;AAChB,GAAG;AACH,EAAE,SAAS,EAAE;AACb,IAAI,IAAI,EAAE,OAAO;AACjB,IAAI,OAAO,EAAE,KAAK;AAClB,GAAG;AACH,EAAE,MAAM,EAAE;AACV,IAAI,IAAI,EAAE,MAAM;AAChB,GAAG;AACH,CAAC;;;;"}
+{"version":3,"file":"dialog.js","sources":["../../../../../../packages/components/dialog/src/dialog.vue"],"sourcesContent":["<template>\n  <ps-overlay\n    v-show=\"visible\"\n    custom-mask-event\n    :mask=\"modal\"\n    :overlay-class=\"(modalClass || '') + (widget ? ` ps--dialog-widget-class` : '')\"\n    :z-index=\"zIndex\"\n  >\n    <div\n      :class=\"`${ns.namespace.value}-overlay-dialog`\"\n    >\n      <ps-dialog-content\n        v-if=\"rendered\"\n        :custom-class=\"customClass\"\n        :center=\"center\"\n        :close-icon=\"closeIcon\"\n        :draggable=\"draggable\"\n        :fullscreen=\"fullscreen\"\n        :show-close=\"showClose\"\n        :style=\"style\"\n        :title=\"title\"\n        :widget=\"widget\"\n      >\n        <template #title>\n          <slot name=\"title\" />\n        </template>\n        <slot />\n        <template v-if=\"$slots.footer\" #footer>\n          <slot name=\"footer\" />\n        </template>\n      </ps-dialog-content>\n    </div>\n  </ps-overlay>\n</template>\n\n<script lang=\"ts\" setup>\nimport { computed, provide, ref } from 'vue'\nimport { PsOverlay } from '@element-ps/components/overlay'\nimport { useDraggable, useNamespace, useSameTarget } from '@element-ps/hooks'\nimport { dialogInjectionKey } from '@element-ps/tokens'\nimport PsDialogContent from './dialog-content.vue'\nimport { dialogProps } from './dialog'\nimport { useDialog } from './use-dialog'\n\ndefineOptions({\n  name: 'PsDialog',\n})\n\nconst props = defineProps(dialogProps)\n\nconst ns = useNamespace('dialog')\nconst dialogRef = ref<HTMLElement>()\nconst headerRef = ref<HTMLElement>()\n\nconst {\n  visible,\n  style,\n  rendered,\n  zIndex,\n} = useDialog(props, dialogRef)\n\nprovide(dialogInjectionKey, {\n  dialogRef,\n  headerRef,\n  ns,\n  rendered,\n  style,\n})\n\nconst draggable = computed(() => props.draggable && !props.fullscreen)\n\nuseDraggable(dialogRef, headerRef, draggable)\n\ndefineExpose({\n  /** @description whether the dialog is visible */\n  visible,\n})\n</script>\n"],"names":["useNamespace","ref","useDialog","provide","dialogInjectionKey","computed","useDraggable"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAkDA,IAAA,MAAA,EAAA,GAAAA,mBAAA,QAAA,CAAA,CAAA;AACA,IAAA,MAAA,YAAAC,OAAA,EAAA,CAAA;AACA,IAAA,MAAA,YAAAA,OAAA,EAAA,CAAA;AAEA,IAAA,MAAA;AAAA,MACA,OAAA;AAAA,MACA,KAAA;AAAA,MACA,QAAA;AAAA,MACA,MAAA;AAAA,KACA,GAAAC,mBAAA,CAAA,OAAA,SAAA,CAAA,CAAA;AAEA,IAAAC,WAAA,CAAAC,2BAAA,EAAA;AAAA,MACA,SAAA;AAAA,MACA,SAAA;AAAA,MACA,EAAA;AAAA,MACA,QAAA;AAAA,MACA,KAAA;AAAA,KACA,CAAA,CAAA;AAEA,IAAA,MAAA,YAAAC,YAAA,CAAA,MAAA,MAAA,SAAA,IAAA,CAAA,MAAA,UAAA,CAAA,CAAA;AAEA,IAAAC,oBAAA,CAAA,SAAA,EAAA,WAAA,SAAA,CAAA,CAAA;AAEA,IAAA,MAAA,CAAA;AAAA,MAEA,OAAA;AAAA,KACA,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}