zhangweicheng 3 роки тому
батько
коміт
444a208cb5

+ 3 - 3
report/dist/index.cjs.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var scMathUtil = require('@sc/util');
-var lodashEs = require('lodash-es');
+var lodash = require('lodash');
 
 function _interopNamespace(e) {
     if (e && e.__esModule) return e;
@@ -7698,9 +7698,9 @@ class RptCommon {
             let hasKey = false;
             const { supplyType } = commonConstants;
             for (const propKey in supplyType) {
-                if (lodashEs.get(supplyType, propKey) === val) {
+                if (lodash.get(supplyType, propKey) === val) {
                     hasKey = true;
-                    rst.push(lodashEs.get(supplyType, propKey));
+                    rst.push(lodash.get(supplyType, propKey));
                     break;
                 }
             }

+ 3 - 3
report/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sc/report",
-  "version": "3.0.8",
+  "version": "3.0.9",
   "description": "Smartcost Report Relative Module",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",
@@ -18,14 +18,14 @@
   "author": "Tony Kang",
   "license": "ISC",
   "devDependencies": {
-    "lodash-es": "4.17.6",
+    "lodash": "^4.17.21",
     "@types/chai": "^4.2.14",
     "@types/jszip": "^3.4.1",
     "@types/mocha": "^8.0.4",
     "@types/ms": "^0.7.31",
     "@types/node": "^14.14.8",
     "@types/uuid": "^8.3.0",
-    "@types/lodash-es": "4.17.7",
+    "@types/lodash": "^4.14.168",
     "@typescript-eslint/eslint-plugin": "^4.4.1",
     "@typescript-eslint/parser": "^4.4.1",
     "chai": "^4.2.0",

+ 1 - 1
report/src/public/rptCommon.ts

@@ -1,6 +1,6 @@
 // 数据的操作,加减乘除
 import { IRptTpl } from '../interface/basic';
-import { get } from 'lodash-es';
+import { get } from 'lodash';
 
 import * as stringUtil from './stringUtil';
 import commonConstants from './commonConstants';

+ 4 - 4
wise-cost-util/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sc/wise-cost-util",
-  "version": "1.1.10",
+  "version": "1.1.11",
   "description": "wise-cost项目前后端业务通用工具包",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",
@@ -22,7 +22,7 @@
     "@commitlint/config-conventional": "^11.0.0",
     "@sc/types": "^1.0.41",
     "@types/chai": "^4.2.14",
-    "@types/lodash-es": "4.17.7",
+    "@types/lodash": "^4.14.168",
     "@types/mocha": "^8.0.4",
     "@types/ms": "^0.7.31",
     "@types/uuid": "8.3.0",
@@ -50,8 +50,8 @@
   },
   "dependencies": {
     "@sc/util": "^1.0.7",
-    "lodash-es": "4.17.6",
+    "lodash": "^4.17.21",
     "evaluator.js": "^3.2.3",
     "uuid": "8.3.1"
   }
-}
+}

+ 1 - 1
wise-cost-util/src/businessForm.ts

@@ -1,4 +1,4 @@
-import { uniq } from 'lodash-es';
+import { uniq } from 'lodash';
 import { IMatterNode } from '@sc/types';
 
 // 获取表单必填的字段名称

+ 1 - 1
wise-cost-util/src/glj.ts

@@ -14,7 +14,7 @@ import {
   TaxType,
 } from '@sc/types';
 import { roundForObj } from '@sc/util';
-import { find } from 'lodash-es';
+import { find } from 'lodash';
 
 export const getInfoMarketPrice = (info: IInfoPriceItem, taxType: TaxType) => {
   // 1: 一般计税 2: 简易计税

+ 1 - 1
wise-cost-util/src/process.ts

@@ -1,5 +1,5 @@
 import { ApprovalWay, ProcessStatus, IProcess, ApprovalStatus, IProcedureProcess } from '@sc/types';
-import { isEmpty } from 'lodash-es';
+import { isEmpty } from 'lodash';
 
 // 获取流程某个环节审批状态
 export const getProcessStatus = (process: IProcess) => {

+ 1 - 1
wise-cost-util/src/rationAss.ts

@@ -1,5 +1,5 @@
 import { IRationAss, IThirdRation } from '@sc/types';
-import { ceil, floor, round, sortBy } from 'lodash-es';
+import { ceil, floor, round, sortBy } from 'lodash';
 import { roundForObj } from '@sc/util';
 
 export interface IAssTime {

+ 1 - 1
wise-cost-util/src/rationInst.ts

@@ -1,5 +1,5 @@
 import { ICptRation, IInstallationFee, IRationInstall, IStdRation, IRation } from '@sc/types';
-import { find } from 'lodash-es';
+import { find } from 'lodash';
 import { v1 } from 'uuid';
 
 export const getRationInstallFee = (

+ 1 - 1
wise-cost-util/src/threeInOneProcess.ts

@@ -1,5 +1,5 @@
 import { ApprovalWay, ProcessStatus, IProcess, ApprovalStatus, IProcedureProcess } from '@sc/types';
-import { isEmpty } from 'lodash-es';
+import { isEmpty } from 'lodash';
 
 // 获取流程某个环节审批状态
 export const getProcedureProcessStatus = (process: IProcedureProcess): ProcessStatus => {