gm-printer 10.14.1 → 10.14.2-alpha.2

package/.eslintcache

@@ -1 +1 @@
-[{"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/table.js":"1","/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/store.js":"2","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/editor.js":"3","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/context_menu.js":"4","/Users/yancheng/gm/gm-open-source/gm-printer/src/components/tooltip/index.js":"5","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/common_context_menu.js":"6","/Users/yancheng/gm/gm-open-source/gm-printer/src/util.js":"7","/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/printer.js":"8","/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/do_print.js":"9","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_special_field.js":"10","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/hoc_with_store.js":"11","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/hoc_with_shadow_dom.js":"12","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_title.js":"13","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_store.js":"14","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_add_field.js":"15","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_page_summary.js":"16","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_account/editor.js":"17","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_account/context_menu.js":"18","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_purchase/context_menu.js":"19","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_customize_config.js":"20","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_edit_field.js":"21","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/component.js":"22","/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/panel.js":"23"},{"size":9379,"mtime":1643448762149,"results":"24","hashOfConfig":"25"},{"size":15785,"mtime":1647332608072,"results":"26","hashOfConfig":"25"},{"size":4244,"mtime":1635494969691,"results":"27","hashOfConfig":"25"},{"size":4501,"mtime":1646970942704,"results":"28","hashOfConfig":"25"},{"size":616,"mtime":1621235314060,"results":"29","hashOfConfig":"30"},{"size":9693,"mtime":1621242097206,"results":"31","hashOfConfig":"30"},{"size":7258,"mtime":1639037857730,"results":"32","hashOfConfig":"25"},{"size":10283,"mtime":1646979851812,"results":"33","hashOfConfig":"25"},{"size":3119,"mtime":1634191808754,"results":"34","hashOfConfig":"25"},{"size":1113,"mtime":1635407660514,"results":"35","hashOfConfig":"25"},{"size":4349,"mtime":1646815933499,"results":"36","hashOfConfig":"25"},{"size":861,"mtime":1635246075403,"results":"37","hashOfConfig":"25"},{"size":3260,"mtime":1635334661529,"results":"38","hashOfConfig":"25"},{"size":26478,"mtime":1647331538032,"results":"39","hashOfConfig":"25"},{"size":1907,"mtime":1635492860490,"results":"40","hashOfConfig":"25"},{"size":3548,"mtime":1635409410379,"results":"41","hashOfConfig":"25"},{"size":2989,"mtime":1635495718901,"results":"42","hashOfConfig":"25"},{"size":3399,"mtime":1646816404368,"results":"43","hashOfConfig":"25"},{"size":2456,"mtime":1646721857196,"results":"44","hashOfConfig":"25"},{"size":1159,"mtime":1646970893747,"results":"45","hashOfConfig":"25"},{"size":13280,"mtime":1646901618757,"results":"46","hashOfConfig":"25"},{"size":14804,"mtime":1646895235712,"results":"47","hashOfConfig":"25"},{"size":3005,"mtime":1647228414919,"results":"48","hashOfConfig":"25"},{"filePath":"49","messages":"50","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1j0d8vf",{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"57","messages":"58","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"175njjo",{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"63","messages":"64","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"67","messages":"68","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"69","messages":"70","errorCount":3,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"71","messages":"72","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"73","messages":"74","errorCount":13,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"75","messages":"76","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"77","messages":"78","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"79","messages":"80","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"81","messages":"82","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"83","messages":"84","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"85","messages":"86","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"87","messages":"88","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"89","messages":"90","errorCount":1,"warningCount":2,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"91","messages":"92","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"93","messages":"94","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/table.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/store.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/editor.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/context_menu.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/components/tooltip/index.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/common_context_menu.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/util.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/printer.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/do_print.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_special_field.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/hoc_with_store.js",["95","96","97"],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/hoc_with_shadow_dom.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_title.js",["98","99","100","101","102","103","104","105","106","107","108","109","110"],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_store.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_add_field.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_page_summary.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_account/editor.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_account/context_menu.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_purchase/context_menu.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_customize_config.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_edit_field.js",["111","112","113"],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/component.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/panel.js",[],{"ruleId":"114","severity":2,"message":"115","line":10,"column":29,"nodeType":"116","endLine":10,"endColumn":35},{"ruleId":"114","severity":2,"message":"117","line":10,"column":43,"nodeType":"116","endLine":10,"endColumn":51},{"ruleId":"114","severity":2,"message":"117","line":147,"column":63,"nodeType":"116","endLine":147,"endColumn":71},{"ruleId":"114","severity":2,"message":"118","line":47,"column":13,"nodeType":"119","messageId":"120","endLine":47,"endColumn":22},{"ruleId":"114","severity":2,"message":"121","line":48,"column":30,"nodeType":"116","messageId":"120","endLine":48,"endColumn":36},{"ruleId":"114","severity":2,"message":"122","line":49,"column":31,"nodeType":"116","messageId":"120","endLine":49,"endColumn":47},{"ruleId":"114","severity":2,"message":"122","line":50,"column":21,"nodeType":"116","messageId":"120","endLine":50,"endColumn":37},{"ruleId":"114","severity":2,"message":"118","line":56,"column":13,"nodeType":"119","messageId":"120","endLine":56,"endColumn":22},{"ruleId":"114","severity":2,"message":"123","line":59,"column":20,"nodeType":"116","messageId":"120","endLine":59,"endColumn":32},{"ruleId":"114","severity":2,"message":"121","line":61,"column":23,"nodeType":"116","messageId":"120","endLine":61,"endColumn":29},{"ruleId":"114","severity":2,"message":"124","line":61,"column":30,"nodeType":"116","messageId":"120","endLine":61,"endColumn":34},{"ruleId":"114","severity":2,"message":"125","line":63,"column":15,"nodeType":"116","messageId":"120","endLine":63,"endColumn":19},{"ruleId":"114","severity":2,"message":"118","line":67,"column":23,"nodeType":"119","messageId":"120","endLine":67,"endColumn":32},{"ruleId":"114","severity":2,"message":"121","line":70,"column":32,"nodeType":"116","messageId":"120","endLine":70,"endColumn":38},{"ruleId":"114","severity":2,"message":"118","line":78,"column":13,"nodeType":"119","messageId":"120","endLine":78,"endColumn":22},{"ruleId":"114","severity":2,"message":"121","line":84,"column":42,"nodeType":"116","messageId":"120","endLine":84,"endColumn":48},{"ruleId":"126","severity":1,"message":"127","line":265,"column":13,"nodeType":"128","endLine":265,"endColumn":49},{"ruleId":"126","severity":1,"message":"127","line":283,"column":13,"nodeType":"128","endLine":283,"endColumn":56},{"ruleId":"129","severity":2,"message":"130","line":436,"column":22,"nodeType":"131","messageId":"132","endLine":436,"endColumn":31},"react/prop-types","'config' is missing in props validation","Identifier","'mockData' is missing in props validation","'editStore' is missing in props validation","Property","missingPropType","'editStore.config' is missing in props validation","'editStore.config.batchPrintConfig' is missing in props validation","'editStore.originConfig' is missing in props validation","'editStore.config.name' is missing in props validation","'editStore.init' is missing in props validation","react/jsx-handler-names","Handler function for onChange prop key must begin with 'handle'","JSXAttribute","gmfe/i18n-check","t函数的key只能为字符串常量(Literal)，请使用单引号或双引号包裹","MemberExpression","isVariable"]
+[{"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/table.js":"1","/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/store.js":"2","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/editor.js":"3","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/context_menu.js":"4","/Users/yancheng/gm/gm-open-source/gm-printer/src/components/tooltip/index.js":"5","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/common_context_menu.js":"6","/Users/yancheng/gm/gm-open-source/gm-printer/src/util.js":"7","/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/printer.js":"8","/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/do_print.js":"9","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_special_field.js":"10","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/hoc_with_store.js":"11","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/hoc_with_shadow_dom.js":"12","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_title.js":"13","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_store.js":"14","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_add_field.js":"15","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_page_summary.js":"16","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_account/editor.js":"17","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_account/context_menu.js":"18","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_purchase/context_menu.js":"19","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_customize_config.js":"20","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_edit_field.js":"21","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/component.js":"22","/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/panel.js":"23"},{"size":9641,"mtime":1649735992171,"results":"24","hashOfConfig":"25"},{"size":17648,"mtime":1649735920137,"results":"26","hashOfConfig":"25"},{"size":4244,"mtime":1635494969691,"results":"27","hashOfConfig":"25"},{"size":4501,"mtime":1646970942704,"results":"28","hashOfConfig":"25"},{"size":616,"mtime":1621235314060,"results":"29","hashOfConfig":"30"},{"size":9693,"mtime":1621242097206,"results":"31","hashOfConfig":"30"},{"size":7258,"mtime":1639037857730,"results":"32","hashOfConfig":"25"},{"size":10283,"mtime":1646979851812,"results":"33","hashOfConfig":"25"},{"size":3119,"mtime":1634191808754,"results":"34","hashOfConfig":"25"},{"size":1113,"mtime":1635407660514,"results":"35","hashOfConfig":"25"},{"size":4349,"mtime":1646815933499,"results":"36","hashOfConfig":"25"},{"size":861,"mtime":1635246075403,"results":"37","hashOfConfig":"25"},{"size":3260,"mtime":1635334661529,"results":"38","hashOfConfig":"25"},{"size":26478,"mtime":1647331538032,"results":"39","hashOfConfig":"25"},{"size":1907,"mtime":1635492860490,"results":"40","hashOfConfig":"25"},{"size":3548,"mtime":1635409410379,"results":"41","hashOfConfig":"25"},{"size":2989,"mtime":1635495718901,"results":"42","hashOfConfig":"25"},{"size":3399,"mtime":1646816404368,"results":"43","hashOfConfig":"25"},{"size":2456,"mtime":1646721857196,"results":"44","hashOfConfig":"25"},{"size":1159,"mtime":1646970893747,"results":"45","hashOfConfig":"25"},{"size":13280,"mtime":1646901618757,"results":"46","hashOfConfig":"25"},{"size":14804,"mtime":1646895235712,"results":"47","hashOfConfig":"25"},{"size":3005,"mtime":1647228414919,"results":"48","hashOfConfig":"25"},{"filePath":"49","messages":"50","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1j0d8vf",{"filePath":"51","messages":"52","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"53","messages":"54","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"55","messages":"56","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"57","messages":"58","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"175njjo",{"filePath":"59","messages":"60","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"61","messages":"62","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"63","messages":"64","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"65","messages":"66","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"67","messages":"68","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"69","messages":"70","errorCount":3,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"71","messages":"72","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"73","messages":"74","errorCount":13,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"75","messages":"76","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"77","messages":"78","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"79","messages":"80","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"81","messages":"82","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"83","messages":"84","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"85","messages":"86","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"87","messages":"88","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"89","messages":"90","errorCount":1,"warningCount":2,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"91","messages":"92","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"93","messages":"94","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/table.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/store.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/editor.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/context_menu.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/components/tooltip/index.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/common_context_menu.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/util.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/printer.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/do_print.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_special_field.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/hoc_with_store.js",["95","96","97"],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/hoc_with_shadow_dom.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_title.js",["98","99","100","101","102","103","104","105","106","107","108","109","110"],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_store.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_add_field.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_page_summary.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_account/editor.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_account/context_menu.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor_purchase/context_menu.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_customize_config.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_edit_field.js",["111","112","113"],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/component.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/panel.js",[],{"ruleId":"114","severity":2,"message":"115","line":10,"column":29,"nodeType":"116","endLine":10,"endColumn":35},{"ruleId":"114","severity":2,"message":"117","line":10,"column":43,"nodeType":"116","endLine":10,"endColumn":51},{"ruleId":"114","severity":2,"message":"117","line":147,"column":63,"nodeType":"116","endLine":147,"endColumn":71},{"ruleId":"114","severity":2,"message":"118","line":47,"column":13,"nodeType":"119","messageId":"120","endLine":47,"endColumn":22},{"ruleId":"114","severity":2,"message":"121","line":48,"column":30,"nodeType":"116","messageId":"120","endLine":48,"endColumn":36},{"ruleId":"114","severity":2,"message":"122","line":49,"column":31,"nodeType":"116","messageId":"120","endLine":49,"endColumn":47},{"ruleId":"114","severity":2,"message":"122","line":50,"column":21,"nodeType":"116","messageId":"120","endLine":50,"endColumn":37},{"ruleId":"114","severity":2,"message":"118","line":56,"column":13,"nodeType":"119","messageId":"120","endLine":56,"endColumn":22},{"ruleId":"114","severity":2,"message":"123","line":59,"column":20,"nodeType":"116","messageId":"120","endLine":59,"endColumn":32},{"ruleId":"114","severity":2,"message":"121","line":61,"column":23,"nodeType":"116","messageId":"120","endLine":61,"endColumn":29},{"ruleId":"114","severity":2,"message":"124","line":61,"column":30,"nodeType":"116","messageId":"120","endLine":61,"endColumn":34},{"ruleId":"114","severity":2,"message":"125","line":63,"column":15,"nodeType":"116","messageId":"120","endLine":63,"endColumn":19},{"ruleId":"114","severity":2,"message":"118","line":67,"column":23,"nodeType":"119","messageId":"120","endLine":67,"endColumn":32},{"ruleId":"114","severity":2,"message":"121","line":70,"column":32,"nodeType":"116","messageId":"120","endLine":70,"endColumn":38},{"ruleId":"114","severity":2,"message":"118","line":78,"column":13,"nodeType":"119","messageId":"120","endLine":78,"endColumn":22},{"ruleId":"114","severity":2,"message":"121","line":84,"column":42,"nodeType":"116","messageId":"120","endLine":84,"endColumn":48},{"ruleId":"126","severity":1,"message":"127","line":265,"column":13,"nodeType":"128","endLine":265,"endColumn":49},{"ruleId":"126","severity":1,"message":"127","line":283,"column":13,"nodeType":"128","endLine":283,"endColumn":56},{"ruleId":"129","severity":2,"message":"130","line":436,"column":22,"nodeType":"131","messageId":"132","endLine":436,"endColumn":31},"react/prop-types","'config' is missing in props validation","Identifier","'mockData' is missing in props validation","'editStore' is missing in props validation","Property","missingPropType","'editStore.config' is missing in props validation","'editStore.config.batchPrintConfig' is missing in props validation","'editStore.originConfig' is missing in props validation","'editStore.config.name' is missing in props validation","'editStore.init' is missing in props validation","react/jsx-handler-names","Handler function for onChange prop key must begin with 'handle'","JSXAttribute","gmfe/i18n-check","t函数的key只能为字符串常量(Literal)，请使用单引号或双引号包裹","MemberExpression","isVariable"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-printer",
-  "version": "10.14.1",
+  "version": "10.14.2-alpha.2",
   "description": "diy printer",
   "main": "src/index.js",
   "scripts": {

package/src/common/editor_edit_field.js

@@ -13,7 +13,8 @@ import {
   ColumnWidth,
   Textarea,
   Title,
-  TipInfo
+  TipInfo,
+  Text
 } from '../common/component'
 import { get, toJS } from 'mobx'
 import PropTypes from 'prop-types'
@@ -73,6 +74,11 @@ class EditorField extends React.Component {
     editStore.setSubtotalStyle(value)
   }
 
+  handleOverallOrderStyleChange = value => {
+    const { editStore } = this.props
+    editStore.setOverallOrderStyle(value)
+  }
+
   renderBlocks() {
     const { editStore, showNewDate } = this.props
     const { type, text, style, link } = editStore.computedSelectedInfo
@@ -178,10 +184,15 @@ class EditorField extends React.Component {
   }
 
   renderTable() {
-    const { tableDataKeyList, editStore } = this.props
+    const { tableDataKeyList, editStore, isSomeSubtotalTr } = this.props
     const { head, headStyle, text, style } = editStore.computedSelectedInfo
 
-    const { specialConfig, subtotal } = editStore.computedTableSpecialConfig
+    const {
+      specialConfig,
+      subtotal,
+      overallOrder
+    } = editStore.computedTableSpecialConfig
+
     // 小计样式,specialConfig可能是undefined
     const specialStyle =
       toJS(editStore.computedTableSpecialConfig)?.specialConfig?.style || {}
@@ -195,16 +206,45 @@ class EditorField extends React.Component {
       (editStore.computedTableSpecialConfig.subtotal &&
         get(subtotal, 'needUpperCase')) ||
       false
-    // 大写的金额是否在前
+    // 每页合计大写的金额是否在前
     const subtotalUpperCaseBefore =
       (editStore.computedTableSpecialConfig.subtotal &&
         get(subtotal, 'isUpperCaseBefore')) ||
       false
-    // 大写和小写的金额是否分开
+    // 每页合计大写和小写的金额是否分开
     const subtotalUpperLowerCaseSeparate =
       (editStore.computedTableSpecialConfig.subtotal &&
         get(subtotal, 'isUpperLowerCaseSeparate')) ||
       false
+    // 每页合计样式
+    const overallOrderStyle =
+      (overallOrder && overallOrder?.fields[0].style) || {}
+    // 每页合计自定义单元格
+    const subtotalUpperCustomCell =
+      (editStore.computedTableSpecialConfig?.subtotal &&
+        get(subtotal, 'isCustomCells')) ||
+      false
+    //  整单合计是否大写
+    const overallOrderNeedUpperCase =
+      (editStore.computedTableSpecialConfig?.overallOrder &&
+        get(overallOrder, 'needUpperCase')) ||
+      false
+    // 整单合计大写的金额是否在前
+    const overallOrderCaseBefore =
+      (editStore.computedTableSpecialConfig?.overallOrder &&
+        get(overallOrder, 'isUpperCaseBefore')) ||
+      false
+    // 整单合计大写和小写的金额是否分开
+    const overallOrderUpperLowerCaseSeparate =
+      (editStore.computedTableSpecialConfig?.overallOrder &&
+        get(overallOrder, 'isUpperLowerCaseSeparate')) ||
+      false
+    // 整单合计自定义单元格
+    const overallOrderUpperCustomCell =
+      (editStore.computedTableSpecialConfig?.overallOrder &&
+        get(overallOrder, 'isCustomCells')) ||
+      false
+
     return (
       <div>
         <Title title={i18next.t('编辑字段')} />
@@ -376,18 +416,85 @@ class EditorField extends React.Component {
           subtotalCheckOnChange={editStore.setSubtotalUpperCase}
           subtotalCheckText='显示大写金额'
         />
+        {/* 结款单不需要这些配置 */}
+        {!isSomeSubtotalTr && (
+          <>
+            <EditorSubtotalCheck
+              subtotalCheckDisabled={subtotalNeedUpperCase}
+              subtotalChecked={subtotalUpperCaseBefore}
+              subtotalCheckOnChange={editStore.setSubtotalUpperCaseBefore}
+              subtotalCheckText='大写金额在前'
+            />
+            <EditorSubtotalCheck
+              subtotalCheckDisabled={subtotalNeedUpperCase}
+              subtotalChecked={subtotalUpperLowerCaseSeparate}
+              subtotalCheckOnChange={
+                editStore.setSubtotalUpperLowerCaseSeparate
+              }
+              subtotalCheckText='大、小写金额分左右两边展示'
+            />
+            <EditorSubtotalCheck
+              subtotalCheckDisabled
+              subtotalChecked={subtotalUpperCustomCell}
+              subtotalCheckOnChange={editStore.setSubtotalCustomCells}
+              subtotalCheckText='开启自定义单元格'
+            />
+            <Text
+              value={
+                subtotal && subtotal?.fields?.[1] ? subtotal.fields[1].name : ''
+              }
+              onChange={editStore.setSubtotalFields}
+              style={{ width: '65px', margin: '5px 0 5px 80px' }}
+            />
+          </>
+        )}
+        <Flex>
+          <Flex>{i18next.t('整单合计')}：</Flex>
+          <Fonter
+            style={overallOrderStyle}
+            onChange={this.handleOverallOrderStyleChange}
+          />
+          <Separator />
+          <TextAlign
+            style={overallOrderStyle}
+            onChange={this.handleOverallOrderStyleChange}
+          />
+        </Flex>
+        <EditorSubtotalCheck
+          subtotalCheckDisabled
+          subtotalChecked={overallOrderNeedUpperCase}
+          subtotalCheckOnChange={editStore.setOverallOrderUpperCase}
+          subtotalCheckText='显示大写金额'
+        />
         <EditorSubtotalCheck
-          subtotalCheckDisabled={subtotalNeedUpperCase}
-          subtotalChecked={subtotalUpperCaseBefore}
-          subtotalCheckOnChange={editStore.setSubtotalUpperCaseBefore}
+          subtotalCheckDisabled={overallOrderNeedUpperCase}
+          subtotalChecked={overallOrderCaseBefore}
+          subtotalCheckOnChange={editStore.setOverallOrderUpperCaseBefore}
           subtotalCheckText='大写金额在前'
         />
         <EditorSubtotalCheck
-          subtotalCheckDisabled={subtotalNeedUpperCase}
-          subtotalChecked={subtotalUpperLowerCaseSeparate}
-          subtotalCheckOnChange={editStore.setSubtotalUpperLowerCaseSeparate}
+          subtotalCheckDisabled={overallOrderNeedUpperCase}
+          subtotalChecked={overallOrderUpperLowerCaseSeparate}
+          subtotalCheckOnChange={
+            editStore.setOverallOrderUpperLowerCaseSeparate
+          }
           subtotalCheckText='大、小写金额分左右两边展示'
         />
+        <EditorSubtotalCheck
+          subtotalCheckDisabled
+          subtotalChecked={overallOrderUpperCustomCell}
+          subtotalCheckOnChange={editStore.setOverallOrderCustomCells}
+          subtotalCheckText='开启自定义单元格'
+        />
+        <Text
+          value={
+            overallOrder && overallOrder?.fields?.[1]
+              ? overallOrder.fields[1].name
+              : ''
+          }
+          onChange={editStore.setOverallOrderFields}
+          style={{ width: '65px', margin: '5px 0 5px 80px' }}
+        />
       </div>
     )
   }
@@ -408,7 +515,8 @@ class EditorField extends React.Component {
 EditorField.propTypes = {
   editStore: PropTypes.object,
   tableDataKeyList: PropTypes.array,
-  showNewDate: PropTypes.bool
+  showNewDate: PropTypes.bool,
+  isSomeSubtotalTr: PropTypes.bool
 }
 EditorField.defaultProps = {
   showNewDate: false

package/src/common/editor_store.js

@@ -2,7 +2,7 @@ import i18next from '../../locales'
 import { action, computed, observable, set, toJS } from 'mobx'
 import { pageTypeMap } from '../config'
 import _ from 'lodash'
-import { dispatchMsg, getBlockName, exchange } from '../util'
+import { dispatchMsg, getBlockName, exchange, getColSpanLength } from '../util'
 import React from 'react'
 
 class EditorStore {
@@ -61,6 +61,28 @@ class EditorStore {
     this.isAutoFilling = bol
   }
 
+  @observable
+  overallOrderShow = false
+
+  // 整单合计自定义合并单元格
+  @observable
+  overallOrderConfigFields = {
+    name: '',
+    valueField: '',
+    colSpan: 3, // 产品说3个
+    style: {
+      fontWeight: 'bold'
+    }
+  }
+
+  // 每页合计自定义合并单元格
+  @observable
+  subtotalConfigFields = {
+    name: '',
+    valueField: '',
+    colSpan: 3 // 产品说3个,开启自定义单元格
+  }
+
   @computed
   get computedPrinterKey() {
     return _.map(this.config, (v, k) => {
@@ -511,11 +533,61 @@ class EditorStore {
   setSubtotalShow(name) {
     const arr = name.split('.')
     const table = this.config.contents[arr[2]]
-
+    this.overallOrderShow = !this.overallOrderShow
     // 切换的时候，要把对应table的多余空数据清掉
     this.clearExtraTableData(table.dataKey)
-    table.subtotal.show = !table.subtotal.show
+
     this.setAutoFillingConfig(!this.isAutoFilling)
+    // 获取td的colSpan
+    const colSpanLength = getColSpanLength(table)
+    set(table.subtotal, {
+      show: !table.subtotal.show
+    })
+    // 兼容存在后端的模板，subtotal配置没有fields
+    if (!table.subtotal?.fields) {
+      set(table.subtotal, {
+        fields: [
+          {
+            name: '每页合计：',
+            valueField: 'real_item_price',
+            colSpan: colSpanLength
+          }
+        ]
+      })
+    }
+  }
+
+  @action
+  setOverallOrderShow(name) {
+    const arr = name.split('.')
+    const table = this.config.contents[arr[2]]
+    this.overallOrderShow = !this.overallOrderShow
+    const colSpanLength = getColSpanLength(table)
+    if (table.overallOrder) {
+      set(table.overallOrder, {
+        show: !table.overallOrder.show
+      })
+      table.overallOrder.fields[0].colSpan =
+        colSpanLength - (table.overallOrder.fields?.[1]?.colSpan ?? 0)
+    } else {
+      // 兼容已经存在的配送单据，他们的配置存在后端的，没有overallOrder这个配置，给加上
+      set(table, {
+        overallOrder: {
+          show: true,
+          fields: [
+            {
+              name: '整单合计：',
+              valueField: '出库金额',
+              style: {
+                fontWeight: 'bold'
+              },
+              colSpan: colSpanLength
+            }
+          ]
+        }
+      })
+    }
+    this.config = toJS(this.config)
   }
 
   @action
@@ -530,7 +602,7 @@ class EditorStore {
   @action
   changeTableDataKey(name, key) {
     const arr = name.split('.')
-    const { dataKey } = this.config.contents[arr[2]]
+    const { dataKey, overallOrder, subtotal } = this.config.contents[arr[2]]
     const keyArr = dataKey.split('_')
     let newDataKey
     // 当前有这个key则去掉
@@ -554,6 +626,10 @@ class EditorStore {
     ])
 
     this.config.contents[arr[2]].dataKey = newDataKey.join('_')
+    // 整单合计不显示
+    if (overallOrder?.show) overallOrder.show = false
+    // 每页合计不显示
+    if (subtotal?.show) subtotal.show = false
   }
 
   @action
@@ -937,10 +1013,11 @@ class EditorStore {
     }
   }
 
-  // 设置大写金额
+  // 每页合计设置大写金额
   @action.bound
   setSubtotalUpperCase() {
     if (this.selectedRegion) {
+      this.overallOrderShow = !this.overallOrderShow
       const arr = this.selectedRegion.split('.')
       const subtotalConfig = this.config.contents[arr[2]].subtotal
 
@@ -956,10 +1033,11 @@ class EditorStore {
     }
   }
 
-  // 设置大写金额在前
+  // 每页合计设置大写金额在前
   @action.bound
   setSubtotalUpperCaseBefore() {
     if (this.selectedRegion) {
+      this.overallOrderShow = !this.overallOrderShow
       const arr = this.selectedRegion.split('.')
       const subtotalConfig = this.config.contents[arr[2]].subtotal
 
@@ -968,10 +1046,11 @@ class EditorStore {
     }
   }
 
-  // 设置大小写金额分开
+  // 每页合计设置大小写金额分开
   @action.bound
   setSubtotalUpperLowerCaseSeparate() {
     if (this.selectedRegion) {
+      this.overallOrderShow = !this.overallOrderShow
       const arr = this.selectedRegion.split('.')
       const subtotalConfig = this.config.contents[arr[2]].subtotal
 
@@ -982,7 +1061,210 @@ class EditorStore {
     }
   }
 
-  // 设置交换位置
+  // 每页合计开启自定义单元格
+  @action.bound
+  setSubtotalCustomCells() {
+    if (this.selectedRegion) {
+      // 作用：触发组件的更新
+      this.overallOrderShow = !this.overallOrderShow
+      const arr = this.selectedRegion.split('.')
+      const table = this.config.contents[arr[2]]
+      const subtotalConfig = table?.subtotal
+      // 没有显示每页合计的时候不可以设置自定义单元格
+      if (!subtotalConfig?.show) return
+      // 多栏表格情况，计算colSpan
+      const colSpanLength = getColSpanLength(table)
+      const oldCustomCells = subtotalConfig?.isCustomCells
+
+      set(subtotalConfig, {
+        isCustomCells: !oldCustomCells
+      })
+      // 兼容已经存在后端的模板，每页合计直接是显示的，导致每页合计配置没有fields,isCustomCells，手动添加上
+      if (oldCustomCells === undefined && !subtotalConfig.fields) {
+        set(subtotalConfig, {
+          fields: [
+            {
+              name: '每页合计：',
+              valueField: 'real_item_price',
+              colSpan: colSpanLength
+            }
+          ]
+        })
+      }
+      // 开启自定义单元格
+      if (subtotalConfig?.isCustomCells) {
+        // fields添加自定义单元格
+        subtotalConfig.fields = [
+          subtotalConfig.fields[0],
+          {
+            ...this.subtotalConfigFields
+          }
+        ]
+        // 重新计算合并单元格的个数
+        subtotalConfig.fields[0].colSpan =
+          colSpanLength - subtotalConfig.fields[1].colSpan
+      } else {
+        // 关闭自定义单元格，fields只有一个
+        subtotalConfig.fields = [subtotalConfig.fields[0]]
+        // 重新计算合并单元格的个数
+        subtotalConfig.fields[0].colSpan = colSpanLength
+      }
+    }
+  }
+
+  // 每页合计自定义单元格文本输入
+  @action.bound
+  setSubtotalFields(value) {
+    if (this.selectedRegion) {
+      const arr = this.selectedRegion.split('.')
+      const table = this.config.contents[arr[2]]
+      const subtotalConfig = table?.subtotal
+
+      if (subtotalConfig.isCustomCells) {
+        const subtotalConfig = table?.subtotal.fields
+        subtotalConfig[1].name = value
+      }
+    }
+  }
+
+  // 整单合计设置大写金额
+  @action.bound
+  setOverallOrderUpperCase() {
+    if (this.selectedRegion) {
+      this.overallOrderShow = !this.overallOrderShow
+      const arr = this.selectedRegion.split('.')
+      const overallOrderConfig = this.config.contents[arr[2]]?.overallOrder
+
+      const oldNeedUpperCase = overallOrderConfig?.needUpperCase
+      this.config.contents[arr[2]]?.overallOrder &&
+        set(overallOrderConfig, { needUpperCase: !oldNeedUpperCase })
+      // 没有大写金额时，将大写在前和大小写分开的多选框设置为false
+      if (
+        this.config.contents[arr[2]]?.overallOrder &&
+        overallOrderConfig.needUpperCase === false
+      ) {
+        overallOrderConfig.isUpperCaseBefore &&
+          set(overallOrderConfig, { isUpperCaseBefore: false })
+        overallOrderConfig.isUpperLowerCaseSeparate &&
+          set(overallOrderConfig, { isUpperLowerCaseSeparate: false })
+      }
+    }
+  }
+
+  // 整单合计设置大写金额在前
+  @action.bound
+  setOverallOrderUpperCaseBefore() {
+    if (this.selectedRegion) {
+      this.overallOrderShow = !this.overallOrderShow
+      const arr = this.selectedRegion.split('.')
+      const overallOrderConfig = this.config.contents[arr[2]]?.overallOrder
+
+      const oldUpperCaseBefore = overallOrderConfig?.isUpperCaseBefore
+      this.config.contents[arr[2]]?.overallOrder &&
+        set(overallOrderConfig, { isUpperCaseBefore: !oldUpperCaseBefore })
+    }
+  }
+
+  // 整单合计设置大小写金额分开
+  @action.bound
+  setOverallOrderUpperLowerCaseSeparate() {
+    if (this.selectedRegion) {
+      this.overallOrderShow = !this.overallOrderShow
+      const arr = this.selectedRegion.split('.')
+      const overallOrderConfig = this.config.contents[arr[2]]?.overallOrder
+
+      const oldUpperLowerCaseSeparate =
+        overallOrderConfig.isUpperLowerCaseSeparate
+      set(overallOrderConfig, {
+        isUpperLowerCaseSeparate: !oldUpperLowerCaseSeparate
+      })
+    }
+  }
+
+  // 整单合计开启自定义单元格
+  @action.bound
+  setOverallOrderCustomCells() {
+    if (this.selectedRegion) {
+      // 作用：触发tableoverallordertr组件的更新
+      this.overallOrderShow = !this.overallOrderShow
+      const arr = this.selectedRegion.split('.')
+      const table = this.config.contents[arr[2]]
+      const overallOrderConfig = table?.overallOrder
+      if (!overallOrderConfig || !overallOrderConfig?.show) return
+      // 多栏表格情况
+      const colSpanLength = getColSpanLength(table)
+      const oldCustomCells = overallOrderConfig?.isCustomCells
+
+      set(overallOrderConfig, {
+        isCustomCells: !oldCustomCells
+      })
+
+      if (overallOrderConfig?.isCustomCells) {
+        // fields添加自定义单元格
+        overallOrderConfig.fields = [
+          overallOrderConfig.fields[0],
+          {
+            ...this.overallOrderConfigFields,
+            // 和之前保持一样的样式
+            style: { ...overallOrderConfig.fields[0].style }
+          }
+        ]
+        // 重新计算合并单元格的个数
+        overallOrderConfig.fields[0].colSpan =
+          colSpanLength - overallOrderConfig.fields[1].colSpan
+      } else {
+        // 关闭自定义单元格
+        overallOrderConfig.fields = [overallOrderConfig.fields[0]]
+        // 重新计算合并单元格的个数
+        overallOrderConfig.fields[0].colSpan = colSpanLength
+      }
+
+      this.config = toJS(this.config)
+    }
+  }
+
+  // 整单合计自定义单元格文本输入
+  @action.bound
+  setOverallOrderFields(value) {
+    if (this.selectedRegion) {
+      const arr = this.selectedRegion.split('.')
+      const table = this.config.contents[arr[2]]
+      const overallOrderConfig = table?.overallOrder
+
+      if (overallOrderConfig.isCustomCells) {
+        const overallOrderConfigFields = table?.overallOrder.fields
+        overallOrderConfigFields[1].name = value
+      }
+    }
+  }
+
+  // 整单合计样式设置
+  @action.bound
+  setOverallOrderStyle(value) {
+    if (this.selectedRegion) {
+      const flexStyle = {
+        left: 'flex-start',
+        center: 'center',
+        right: 'flex-end'
+      }
+      const arr = this.selectedRegion.split('.')
+      const overallOrderConfigFields = this.config.contents[arr[2]]
+        ?.overallOrder.fields
+      _.forEach(overallOrderConfigFields, item => {
+        const oldStyle = item.style || {}
+        set(item, {
+          style: {
+            ...oldStyle,
+            ...value,
+            // 整单合计里使用的flex布局，textAlign不生效
+            'justify-content': flexStyle[value.textAlign]
+          }
+        })
+      })
+    }
+  }
+
+  // 合计和每页合计设置交换位置
   @action.bound
   setSubtotalCommutationPlace() {
     if (this.selectedRegion) {

package/src/components/flex/index.js

@@ -3,63 +3,87 @@ import PropTypes from 'prop-types'
 import classNames from 'classnames'
 
 class Flex extends React.Component {
-  render () {
+  render() {
     const {
       flex,
 
-      auto, none, width, height,
+      auto,
+      none,
+      width,
+      height,
 
-      row, column,
+      row,
+      column,
 
-      wrap, nowrap,
+      wrap,
+      nowrap,
+      flexGrow,
 
-      justifyStart, justifyEnd, justifyCenter, justifyBetween, justifyAround,
+      justifyStart,
+      justifyEnd,
+      justifyCenter,
+      justifyBetween,
+      justifyAround,
 
-      alignStart, alignEnd, alignCenter, alignBaseline, alignStretch,
+      alignStart,
+      alignEnd,
+      alignCenter,
+      alignBaseline,
+      alignStretch,
 
-      alignContentStart, alignContentEnd, alignContentCenter, alignContentBetween, alignContentAround, alignContentStretch,
+      alignContentStart,
+      alignContentEnd,
+      alignContentCenter,
+      alignContentBetween,
+      alignContentAround,
+      alignContentStretch,
 
-      className, style,
+      className,
+      style,
 
       ...rest
     } = this.props
-    const cn = classNames({
-      'gm-flex': true,
-
-      'gm-flex-flex': flex,
-      'gm-flex-auto': auto,
-      'gm-flex-none': none || width || height,
-
-      'gm-flex-row': row,
-      'gm-flex-column': column,
-
-      'gm-flex-wrap': wrap,
-      'gm-flex-nowrap': nowrap,
-
-      'gm-flex-justify-start': justifyStart,
-      'gm-flex-justify-end': justifyEnd,
-      'gm-flex-justify-center': justifyCenter,
-      'gm-flex-justify-between': justifyBetween,
-      'gm-flex-justify-around': justifyAround,
-
-      'gm-flex-align-start': alignStart,
-      'gm-flex-align-end': alignEnd,
-      'gm-flex-align-center': alignCenter,
-      'gm-flex-align-baseline': alignBaseline,
-      'gm-flex-align-stretch': alignStretch,
-
-      'gm-flex-align-content-start': alignContentStart,
-      'gm-flex-align-content-end': alignContentEnd,
-      'gm-flex-align-content-center': alignContentCenter,
-      'gm-flex-align-content-between': alignContentBetween,
-      'gm-flex-align-content-around': alignContentAround,
-      'gm-flex-align-content-stretch': alignContentStretch
-    }, className)
+    const cn = classNames(
+      {
+        'gm-flex': true,
+
+        'gm-flex-grow': flexGrow,
+        'gm-flex-flex': flex,
+        'gm-flex-auto': auto,
+        'gm-flex-none': none || width || height,
+
+        'gm-flex-row': row,
+        'gm-flex-column': column,
+
+        'gm-flex-wrap': wrap,
+        'gm-flex-nowrap': nowrap,
+
+        'gm-flex-justify-start': justifyStart,
+        'gm-flex-justify-end': justifyEnd,
+        'gm-flex-justify-center': justifyCenter,
+        'gm-flex-justify-between': justifyBetween,
+        'gm-flex-justify-around': justifyAround,
+
+        'gm-flex-align-start': alignStart,
+        'gm-flex-align-end': alignEnd,
+        'gm-flex-align-center': alignCenter,
+        'gm-flex-align-baseline': alignBaseline,
+        'gm-flex-align-stretch': alignStretch,
+
+        'gm-flex-align-content-start': alignContentStart,
+        'gm-flex-align-content-end': alignContentEnd,
+        'gm-flex-align-content-center': alignContentCenter,
+        'gm-flex-align-content-between': alignContentBetween,
+        'gm-flex-align-content-around': alignContentAround,
+        'gm-flex-align-content-stretch': alignContentStretch
+      },
+      className
+    )
 
     let s = Object.assign({}, style)
     if (flex) {
-      s.flex = (typeof flex === 'boolean') ? 1 : flex
-      s.WebKitFlex = (typeof flex === 'boolean') ? 1 : flex
+      s.flex = typeof flex === 'boolean' ? 1 : flex
+      s.WebKitFlex = typeof flex === 'boolean' ? 1 : flex
     }
     if (height) {
       s.height = height
@@ -68,7 +92,11 @@ class Flex extends React.Component {
       s.width = width
     }
 
-    return <div {...rest} className={cn} style={s}>{this.props.children}</div>
+    return (
+      <div {...rest} className={cn} style={s}>
+        {this.props.children}
+      </div>
+    )
   }
 }
 
@@ -81,6 +109,7 @@ Flex.propTypes = {
   row: PropTypes.bool,
   column: PropTypes.bool,
   wrap: PropTypes.bool,
+  flexGrow: PropTypes.bool,
   nowrap: PropTypes.bool,
   justifyStart: PropTypes.bool,
   justifyEnd: PropTypes.bool,

package/src/components/flex/style.less

@@ -19,6 +19,10 @@
   align-items: stretch;
   box-sizing: border-box;
 
+  &.gm-flex-grow {
+    flex-grow: 1;
+  }
+
   &.gm-flex-wrap {
     flex-wrap: wrap;
   }
@@ -98,4 +102,4 @@
   &.gm-flex-align-content-stretch {
     align-content: stretch;
   }
-}
+}

package/src/editor/context_menu.js

@@ -61,7 +61,6 @@ class ContextMenu extends React.Component {
 
   handleSubtotal = name => {
     const { editStore } = this.props
-
     editStore.setSubtotalShow(name)
   }
 
@@ -70,6 +69,11 @@ class ContextMenu extends React.Component {
     editStore.handleChangeTableData(isAutoFilling)
   }
 
+  handleOverallOrder = name => {
+    const { editStore } = this.props
+    editStore.setOverallOrderShow(name)
+  }
+
   renderOrderActionBtn = name => {
     if (!this.hasSubtotalBtn(name)) {
       return null
@@ -84,13 +88,18 @@ class ContextMenu extends React.Component {
       }
     } = this.props
     const arr = name.split('.')
-    const { dataKey, subtotal } = this.props.editStore.config.contents[arr[2]]
+    const {
+      dataKey,
+      subtotal,
+      overallOrder
+    } = this.props.editStore.config.contents[arr[2]]
     const keyArr = dataKey.split('_')
 
     const isMultiActive = keyArr.includes('multi')
     const isThreeActive = keyArr.includes('multi3')
     const isCategoryActive = keyArr.includes('category')
     const isSubtotalActive = subtotal.show
+    const isOverallOrder = overallOrder?.show
 
     return (
       <>
@@ -127,6 +136,12 @@ class ContextMenu extends React.Component {
         >
           {i18next.t('行数填充')}
         </div>
+        <div
+          onClick={this.handleOverallOrder.bind(this, name)}
+          className={isOverallOrder ? 'active' : ''}
+        >
+          {i18next.t('整单合计')}
+        </div>
       </>
     )
   }
@@ -147,6 +162,7 @@ class ContextMenu extends React.Component {
           config={editStore.config}
           data={editStore.mockData}
           getremainpageHeight={editStore.setRemainPageHeight}
+          overallorder={editStore.overallOrderShow}
         />
       </CommonContextMenu>
     )

package/src/editor_settle/editor.js

@@ -23,7 +23,7 @@ const tableDataKeyList = [
 @observer
 class Editor extends React.Component {
   render() {
-    const { onSave, showEditor, addFields } = this.props
+    const { onSave, showEditor, addFields, isSomeSubtotalTr } = this.props
 
     return (
       <div className='gm-printer-edit'>
@@ -46,7 +46,10 @@ class Editor extends React.Component {
             <Gap height='10px' />
             <EditorSelect />
             <Gap height='5px' />
-            <EditorField tableDataKeyList={tableDataKeyList} />
+            <EditorField
+              tableDataKeyList={tableDataKeyList}
+              isSomeSubtotalTr={isSomeSubtotalTr}
+            />
             <Gap height='5px' />
             <EditorAddField addFields={addFields} />
 
@@ -69,7 +72,8 @@ Editor.propTypes = {
   onSave: PropTypes.func,
   showEditor: PropTypes.bool,
   mockData: PropTypes.object.isRequired,
-  addFields: PropTypes.object.isRequired
+  addFields: PropTypes.object.isRequired,
+  isSomeSubtotalTr: PropTypes.bool
 }
 
 Editor.defaultProps = {

package/src/printer/printer.js

@@ -81,6 +81,9 @@ class Printer extends React.Component {
         this.props.printerStore.remainPageHeight
       )
     }
+    if (nextProps.overallorder !== this.props.overallorder) {
+      this.props.printerStore.setOverallOrder(nextProps.config)
+    }
   }
 
   componentDidMount() {
@@ -324,7 +327,8 @@ Printer.propTypes = {
   config: PropTypes.object.isRequired,
   onReady: PropTypes.func,
   isSomeSubtotalTr: PropTypes.bool,
-  getremainpageHeight: PropTypes.func
+  getremainpageHeight: PropTypes.func,
+  overallorder: PropTypes.bool
 }
 
 Printer.defaultProps = {

package/src/printer/store.js

@@ -4,7 +4,8 @@ import {
   getSumTrHeight,
   isMultiTable,
   caclSingleDetailsPageHeight,
-  getArrayMid
+  getArrayMid,
+  getOverallOrderTrHeight
 } from '../util'
 import _ from 'lodash'
 import Big from 'big.js'
@@ -169,6 +170,11 @@ class PrinterStore {
     }
   }
 
+  @action
+  setOverallOrder(config) {
+    this.config = config || {}
+  }
+
   @action
   computedData(dataKey, table, end, currentRemainTableHeight) {
     /** 当前数据 */
@@ -240,9 +246,13 @@ class PrinterStore {
         tableCount++
         // 表格原始的高度和宽度信息
         const table = this.tablesInfo[`contents.table.${index}`]
-        const { subtotal, dataKey, summaryConfig } = content
+        const { subtotal, dataKey, summaryConfig, overallOrder } = content
         // 如果显示每页合计,那么table高度多预留一行高度
         const subtotalTrHeight = subtotal.show ? getSumTrHeight(subtotal) : 0
+        // 如果显示整单合计,那么table高度多预留一行高度
+        const overallOrderTrHeight = overallOrder?.show
+          ? getOverallOrderTrHeight(overallOrder)
+          : 0
         // 如果每页合计(新的),那么table高度多预留一行高度
         const pageSummaryTrHeight =
           summaryConfig?.pageSummaryShow && !isMultiTable(dataKey) // 双栏table没有每页合计
@@ -250,7 +260,10 @@ class PrinterStore {
             : 0
         // 每个表格都具有的高度
         const allTableHaveThisHeight =
-          table.head.height + subtotalTrHeight + pageSummaryTrHeight
+          table.head.height +
+          subtotalTrHeight +
+          pageSummaryTrHeight +
+          overallOrderTrHeight
         /** 当前page页面的最小高度 */
         const currentPageMinimumHeight =
           allPagesHaveThisHeight + allTableHaveThisHeight

package/src/printer/style.lesss

@@ -166,3 +166,15 @@
   flex-grow: 1;
   justify-content: space-between;
 }
+.gm-printer-subtotal-isUpperCaseBefore-inter{
+  order:2;
+}
+.gm-flex-justify-between-page{
+   justify-content: space-between;
+}
+.gm-flex-grow-page{
+    flex-grow: 1;
+}
+.gm-flex-page{
+  display:flex
+}

package/src/printer/table.js

@@ -16,6 +16,7 @@ import { MULTI_SUFFIX } from '../config'
 import SpecialTr from './table_special_tr'
 import SubtotalTr from './table_subtotal_tr'
 import PageSummary from './page_summary'
+import OverallOrder from './table_overallOrder_tr'
 
 @inject('printerStore')
 @observer
@@ -290,6 +291,11 @@ class Table extends React.Component {
           {this.props.config.subtotal.isCommutationPlace
             ? PageSummarySubtotalTr()
             : subtotalTrPageSummary()}
+          <OverallOrder
+            range={range}
+            config={config}
+            printerStore={printerStore}
+          />
         </tbody>
       </table>
     )

package/src/printer/table_overallOrder_tr.js

@@ -0,0 +1,65 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import _ from 'lodash'
+// import Big from 'big.js'
+import { coverDigit2Uppercase } from '../util'
+import { observer } from 'mobx-react'
+import classNames from 'classnames'
+
+const OverallOrder = props => {
+  const {
+    config: { overallOrder },
+    printerStore,
+    printerStore: {
+      data: { common }
+    }
+  } = props
+
+  return (
+    overallOrder?.show &&
+    printerStore?.ready && (
+      <tr>
+        {_.map(overallOrder.fields, (item, index) => {
+          return (
+            <td colSpan={item.colSpan} key={index}>
+              <div style={{ ...item.style }} className='gm-flex-page'>
+                {item.name}
+                <div
+                  className={classNames('gm-flex-page', {
+                    'gm-flex-justify-between-page':
+                      overallOrder?.isUpperLowerCaseSeparate,
+                    'gm-flex-grow-page': overallOrder?.isUpperLowerCaseSeparate
+                  })}
+                >
+                  <span
+                    className={
+                      overallOrder?.isUpperCaseBefore
+                        ? 'gm-printer-subtotal-isUpperCaseBefore-inter'
+                        : ''
+                    }
+                  >
+                    {common?.[item.valueField] ?? ''}
+                  </span>
+                  {overallOrder?.needUpperCase && (
+                    <span>
+                      {common?.[item.valueField]
+                        ? coverDigit2Uppercase(common[item.valueField])
+                        : ''}
+                    </span>
+                  )}
+                </div>
+              </div>
+            </td>
+          )
+        })}
+      </tr>
+    )
+  )
+}
+OverallOrder.propTypes = {
+  config: PropTypes.object.isRequired,
+  range: PropTypes.object.isRequired,
+  printerStore: PropTypes.object
+}
+
+export default observer(OverallOrder)

package/src/printer/table_subtotal_tr.js

@@ -7,11 +7,18 @@ import Big from 'big.js'
 import { coverDigit2Uppercase, getDataKey } from '../util'
 import { observer } from 'mobx-react'
 import { get } from 'mobx'
+import classNames from 'classnames'
+
 /**
  * 每页合计组件,分页计算后,根据range来统计每页合计数据
  * @param props
  * @returns {*}
  */
+const flexStyle = {
+  left: 'flex-start',
+  center: 'center',
+  right: 'flex-end'
+}
 const SubtotalTr = props => {
   const {
     config: {
@@ -25,7 +32,7 @@ const SubtotalTr = props => {
         style,
         fields = [
           {
-            name: i18next.t('出库金额'),
+            name: i18next.t('每页合计：'),
             valueField: 'real_item_price'
           }
         ],
@@ -36,7 +43,6 @@ const SubtotalTr = props => {
     printerStore,
     isSomeSubtotalTr
   } = props
-
   const tableData = printerStore.data._table[getDataKey(dataKey, arrange)] || []
   // 计算合计
   const sumData = (list, field) => {
@@ -67,18 +73,14 @@ const SubtotalTr = props => {
   if (show && printerStore.ready) {
     const list = tableData.slice(range.begin, range.end)
 
-    const sum = {}
-
-    _.each(fields, v => {
-      sum[v.name] = sumData(list, v.valueField)
-    })
-
-    // 定义每页小记的左右两侧内容
-    let subtotalLeftContent
-    let subtotalRightContent
-    let subtotalStr = ''
-    // 结款单
+    // 针对结款单的
     if (isSomeSubtotalTr) {
+      const sum = {}
+
+      _.each(fields, v => {
+        sum[v.name] = sumData(list, v.valueField)
+      })
+      let subtotalStr = ''
       for (const name in sum) {
         const price = sum[name]
         const priceUpperCase = get(subtotal, 'needUpperCase') // needUpperCase在初始模板中undefined,所以必须用这个方法
@@ -103,61 +105,49 @@ const SubtotalTr = props => {
         </tr>
       )
     } else {
-      for (const name in sum) {
-        const price = sum[name]
-        const priceUpperCase = get(subtotal, 'needUpperCase') // needUpperCase在初始模板中undefined,所以必须用这个方法
-          ? '大写：' + coverDigit2Uppercase(price)
-          : ''
-        if (displayName) {
-          // 大写金额是否在前
-          if (isUpperCaseBefore) {
-            subtotalLeftContent = `${name}${priceUpperCase}`
-            subtotalRightContent = `${price}`
-          } else {
-            subtotalLeftContent = `${price}`
-            subtotalRightContent = `${name} ${priceUpperCase}`
-          }
-        } else {
-          if (isUpperCaseBefore) {
-            subtotalLeftContent = `${priceUpperCase}`
-            subtotalRightContent = `${price}`
-          } else {
-            subtotalLeftContent = `${price}`
-            subtotalRightContent = `${priceUpperCase}`
-          }
-        }
-      }
-
       return (
         <tr>
-          <td
-            colSpan={99}
-            style={{ fontWeight: 'bold', ...style }}
-            // dangerouslySetInnerHTML={{
-            //   __html: `${i18next.t('每页合计')}：${subtotalStr}`
-            // }}flex-grow: 1
-          >
-            {/* 大写金额和小写金额分开在表格的两侧，通过控制类名实现，添加类名后，覆盖原来的居中、靠右靠左 */}
-            <div
-              className={
-                isUpperLowerCaseSeparate
-                  ? 'gm-printer-subtotal-UpperLowerCaseSeparate-outer'
-                  : ''
-              }
-            >
-              {i18next.t('每页合计')}：
-              <span
-                className={
-                  isUpperLowerCaseSeparate
-                    ? 'gm-printer-subtotal-UpperLowerCaseSeparate-inter'
-                    : ''
-                }
-              >
-                <span>&nbsp;&nbsp;{subtotalLeftContent}&nbsp;&nbsp;</span>
-                <span>&nbsp;&nbsp;{subtotalRightContent}&nbsp;&nbsp;</span>
-              </span>
-            </div>
-          </td>
+          {_.map(fields, (item, index) => {
+            return (
+              <td colSpan={item.colSpan ?? 99} key={index}>
+                <div
+                  style={{
+                    fontWeight: 'bold',
+                    'justify-content': flexStyle[subtotal.style.textAlign], // flex布局中textAlign不生效，改使用justify-content
+                    ...subtotal.style
+                  }}
+                  className='gm-flex-page'
+                >
+                  {item.name}
+                  <div
+                    className={classNames('gm-flex-page', {
+                      'gm-flex-justify-between-page': isUpperLowerCaseSeparate, // 决定大小写金额是否分开在两端
+                      'gm-flex-grow-page': isUpperLowerCaseSeparate
+                    })}
+                  >
+                    <span
+                      className={
+                        isUpperCaseBefore // 决定小写金额是否在前
+                          ? 'gm-printer-subtotal-isUpperCaseBefore-inter'
+                          : ''
+                      }
+                    >
+                      {/* 这样写是为了支持自定义单元，index = 1时是自定义单元格 */}
+                      {index === 0 ? sumData(list, item.valueField) : ''}
+                    </span>
+                    {subtotal?.needUpperCase && ( // 是否需要大写金额
+                      <span>
+                        {index === 0
+                          ? '大写：' +
+                            coverDigit2Uppercase(sumData(list, item.valueField))
+                          : ''}
+                      </span>
+                    )}
+                  </div>
+                </div>
+              </td>
+            )
+          })}
         </tr>
       )
     }

package/src/util.js

@@ -108,6 +108,14 @@ function getSumTrHeight(SumTr) {
   return (parseInt(fontSize) - 12) * 1.5 + 26
 }
 
+function getOverallOrderTrHeight(overallOrder) {
+  const { fields = [] } = overallOrder
+  const fontSize = fields?.[0]?.style?.fontSize || '12px'
+
+  // 12px => 26, 14px => 29, 16px => 33, ...
+  return (parseInt(fontSize) - 12) * 1.5 + 26
+}
+
 // eslint-disable-next-line
 const coverDigit2Uppercase = n => {
   if (_.isNil(n) || _.isNaN(n)) {
@@ -274,6 +282,17 @@ const getArrayMid = arr => {
   return majority
 }
 
+/**
+ * 获取整单合计colSpan合并的个数
+ * @param {*} table
+ * @returns number
+ */
+const getColSpanLength = table => {
+  return /multi/.test(table.dataKey)
+    ? getMultiNumber(table.dataKey) * table.columns.length
+    : table.columns.length
+}
+
 export {
   getHeight,
   getWidth,
@@ -291,5 +310,7 @@ export {
   isMultiTable,
   getMultiNumber,
   caclSingleDetailsPageHeight,
-  getArrayMid
+  getArrayMid,
+  getColSpanLength,
+  getOverallOrderTrHeight
 }