Merge branch 'master' of http://192.168.1.41:3000/SmartCost/SCCommon

tree/src/tree.ts

@@ -194,7 +194,7 @@ export class Tree {
   }
 
   // 查询ID节点的子节点
-  findChilren(ID: string): TreeNode[] {
+  findChildren(ID: string): TreeNode[] {
     return this.parentMap[ID] || [];
   }
 
@@ -217,7 +217,7 @@ export class Tree {
         if (includeSelf || !treeNodes.includes(node)) {
           rst.push(node);
         }
-        const children = this.findChilren(node.ID);
+        const children = this.findChildren(node.ID);
         if (children.length) {
           pushNodes(children);
         }

tree/tests/nodeCtx.ts

@@ -91,7 +91,7 @@ describe('NodeCtx', () => {
   it('children', () => {
     const node = tree.find('1');
     if (node) {
-      const children = node.getCtx().chilren();
+      const children = node.getCtx().children();
       const IDList = getIDList(children);
       expect(IDList).to.have.ordered.members(['7', '6']);
     }

types/src/interface/Compliation.ts

@@ -19,7 +19,7 @@ export enum versionType {
   PRO = 'pro', // 专业版
 }
 
-export interface IComplication {
+export interface ICompilation {
   ID: string;
   name: string;
   description: string;

types/src/interface/User.ts

@@ -36,3 +36,21 @@ export interface IUserResult {
   latest_used?: string;
   [key: string]: any;
 }
+
+export interface IUser {
+  ID: string;
+  name: string;
+  realName: string;
+  mobile: string;
+  ssoID?: number;
+  type?: UserType;
+  email?: string;
+  qq?: string;
+  company?: string;
+  province?: number;
+  token?: string;
+  isSmsLogin?: number;
+  latestLogin?: number;
+  latestUsed?: string;
+  [key: string]: any;
+}

types/src/interface/base.ts

@@ -35,5 +35,5 @@ export interface IDelete<T extends IAny> {
 export interface IBulkWrite<T extends IAny> {
   update?: IUpdate<T>[];
   create?: ICreate<T>[];
-  delete?: IDelete<T>[];
+  remove?: IDelete<T>[];
 }

types/src/interface/project.ts

@@ -24,7 +24,7 @@ export interface IDecimal {
 }
 
 // 工程量精度
-export interface IQuantityDecimal {
+export interface IBillsQuantityDecimal {
   unit: string;
   decimal: number;
 }
@@ -123,6 +123,7 @@ export interface IProperty {
   progressiveLibID?: string; // 累进区间库
   lockBills?: boolean; // 锁定清单
   decimal?: IDecimal; // 小数位数
+  billsQuantityDecimal: IBillsQuantityDecimal[]; // 清单工程量精度
   displaySetting?: IDisplaySetting; // 呈现选项
   billsCalcMode?: number; // 清单计费取费方式
   zanguCalcMode?: number; // 暂估合价计算方式