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

handsontable/src/css/handsontable.css

@@ -81,7 +81,7 @@
   border-left-width: 0;
   border-right: 1px solid #CCC;
   border-bottom: 1px solid #CCC;
-  height: 19px;
+  height: 18px;
   empty-cells: show;
   line-height: 18px;
   padding: 0 4px 0 4px;
@@ -93,6 +93,7 @@
   white-space: pre-line;
   /* preserve new line character in cell */
   background-clip: padding-box;
+  padding-top: 1px;
 }
 
 .handsontable td.htInvalid {

report/src/core/formulasFun.ts

@@ -48,13 +48,14 @@ export const formulaExec = (runType: string, $CURRENT_TEMPLATE: IRptTpl, $CURREN
                 // 计算式集合，目前是放置打印信息的，用于配置属性的计算
                 let $ME = $CURRENT_RPT.formulas[execFmlIdx];
                 try {
+                    let newExpression=expression;
                     const { format } = $ME;
-                    console.log(expression);
+                    // console.log(expression);
                     //临时处理
                     if (expression.indexOf(`new Date(`)) {
-                        expression.replaceAll(`new Date(`, `new ReportDate(`)
+                        newExpression= expression.replaceAll(`new Date(`, `new ReportDate(`)
                     }
-                    eval(expression);
+                    eval(newExpression);
                 } catch (ex) {
                     console.log(ex);
                 }

report/src/core/jpc_ex.ts

@@ -203,7 +203,7 @@ class JpcExClass {
                 for (let page = startPage; page <= endPage; page++) {
                     me.runTimePageData.currentPage = page;
                     me.executeFormulas('before_output', rptTpl, dataObj, me);
-                    console.log('=======================');
+                    // console.log('=======================');
                     rst.items.push(me.outputAsSimpleJSONPage(rptTpl, dataObj, bands, page, rst.control_collection, customizeCfg));
                 }
                 if (bands.MergeBand) {

types/src/interface/project.ts

@@ -366,6 +366,8 @@ export interface IProjectLog {
   activityUserID: string;
   // 协作
   cooperationCount?: number;
+  // 是否与我协作
+  cooperateWithMe?: boolean;
 }
 
 // 导入状态