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

handsontable/package.json

@@ -10,7 +10,7 @@
     "url": "https://github.com/handsontable/handsontable/issues"
   },
   "author": "Handsoncode <hello@handsontable.com>",
-  "version": "6.3.13",
+  "version": "6.3.14",
   "browser": "dist/handsontable.js",
   "main": "commonjs/index.js",
   "module": "es/index.js",

handsontable/src/plugins/manualColumnResize/manualColumnResize.js

@@ -143,7 +143,15 @@ class ManualColumnResize extends BasePlugin {
     this.currentTH = TH;
     // getCoords returns CellCoords
     // const col = this.hot.view.wt.wtTable.getCoords(TH).col;
-    const col = this.hot.getColHeader().indexOf(TH.innerText);
+    // const col = this.hot.getColHeader().indexOf(TH.innerText);
+    let col = 0;
+    for (let i = 0; i < TH.parentNode.childNodes.length; i += 1) {
+      if (TH.parentNode.childNodes[i] === TH) col = i;
+    }
+
+    if (!TH.parentNode.childNodes[0].innerText.replace(/(\s| )/gi, '')) {
+      col -= 1;
+    }
 
     const headerHeight = outerHeight(this.currentTH);
 

types/src/interface/editLog.ts

@@ -1,3 +1,4 @@
+import { GljType } from './glj';
 import { CptModelName, SubModelName, ActionType, ActionName } from './base';
 
 export interface ILogDetail<T = any> {
@@ -20,11 +21,16 @@ export interface ILogDetail<T = any> {
 
 export interface IEditLog {
   projectID: string;
-  billID: string;
+  ID: string;
   constructionID: string;
   updateTime: number; // 最后修改时间
-  code?: string;
-  name?: string;
-  unit?: string;
+  info: {
+    code?: string;
+    name?: string;
+    unit?: string;
+    specs: string;
+    type: GljType;
+  };
+  module: CptModelName;
   editLogs: ILogDetail[];
 }

types/src/interface/project.ts

@@ -221,6 +221,7 @@ export interface IProperty {
   overHeightSetting?: IOverHeightSetting; // 超高降效选项
   basicInfo?: IInfoItem[]; // 基本信息
   feature?: IInfoItem[]; // 工程特征
+  singleInfo?: IInfoItem[]; // 单项信息
   progressiveInterval?: IProgressiveInterval[]; // 累进区间
   gljAdjustType?: GLJAdjustType; // 承包人材料调整类型
   cptIllustration?: string; // 编制说明
@@ -239,7 +240,7 @@ export interface IProperty {
   infoPriceOption?: IInfoPriceOption; // 信息价选项 只用于搜索
   recommendPriceOption?: IInfoPriceOption; // 智能材价匹配时的选项
   saveLog?: boolean; // 记录项目编辑log
-  normLib?:string;
+  normLib?: string;
 }
 
 // 原来的列设置太复杂了，没什么必要