Просмотр исходного кода

fix(types): 修改报表相关type属性

lishihao 3 лет назад
Родитель
Сommit
f06f598267

+ 1 - 0
report/src/core/jpc_rte.ts

@@ -169,6 +169,7 @@ export const JE = {
     },
     insertFieldValue: function (field: Fields, dataObj: IDataObj, valIdx: number, newValue: number) {
         if (field.DataNodeName === "NA") {
+            if(!field.data_field) field.data_field=[];
             if (field.data_field.length > valIdx && valIdx >= 0) {
                 field.data_field.splice(valIdx, 0, newValue);
             } else if (field.data_field.length <= valIdx) {

+ 2 - 0
report/src/interface/basic.ts

@@ -163,6 +163,8 @@ export interface IPreviewPageItem {
     page_merge_pos: {
         纸张宽高: number[]
     }
+    position?:string;
+    style?:IStyles;
 }
 
 

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

@@ -5,7 +5,7 @@ export default {
         let rst = false;
         if (str === null || str === undefined) {
             rst = true;
-        } else if (typeof str) {
+        } else if (typeof str === 'string') {
             let reg = /^\s*$/;
             rst = reg.test(str);
         }

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

@@ -7,7 +7,7 @@ const isEmptyString = (str: string) => {
     let rst = false;
     if (str === null || str === undefined) {
         rst = true;
-    } else if (typeof str) {
+    } else if (typeof str  === 'string') {
         let reg = /^\s*$/;
         rst = reg.test(str);
     }

+ 2 - 0
types/src/interface/base.ts

@@ -160,6 +160,8 @@ export enum CptModelName {
   conditionSetting = 'conditionSetting',
   auditComment = 'auditComment', // 审批意见
   processLogs = 'processLogs', // 审批流程环节日志
+  resultsDocument = 'resultsDocument', // 成果文件
+  rptTemplates = 'rptTemplates', // 报表模板(表单)
 }
 
 // 无数据表的模块名称的枚举