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

# Conflicts:
#	types/src/interface/project.ts

types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sc/types",
-  "version": "1.0.28",
+  "version": "1.0.29",
   "description": "共用类型文件",
   "main": "./dist/index.cjs.js",
   "module": "./dist/index.esm.js",

types/src/interface/base.ts

@@ -119,14 +119,11 @@ export interface IBulkWrite<T extends IAny = any> {
 
 export enum CptModelName {
   projects = 'projects',
+  quantityNumSheets = 'quantityNumSheets',
   bills = 'bills',
   billCodeSeqs = 'billCodeSeqs',
   rations = 'rations',
   rationGljs = 'rationGljs',
-  shareList = 'shareList',
-  shareProject = 'shareProject',
-  shareLib = 'shareLib',
-  shareLink = 'shareLink',
   unitPriceFile = 'unitPriceFile',
   feeRateFile = 'feeRateFile',
   labourCoeFile = 'labourCoeFile',
@@ -164,7 +161,7 @@ export enum ActionType {
 export enum ActionName {
   // 项目属性相关
   RESET_COL_METAS = 'resetColMetas', // 重置默认列设置
-  UPDATE_PROPERTY='updateProperty',  //更新项目属性
+  UPDATE_PROPERTY = 'updateProperty', // 更新项目属性
   // ration相关property
   ADD_LIB_RATIONS = 'addLibRations', // 添加标准/补充定额
   ADD_GLJ_RATIONS = 'addGljRations', // 插入工料机类型的定额

types/src/interface/bill.ts

@@ -127,6 +127,8 @@ export interface IBill extends IBRBase {
   feeRate?: number; // 费率值
   mainBills?: boolean; // 主要清单
   lockUnitPrice?: boolean; // 锁定单价
+  maxPrice?: number; // 最高限价
+  minPrice?: number; // 最低限价
   [key: string]: any; // 剩下的之后补充
 }
 

types/src/interface/index.ts

@@ -20,3 +20,4 @@ export * from './message';
 export * from './enterprise';
 export * from './infoPrice';
 export * from './installation';
+export * from './quantityNum';

types/src/interface/message.ts

@@ -15,6 +15,7 @@ export enum MessageName {
   REMOVE_FROM_ENTERPRISE = 'removeFromEnterprise',
   ALL_RESET_PASSWORD = 'allResetPassword',
   TRANSFER_DATA = 'transferData',
+  ACCEPT_TRANSFER_DATA = 'acceptTransferData',
   TRANSFER_ADMIN = 'transferAdmin',
   SHARE_PROJECT = 'shareProject',
   SHARE_LIB = 'shareLib',

types/src/interface/project.ts

@@ -237,6 +237,8 @@ export interface IProperty {
   distributeSetting?: IDistributeSetting; // 强制修改叶子清单的综合单价，分摊计算定额工程量 或 分摊计算定额下的工料机消耗量。
   colMetas?: IColumnMeta[];
   valuationName?: string; // 计价规则名称
+  maxLimitPriceRate?: number; // 设置最高限价单价浮动率
+  minLimitPriceRate?: number; // 设置最低限价单价浮动率
 }
 
 // 原来的列设置太复杂了，没什么必要
@@ -362,6 +364,8 @@ export interface IProjectLog {
   activityDate: number;
   // 活动者ID
   activityUserID: string;
+  // 协作
+  cooperationCount?: number;
 }
 
 // 导入状态

types/src/interface/quantityNum.ts

@@ -0,0 +1,35 @@
+interface IConfig {
+  merge: any; // 合并单元格
+  rowlen: any; // 表格行高
+  columnlen: any; // 表格列宽
+  borderInfo: any; // 边框
+}
+
+interface IFrozenRange {
+  // eslint-disable-next-line camelcase
+  row_focus: number;
+  // eslint-disable-next-line camelcase
+  column_focus: number;
+}
+
+interface IFrozen {
+  type: string;
+  range: IFrozenRange;
+}
+
+export interface IQuantityNumSheet {
+  ID: string;
+  // 单位工程 ID
+  unitID: string;
+  // 工作表名称
+  name: string;
+  // 初始化使用的单元格数据
+  celldata: any[];
+  config: IConfig;
+  // 公式链
+  calcChain: any[];
+  // 冻结行列配置
+  frozen: IFrozen;
+  // 创建时间
+  createTime: number;
+}