cosey 0.4.4 → 0.4.6

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

@@ -6,7 +6,7 @@ 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 { formatAsDate, formatAsDateTime } from '../../../utils/date.js';
+import { formatToDate, formatToDateTime } from '../../../utils/date.js';
 import { toArray } from '../../../utils/array.js';
 
 function _isSlot(s) {
@@ -41,9 +41,9 @@ function renderer({
     case "text":
       return cellValue;
     case "datetime":
-      return formatAsDateTime(cellValue);
+      return formatToDateTime(cellValue);
     case "date":
-      return formatAsDate(cellValue);
+      return formatToDate(cellValue);
     case "media":
       return cellValue ? createVNode(_MediaCard, mergeProps({
         "src": cellValue
@@ -135,9 +135,9 @@ function exportRenderer(row, column, cellValue, index) {
     case "mediagroup":
       return JSON.stringify(cellValue);
     case "datetime":
-      return formatAsDateTime(cellValue);
+      return formatToDateTime(cellValue);
     case "date":
-      return formatAsDate(cellValue);
+      return formatToDate(cellValue);
     case "tag":
       {
         const value = isEmpty(cellValue) ? [] : toArray(cellValue);

package/hooks/useUpsert.js

@@ -69,7 +69,6 @@ function useUpsert(options) {
     edit: async (_row) => {
       type.value = "edit";
       row.value = _row;
-      console.log("initialModel", initialModel);
       deepAssign(unref(model), initialModel);
       visible.value = true;
       unref(show)?.(type.value, row.value);

package/package.json

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

package/utils/date.d.ts

@@ -11,11 +11,11 @@ export declare function getDayjs(date?: Parameters<typeof dayjs>[0]): dayjs.Dayj
 /**
  * 格式化为“年月日 时分秒”
  */
-export declare function formatAsDateTime(date?: Parameters<typeof dayjs>[0]): string;
+export declare function formatToDateTime(date?: Parameters<typeof dayjs>[0]): string;
 /**
  * 格式化为“年月日”
  */
-export declare function formatAsDate(date?: Parameters<typeof dayjs>[0]): string;
+export declare function formatToDate(date?: Parameters<typeof dayjs>[0]): string;
 /**
  * 格式化为基础格式的日期+时间，即未添加分隔符的格式
  */

package/utils/date.js

@@ -11,14 +11,14 @@ function getDayjs(date) {
   }
   return dayjs(date);
 }
-function formatAsDateTime(date) {
+function formatToDateTime(date) {
   return getDayjs(date).format(DATE_TIME_FORMAT);
 }
-function formatAsDate(date) {
+function formatToDate(date) {
   return getDayjs(date).format(DATE_FORMAT);
 }
 function formatAsBasicDateTime(date) {
   return getDayjs(date).format("YYYYMMDDHHmmss");
 }
 
-export { DATE_FORMAT, DATE_TIME_FORMAT, MONTH_FORMAT, TIME_FORMAT, YEAR_FORMAT, formatAsBasicDateTime, formatAsDate, formatAsDateTime, getDayjs };
+export { DATE_FORMAT, DATE_TIME_FORMAT, MONTH_FORMAT, TIME_FORMAT, YEAR_FORMAT, formatAsBasicDateTime, formatToDate, formatToDateTime, getDayjs };

package/utils/index.js

@@ -3,7 +3,7 @@ export { getCssVarProp } from './bem.js';
 export { getControlKey } from './browser.js';
 export { getLabelByValue, getTreeLabelByValue } from './collection.js';
 export { addPxUnit, cssObjectToString, getContextBoxWidth, getDir, getStyle, setStyle } from './css.js';
-export { DATE_FORMAT, DATE_TIME_FORMAT, MONTH_FORMAT, TIME_FORMAT, YEAR_FORMAT, formatAsBasicDateTime, formatAsDate, formatAsDateTime, getDayjs } from './date.js';
+export { DATE_FORMAT, DATE_TIME_FORMAT, MONTH_FORMAT, TIME_FORMAT, YEAR_FORMAT, formatAsBasicDateTime, formatToDate, formatToDateTime, getDayjs } from './date.js';
 export { exportExcel, flatColumns } from './excel/index.js';
 export { chooseFiles, downloadAttachment, getFileType, readAsArrayBuffer, readAsDataURL } from './file.js';
 export { isBoolean, isEmpty, isFunction, isNullish, isNumber, isObject, isPlainObject, isPrimitive, isString, isUndefined } from './is.js';

package/utils/object.d.ts

@@ -18,7 +18,7 @@ export declare function uniformAssign<T extends object, Value>(object: T, value:
  */
 export declare function omitObject<T extends object, U extends object>(object: T, another: U): Pick<T, Exclude<keyof T, keyof U>>;
 /**
- * Object.assign 的深度操作，仅合并 plain 对象，可以被 undefined 覆盖。
+ * Object.assign 的深度操作，可以被 undefined 覆盖。
  */
 export declare function deepAssign<TObject extends object, TSource extends object>(object: TObject, source: TSource): TObject & TSource;
 export declare function deepAssign<TObject extends object, TSource1 extends object, TSource2 extends object>(object: TObject, source1: TSource1, source2: TSource2): TObject & TSource1 & TSource2;

package/utils/object.js

@@ -1,5 +1,4 @@
-import { omit } from 'lodash-es';
-import { isPlainObject } from './is.js';
+import { cloneDeep, omit } from 'lodash-es';
 
 function omitUndefined(object) {
   return Object.fromEntries(Object.entries(object).filter(([, value]) => value !== void 0));
@@ -22,10 +21,8 @@ function omitObject(object, another) {
 function deepAssign(object, ...sourceList) {
   sourceList.forEach((source) => {
     Object.keys(source).forEach((key) => {
-      const tValue = object[key];
       const sValue = source[key];
-      const value = isPlainObject(tValue) && isPlainObject(sValue) ? deepAssign(tValue, sValue) : sValue;
-      object[key] = value;
+      object[key] = cloneDeep(sValue);
     });
   });
   return object;