cosey 0.4.18 → 0.4.20

package/components/field/components/tree-select/tree-select.d.ts

@@ -34,7 +34,7 @@ export declare const elTreeProps: {
     };
     defaultCheckedKeys: ArrayConstructor;
     defaultExpandedKeys: ArrayConstructor;
-    currentNodeKey: (StringConstructor | NumberConstructor)[];
+    currentNodeKey: (NumberConstructor | StringConstructor)[];
     renderContent: FunctionConstructor;
     showCheckbox: {
         type: BooleanConstructor;

package/components/table/table-column/renderer.d.ts

@@ -1,4 +1,4 @@
-import { type LinkProps, SwitchProps, type TableColumnCtx } from 'element-plus';
+import { type LinkProps, type SwitchProps, type TableColumnCtx } from 'element-plus';
 import { type TableColumnProps } from './table-column';
 import { type LongTextProps } from '../../long-text';
 import { type MediaCardProps } from '../../media-card';

package/components/table/table-column/renderer.js

@@ -5,7 +5,7 @@ import { LongText as _LongText } from '../../long-text/index.js';
 import { MediaCard as _MediaCard } from '../../media-card/index.js';
 import { MediaCardGroup as _MediaCardGroup } from '../../media-card-group/index.js';
 import { isEmpty, isString } from '../../../utils/is.js';
-import { Scope } from '../../../utils/vue.js';
+import { Scope, getVNodeText } from '../../../utils/vue.js';
 import { formatToDate, formatToDateTime } from '../../../utils/date.js';
 import { toArray } from '../../../utils/array.js';
 
@@ -113,10 +113,10 @@ function renderer({
 }
 function exportRenderer(row, column, cellValue, index) {
   if (column.formatter) {
-    return column.formatter(row, column, cellValue, index);
+    return getVNodeText(column.formatter(row, column, cellValue, index));
   }
   if (column.format) {
-    return column.format(cellValue, row, column, index);
+    return getVNodeText(column.format(cellValue, row, column, index));
   }
   if (isEmpty(cellValue)) {
     return "";

package/components/table/table.vue.js

@@ -17,12 +17,12 @@ import stdin_default$3 from './table-stats/table-stats.vue.js';
 import { uniqid } from '../../utils/string.js';
 import { useComponentConfig, useConfig } from '../config-provider/config-provider.js';
 import { flatColumns } from '../../utils/excel/index.js';
-import { getVNodeText, createMergedExpose } from '../../utils/vue.js';
 import { useFetch } from '../../hooks/useFetch.js';
 import { useFullPage } from '../../hooks/useFullPage.js';
 import { useLocale } from '../../hooks/useLocale.js';
 import { addPxUnit } from '../../utils/css.js';
 import { isNullish, isObject, isFunction } from '../../utils/is.js';
+import { getVNodeText, createMergedExpose } from '../../utils/vue.js';
 import { useResizeObserver } from '../../hooks/useResizeObserver.js';
 import { walkTree } from '../../utils/tree.js';
 
@@ -419,7 +419,7 @@ var stdin_default = /* @__PURE__ */defineComponent({
         _: 1
         /* STABLE */
       }, 8, ["content"])])) : createCommentVNode("v-if", true), mergedToolbarConfig.value.export ? (openBlock(), createElementBlock("div", _hoisted_2, [createVNode(_component_el_tooltip, {
-        content: unref(t)("co.table.export"),
+        content: unref(t)("co.table.exportThisPage"),
         placement: "top",
         "show-after": 200,
         "hide-after": 0

package/hooks/useUpsert.d.ts

@@ -52,6 +52,6 @@ export interface UseExternalUpsertReturn<Row extends Record<string, any>, Data>
     edit: (...args: any[]) => void;
     setData: (data: Data) => void;
     expose: Readonly<ShallowRef<UseUpsertExpose<Row, Data> | null>>;
-    ref: string;
+    ref: (_expose: any) => void;
 }
 export declare function useOuterUpsert<Row extends Record<string, any>, Data>(options: UseExternalUpsertOptions): UseExternalUpsertReturn<Row, Data>;

package/hooks/useUpsert.js

@@ -1,9 +1,9 @@
 import { ElMessage } from 'element-plus';
 import { cloneDeep, pick } from 'lodash-es';
-import { useTemplateRef, onMounted, computed, unref, ref, reactive, shallowRef, readonly } from 'vue';
+import { ref, computed, unref, reactive, useTemplateRef, shallowRef, readonly } from 'vue';
 import { toRefs } from '@vueuse/core';
-import { uuid } from '../utils/string.js';
 import { useLocale } from './useLocale.js';
+import { uuid } from '../utils/string.js';
 import { deepAssign } from '../utils/object.js';
 
 const mapTypeTitle = {
@@ -112,8 +112,13 @@ function useUpsert(options) {
   return result;
 }
 function useOuterUpsert(options) {
-  const refKey = uuid();
-  const expose = useTemplateRef(refKey);
+  const expose = ref(null);
+  const vnodeRef = (_expose) => {
+    expose.value = _expose;
+    if (_expose) {
+      _expose.setOptions(options);
+    }
+  };
   const add = (...args) => {
     expose.value?.add(...args);
   };
@@ -123,15 +128,12 @@ function useOuterUpsert(options) {
   const setData = (data) => {
     expose.value?.setData(data);
   };
-  onMounted(() => {
-    expose.value?.setOptions(options);
-  });
   const result = {
     add,
     edit,
     setData,
     expose,
-    ref: refKey
+    ref: vnodeRef
   };
   return result;
 }

package/locale/lang/ar.d.ts

@@ -54,6 +54,7 @@ declare const _default: {
         };
         table: {
             export: string;
+            exportThisPage: string;
             exportData: string;
             exitFullScreen: string;
             fullScreen: string;

package/locale/lang/ar.js

@@ -56,8 +56,9 @@ var stdin_default = {
       video: "\u0641\u064A\u062F\u064A\u0648"
     },
     table: {
-      export: "\u0635\u062F\u0650\u0651\u0631 \u0627\u0644\u0635\u0641\u062D\u0629 \u0627\u0644\u062D\u0627\u0644\u064A\u0629",
-      exportData: "\u0635\u062F\u0650\u0651\u0631 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0645\u0646 \u0635\u0641\u062D\u0629",
+      export: "\u062A\u0635\u062F\u064A\u0631",
+      exportThisPage: "\u062A\u0635\u062F\u064A\u0631 \u0627\u0644\u0635\u0641\u062D\u0629 \u0627\u0644\u062D\u0627\u0644\u064A\u0629",
+      exportData: "\u062A\u0635\u062F\u064A\u0631 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A",
       exitFullScreen: "\u0627\u0644\u062E\u0631\u0648\u062C \u0645\u0646 \u0648\u0636\u0639 \u0645\u0644\u0621 \u0627\u0644\u0634\u0627\u0634\u0629",
       fullScreen: "\u0645\u0644\u0621 \u0627\u0644\u0634\u0627\u0634\u0629",
       columnSettings: "\u0625\u0639\u062F\u0627\u062F\u0627\u062A \u0627\u0644\u0623\u0639\u0645\u062F\u0629",

package/locale/lang/en.d.ts

@@ -54,6 +54,7 @@ declare const _default: {
         };
         table: {
             export: string;
+            exportThisPage: string;
             exportData: string;
             exitFullScreen: string;
             fullScreen: string;

package/locale/lang/en.js

@@ -56,8 +56,9 @@ var stdin_default = {
       video: "Video"
     },
     table: {
-      export: "Export current page",
-      exportData: "Export current page data",
+      export: "Export",
+      exportThisPage: "Export current page",
+      exportData: "Export data",
       exitFullScreen: "Exit full screen",
       fullScreen: "Full screen",
       columnSettings: "Column Settings",

package/locale/lang/zh-cn.d.ts

@@ -54,6 +54,7 @@ declare const _default: {
         };
         table: {
             export: string;
+            exportThisPage: string;
             exportData: string;
             exitFullScreen: string;
             fullScreen: string;

package/locale/lang/zh-cn.js

@@ -56,8 +56,9 @@ var stdin_default = {
       video: "\u89C6\u9891"
     },
     table: {
-      export: "\u5BFC\u51FA\u5F53\u524D\u9875",
-      exportData: "\u5BFC\u51FA\u5F53\u524D\u9875\u6570\u636E",
+      export: "\u5BFC\u51FA",
+      exportThisPage: "\u5BFC\u51FA\u5F53\u524D\u9875",
+      exportData: "\u5BFC\u51FA\u6570\u636E",
       exitFullScreen: "\u9000\u51FA\u5168\u5C4F",
       fullScreen: "\u5168\u5C4F",
       columnSettings: "\u5217\u8BBE\u7F6E",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cosey",
-  "version": "0.4.18",
+  "version": "0.4.20",
   "description": "基于 Vue3 + vite 的后台管理系统框架",
   "type": "module",
   "main": "index.js",

package/utils/date.js

@@ -6,6 +6,9 @@ const DATE_FORMAT = MONTH_FORMAT + "-DD";
 const TIME_FORMAT = "HH:mm:ss";
 const DATE_TIME_FORMAT = DATE_FORMAT + " " + TIME_FORMAT;
 function getDayjs(date) {
+  if (typeof date === "string" && Number.isFinite(+date)) {
+    date = +date;
+  }
   if (typeof date === "number" && String(date).length === 10) {
     date = date * 1e3;
   }

package/utils/vue.js

@@ -1,5 +1,5 @@
 import { defineComponent, createVNode } from 'vue';
-import { isObject } from './is.js';
+import { isObject, isPlainObject, isFunction } from './is.js';
 
 function defineTemplate(callback) {
   return {
@@ -45,9 +45,15 @@ function getVNodeText(vnode) {
   if (Array.isArray(vnode)) {
     return vnode.map(getVNodeText).join("");
   }
-  if (isObject(vnode) && vnode.children) {
+  if (isObject(vnode)) {
+    if (isPlainObject(vnode.children)) {
+      return Object.values(vnode.children).map((slot) => getVNodeText(slot)).join("");
+    }
     return getVNodeText(vnode.children);
   }
+  if (isFunction(vnode)) {
+    return getVNodeText(vnode());
+  }
   return "";
 }