@d-matrix/utils 1.14.0 → 1.16.0

package/dist/decimal.js

@@ -7,7 +7,7 @@ import Decimal from 'decimal.js-light';
  */
 export function format(value, options) {
     const { decimalPlaces = 3, suffix = '', defaultValue = '--', prefix = '', operation } = options !== null && options !== void 0 ? options : {};
-    if (value === null || value === undefined || isNaN(Number(value))) {
+    if (value === null || value === undefined || isNaN(Number(value)) || value === '') {
         return defaultValue;
     }
     let decimalValue = new Decimal(value);

package/dist/echarts.d.ts

@@ -0,0 +1,3 @@
+import deepmerge from 'deepmerge';
+import { EChartsOption } from 'echarts';
+export declare function mergeOption(defaults: EChartsOption, overrides: EChartsOption, option?: deepmerge.Options): EChartsOption;

package/dist/echarts.js

@@ -0,0 +1,19 @@
+import deepmerge from 'deepmerge';
+const combineMerge = (target, source, options) => {
+    const destination = target.slice();
+    source.forEach((item, index) => {
+        if (typeof destination[index] === 'undefined') {
+            destination[index] = options.cloneUnlessOtherwiseSpecified(item, options);
+        }
+        else if (options.isMergeableObject(item)) {
+            destination[index] = deepmerge(target[index], item, options);
+        }
+        else if (target.indexOf(item) === -1) {
+            destination.push(item);
+        }
+    });
+    return destination;
+};
+export function mergeOption(defaults, overrides, option) {
+    return deepmerge(defaults, overrides, Object.assign({ arrayMerge: combineMerge }, option));
+}

package/dist/index.d.ts

@@ -9,3 +9,4 @@ export * as support from './support';
 export * as timer from './timer';
 export * as operator from './operator';
 export * as decimal from './decimal';
+export * as object from './object';

package/dist/index.js

@@ -9,3 +9,4 @@ export * as support from './support';
 export * as timer from './timer';
 export * as operator from './operator';
 export * as decimal from './decimal';
+export * as object from './object';

package/dist/object.d.ts

@@ -0,0 +1,6 @@
+export declare const ZeroValues: ({} | null | undefined)[];
+/**
+ * 移除零值的键
+ * 默认的零值是：undefined、null、空字符串, NaN, [], {}
+ */
+export declare const removeZeroValueKeys: <T extends Record<string, any>>(obj: T, zeroValues?: ({} | null | undefined)[]) => T;

package/dist/object.js

@@ -0,0 +1,21 @@
+import isEqual from 'react-fast-compare';
+export const ZeroValues = [undefined, null, '', NaN, [], {}];
+/**
+ * 移除零值的键
+ * 默认的零值是：undefined、null、空字符串, NaN, [], {}
+ */
+// TODO: improve TS type
+export const removeZeroValueKeys = (obj, zeroValues = ZeroValues) => {
+    if (!Array.isArray(zeroValues)) {
+        throw new Error('zeroValues must be an array');
+    }
+    const r = {};
+    for (const key in obj) {
+        const value = obj[key];
+        const shouldRemove = zeroValues.some((v) => isEqual(v, value));
+        if (shouldRemove)
+            continue;
+        r[key] = value;
+    }
+    return r;
+};

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@d-matrix/utils",
   "sideEffects": false,
-  "version": "1.14.0",
+  "version": "1.16.0",
   "description": "A dozen of utils for Front-End Development",
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc",
+    "build:public": "tsc --project ./tsconfig.e2e.json",
     "prebuild": "npm run clean",
     "postpublish": "echo \"wait for 3 seconds, then sync cnpm\" && npm run wait3s && npm run cnpm:sync",
     "prepublishOnly": "npm run build",
@@ -16,7 +17,8 @@
     "test:tsd": "tsd",
     "postversion": "git push && git push --tags",
     "wait3s": "node -e \"setTimeout(() => process.exit(0), 3000)\"",
-    "cnpm:sync": "cnpm sync %npm_package_name%"
+    "cnpm:sync": "cnpm sync %npm_package_name%",
+    "start": "serve -l 64055 -n ./public"
   },
   "engines": {
     "node": ">=16.20.0"
@@ -41,20 +43,26 @@
   "peerDependencies": {
     "@types/react": "^16.8.0",
     "@types/react-dom": "^16.9.0",
+    "echarts": "^3.0.0 || ^4.0.0 || ^5.0.0",
     "react": "^16.8.0 || ^17.0.0",
     "react-dom": "^16.9.0",
     "typescript": "~4.3.2"
   },
   "devDependencies": {
+    "@types/chai-subset": "^1.3.5",
     "@vitejs/plugin-react": "^4.2.1",
+    "chai-subset": "^1.6.0",
     "cnpm": "^9.4.0",
     "cypress": "^13.6.6",
     "expect-type": "^0.19.0",
+    "read-excel-file": "^5.8.4",
     "rimraf": "^5.0.5",
+    "serve": "^14.2.3",
     "vite": "^4.5.2"
   },
   "dependencies": {
     "decimal.js-light": "^2.5.1",
+    "deepmerge": "^4.3.1",
     "react-fast-compare": "^3.2.2"
   }
 }

package/readme.md

@@ -18,6 +18,8 @@ A dozen of utils for Front-End Development
 - [timer](#timer)
 - [operator](#operator)
 - [decimal](#decimal)
+- [object](#object)
+- [echarts](#echarts)
 
 ### clipboard
 
@@ -402,6 +404,8 @@ trueTypeOf(null); // null
 trueTypeOf(undefined); // undefined
 ```
 
+## decimal
+
 - `format(value: number | string | undefined | null, options?: FormatOptions): string`
 
 格式化数字，默认保留3位小数，可添加前缀，后缀，默认值为'--'，用法见[测试](./tests//decimal.cy.ts)
@@ -419,6 +423,23 @@ type FormatOptions = {
 };
 ```
 
+## object
+
+- `removeZeroValueKeys = <T extends Record<string, any>>(obj: T, zeroValues = ZeroValues): T`
+
+移除零值的键, 默认的零值是：`undefined`、`null`, `''`, `NaN`, `[]`, `{}`
+
+```ts
+removeZeroValueKeys({ a: '', b: 'abc', c: undefined, d: null, e: NaN, f: -1, g: [], h: {} })
+// { b: 'abc', f: -1 }
+```
+
+## echarts
+
+- `mergeOption(defaults: EChartsOption, overrides: EChartsOption, option?: deepmerge.Options): EChartsOption`
+
+deep merge Echarts配置，用法见[测试用例](./tests//echarts/echarts.cy.ts)
+
 ## 测试
 
 运行全部组件测试
@@ -433,6 +454,26 @@ npm run cy:run -- --component
 npm run cy:run -- --component --spec tests/date.cy.ts
 ```
 
+运行E2E测试
+
+将`src`通过`tsc` build到`public/dist`目录
+
+```bash
+npm run build:public
+```
+
+启动一个Web服务器来访问`public/index.html`文件，`dist`目录的脚本可以通过`<script type="module"/>`引入
+
+```bash
+npm run serve
+```
+
+最后启动cypress GUI客户端，选择E2E测试
+
+```bash
+npm run cy:open
+```
+
 ## 发布
 
 更新package version: