gm-printer 10.14.2-alpha.0 → 10.14.2-alpha.3

package/.eslintcache

@@ -1 +1 @@
-[{"/Users/min/Documents/GMFE/gm-util/gm-printer/src/util.js":"1","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/get_css.js":"2","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/barcode.js":"3","/Users/min/Documents/GMFE/gm-util/gm-printer/src/index.js":"4","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockout/context_menu.js":"5","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockin/context_menu.js":"6","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_statement/context_menu.js":"7","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_settle/context_menu.js":"8","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_salemenus/context_menu.js":"9","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/editor_special_table.js":"10","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/context_menu.js":"11","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account/context_menu.js":"12","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor/context_menu.js":"13","/Users/min/Documents/GMFE/gm-util/gm-printer/src/config.js":"14","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/hoc_with_store.js":"15","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/hoc_with_shadow_dom.js":"16","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/get_editor_css.js":"17","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_title.js":"18","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_store.js":"19","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_select.js":"20","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_edit_field.js":"21","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/component.js":"22","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockout/editor.js":"23","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockin/editor.js":"24","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_statement/editor.js":"25","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_settle/editor.js":"26","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_salemenus/editor.js":"27","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/editor.js":"28","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account_statement/editor.js":"29","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account/editor.js":"30","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor/editor.js":"31","/Users/min/Documents/GMFE/gm-util/gm-printer/src/components/tooltip/index.js":"32","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_special_field.js":"33","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/store.js":"34","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/index.js":"35","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/do_print.js":"36","/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/finance_printer.js":"37","/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/table_subtotal_tr.js":"38","/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/table.js":"39","/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/finance_batch_printer.js":"40","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/page.js":"41","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table_subtotal_tr.js":"42","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table.js":"43","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/printer.js":"44","/Users/min/Documents/GMFE/gm-util/gm-printer/src/components/flex/index.js":"45"},{"size":7813,"mtime":1648799098282,"results":"46","hashOfConfig":"47"},{"size":291,"mtime":1638935573926,"results":"48","hashOfConfig":"49"},{"size":523,"mtime":1638935549030,"results":"50","hashOfConfig":"49"},{"size":1139,"mtime":1644572548725,"results":"51","hashOfConfig":"52"},{"size":2293,"mtime":1638948548042,"results":"53","hashOfConfig":"49"},{"size":2292,"mtime":1638948522492,"results":"54","hashOfConfig":"49"},{"size":1078,"mtime":1638948543271,"results":"55","hashOfConfig":"49"},{"size":2067,"mtime":1648466228565,"results":"56","hashOfConfig":"47"},{"size":2991,"mtime":1638948535719,"results":"57","hashOfConfig":"49"},{"size":4379,"mtime":1638935458586,"results":"58","hashOfConfig":"49"},{"size":2428,"mtime":1648466380496,"results":"59","hashOfConfig":"47"},{"size":2955,"mtime":1647850650993,"results":"60","hashOfConfig":"52"},{"size":4170,"mtime":1648640206253,"results":"61","hashOfConfig":"47"},{"size":2833,"mtime":1638861837310,"results":"62","hashOfConfig":"49"},{"size":4212,"mtime":1638935746667,"results":"63","hashOfConfig":"49"},{"size":861,"mtime":1638931446915,"results":"64","hashOfConfig":"49"},{"size":178,"mtime":1638931439249,"results":"65","hashOfConfig":"49"},{"size":3272,"mtime":1648713847909,"results":"66","hashOfConfig":"47"},{"size":29040,"mtime":1648805187401,"results":"67","hashOfConfig":"47"},{"size":4898,"mtime":1639992402586,"results":"68","hashOfConfig":"49"},{"size":16177,"mtime":1648785390895,"results":"69","hashOfConfig":"47"},{"size":14787,"mtime":1638948621474,"results":"70","hashOfConfig":"49"},{"size":2165,"mtime":1638949854481,"results":"71","hashOfConfig":"49"},{"size":2165,"mtime":1638949840121,"results":"72","hashOfConfig":"49"},{"size":2223,"mtime":1638949823846,"results":"73","hashOfConfig":"49"},{"size":2226,"mtime":1638949842800,"results":"74","hashOfConfig":"49"},{"size":3367,"mtime":1638949855771,"results":"75","hashOfConfig":"49"},{"size":2305,"mtime":1638949843817,"results":"76","hashOfConfig":"49"},{"size":3294,"mtime":1638949855131,"results":"77","hashOfConfig":"49"},{"size":2850,"mtime":1638949842017,"results":"78","hashOfConfig":"49"},{"size":4157,"mtime":1638949853726,"results":"79","hashOfConfig":"49"},{"size":605,"mtime":1638949882777,"results":"80","hashOfConfig":"49"},{"size":1175,"mtime":1638949720500,"results":"81","hashOfConfig":"49"},{"size":15067,"mtime":1648801216882,"results":"82","hashOfConfig":"47"},{"size":332,"mtime":1644573509040,"results":"83","hashOfConfig":"52"},{"size":4080,"mtime":1648536160221,"results":"84","hashOfConfig":"47"},{"size":8842,"mtime":1646363892377,"results":"85","hashOfConfig":"52"},{"size":4317,"mtime":1646376602197,"results":"86","hashOfConfig":"52"},{"size":9440,"mtime":1644993553716,"results":"87","hashOfConfig":"52"},{"size":724,"mtime":1644808940649,"results":"88","hashOfConfig":"52"},{"size":1717,"mtime":1648466368772,"results":"89","hashOfConfig":"47"},{"size":5251,"mtime":1649211878386,"results":"90","hashOfConfig":"47"},{"size":9717,"mtime":1648628215217,"results":"91","hashOfConfig":"47"},{"size":9001,"mtime":1648713828033,"results":"92","hashOfConfig":"47"},{"size":3152,"mtime":1648713745966},{"filePath":"93","messages":"94","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1h9xfdh",{"filePath":"95","messages":"96","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"jpc0be",{"filePath":"97","messages":"98","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"99","messages":"100","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1qaimc",{"filePath":"101","messages":"102","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"103","messages":"104","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"105","messages":"106","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"107","messages":"108","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"109","messages":"110","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"111","messages":"112","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"113","messages":"114","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"115","messages":"116","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"117","messages":"118","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"119","messages":"120","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"121","messages":"122","errorCount":2,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"123","messages":"124","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"125","messages":"126","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"127","messages":"128","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"129","messages":"130","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"131","messages":"132","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"133","messages":"134","errorCount":1,"warningCount":3,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"135","messages":"136","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"137","messages":"138","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"139","messages":"140","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"141","messages":"142","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"143","messages":"144","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"145","messages":"146","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"147","messages":"148","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"149","messages":"150","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"151","messages":"152","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"153","messages":"154","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"155","messages":"156","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"157","messages":"158","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"159","messages":"160","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"161","messages":"162","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"163","messages":"164","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"165","messages":"166","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"167","messages":"168","errorCount":1,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"169","messages":"170","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"171","messages":"172","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"173","messages":"174","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"175","messages":"176","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"177","messages":"178","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"179","messages":"180","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/min/Documents/GMFE/gm-util/gm-printer/src/util.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/get_css.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/barcode.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/index.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockout/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockin/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_statement/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_settle/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_salemenus/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/editor_special_table.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/config.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/hoc_with_store.js",["181","182"],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/hoc_with_shadow_dom.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/get_editor_css.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_title.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_store.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_select.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_edit_field.js",["183","184","185","186"],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/component.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockout/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockin/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_statement/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_settle/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_salemenus/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account_statement/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/components/tooltip/index.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_special_field.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/store.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/index.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/do_print.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/finance_printer.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/table_subtotal_tr.js",["187"],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/table.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/finance_batch_printer.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/page.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table_subtotal_tr.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/printer.js",[],{"ruleId":"188","severity":2,"message":"189","line":10,"column":29,"nodeType":"190","endLine":10,"endColumn":35},{"ruleId":"188","severity":2,"message":"191","line":145,"column":63,"nodeType":"190","endLine":145,"endColumn":71},{"ruleId":"192","severity":1,"message":"193","line":300,"column":13,"nodeType":"194","endLine":300,"endColumn":49},{"ruleId":"192","severity":1,"message":"193","line":318,"column":13,"nodeType":"194","endLine":318,"endColumn":56},{"ruleId":"192","severity":1,"message":"193","line":470,"column":11,"nodeType":"194","endLine":470,"endColumn":53},{"ruleId":"195","severity":2,"message":"196","line":518,"column":22,"nodeType":"197","messageId":"198","endLine":518,"endColumn":31},{"ruleId":"195","severity":2,"message":"196","line":120,"column":14,"nodeType":"197","messageId":"198","endLine":120,"endColumn":23},"react/prop-types","'config' is missing in props validation","Identifier","'mockData' 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/min/Documents/GMFE/gm-util/gm-printer/src/util.js":"1","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/get_css.js":"2","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/barcode.js":"3","/Users/min/Documents/GMFE/gm-util/gm-printer/src/index.js":"4","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockout/context_menu.js":"5","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockin/context_menu.js":"6","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_statement/context_menu.js":"7","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_settle/context_menu.js":"8","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_salemenus/context_menu.js":"9","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/editor_special_table.js":"10","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/context_menu.js":"11","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account/context_menu.js":"12","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor/context_menu.js":"13","/Users/min/Documents/GMFE/gm-util/gm-printer/src/config.js":"14","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/hoc_with_store.js":"15","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/hoc_with_shadow_dom.js":"16","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/get_editor_css.js":"17","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_title.js":"18","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_store.js":"19","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_select.js":"20","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_edit_field.js":"21","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/component.js":"22","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockout/editor.js":"23","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockin/editor.js":"24","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_statement/editor.js":"25","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_settle/editor.js":"26","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_salemenus/editor.js":"27","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/editor.js":"28","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account_statement/editor.js":"29","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account/editor.js":"30","/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor/editor.js":"31","/Users/min/Documents/GMFE/gm-util/gm-printer/src/components/tooltip/index.js":"32","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_special_field.js":"33","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/store.js":"34","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/index.js":"35","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/do_print.js":"36","/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/finance_printer.js":"37","/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/table_subtotal_tr.js":"38","/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/table.js":"39","/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/finance_batch_printer.js":"40","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/page.js":"41","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table_subtotal_tr.js":"42","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table.js":"43","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/printer.js":"44","/Users/min/Documents/GMFE/gm-util/gm-printer/src/components/flex/index.js":"45","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table_overallOrder_tr.js":"46"},{"size":7813,"mtime":1648799098282,"results":"47","hashOfConfig":"48"},{"size":291,"mtime":1638935573926,"results":"49","hashOfConfig":"50"},{"size":523,"mtime":1638935549030,"results":"51","hashOfConfig":"50"},{"size":1139,"mtime":1644572548725,"results":"52","hashOfConfig":"53"},{"size":2293,"mtime":1638948548042,"results":"54","hashOfConfig":"50"},{"size":2292,"mtime":1638948522492,"results":"55","hashOfConfig":"50"},{"size":1078,"mtime":1638948543271,"results":"56","hashOfConfig":"50"},{"size":2067,"mtime":1648466228565,"results":"57","hashOfConfig":"48"},{"size":2991,"mtime":1638948535719,"results":"58","hashOfConfig":"50"},{"size":4379,"mtime":1638935458586,"results":"59","hashOfConfig":"50"},{"size":2428,"mtime":1648466380496,"results":"60","hashOfConfig":"48"},{"size":2955,"mtime":1647850650993,"results":"61","hashOfConfig":"53"},{"size":4170,"mtime":1648640206253,"results":"62","hashOfConfig":"48"},{"size":2833,"mtime":1638861837310,"results":"63","hashOfConfig":"50"},{"size":4212,"mtime":1638935746667,"results":"64","hashOfConfig":"50"},{"size":861,"mtime":1638931446915,"results":"65","hashOfConfig":"50"},{"size":178,"mtime":1638931439249,"results":"66","hashOfConfig":"50"},{"size":3272,"mtime":1648713847909,"results":"67","hashOfConfig":"48"},{"size":35624,"mtime":1650085861287,"results":"68","hashOfConfig":"48"},{"size":4898,"mtime":1639992402586,"results":"69","hashOfConfig":"50"},{"size":17167,"mtime":1650082865251,"results":"70","hashOfConfig":"48"},{"size":14787,"mtime":1638948621474,"results":"71","hashOfConfig":"50"},{"size":2165,"mtime":1638949854481,"results":"72","hashOfConfig":"50"},{"size":2165,"mtime":1638949840121,"results":"73","hashOfConfig":"50"},{"size":2223,"mtime":1638949823846,"results":"74","hashOfConfig":"50"},{"size":2356,"mtime":1650083974574,"results":"75","hashOfConfig":"48"},{"size":3367,"mtime":1638949855771,"results":"76","hashOfConfig":"50"},{"size":2305,"mtime":1638949843817,"results":"77","hashOfConfig":"50"},{"size":3294,"mtime":1638949855131,"results":"78","hashOfConfig":"50"},{"size":2850,"mtime":1638949842017,"results":"79","hashOfConfig":"50"},{"size":4157,"mtime":1638949853726,"results":"80","hashOfConfig":"50"},{"size":605,"mtime":1638949882777,"results":"81","hashOfConfig":"50"},{"size":1175,"mtime":1638949720500,"results":"82","hashOfConfig":"50"},{"size":15067,"mtime":1648801216882,"results":"83","hashOfConfig":"48"},{"size":332,"mtime":1644573509040,"results":"84","hashOfConfig":"53"},{"size":4080,"mtime":1648536160221,"results":"85","hashOfConfig":"48"},{"size":8842,"mtime":1646363892377,"results":"86","hashOfConfig":"53"},{"size":4317,"mtime":1646376602197,"results":"87","hashOfConfig":"53"},{"size":9440,"mtime":1644993553716,"results":"88","hashOfConfig":"53"},{"size":724,"mtime":1644808940649,"results":"89","hashOfConfig":"53"},{"size":1717,"mtime":1648466368772,"results":"90","hashOfConfig":"48"},{"size":5049,"mtime":1650085552191,"results":"91","hashOfConfig":"48"},{"size":9717,"mtime":1648628215217,"results":"92","hashOfConfig":"48"},{"size":9001,"mtime":1648713828033,"results":"93","hashOfConfig":"48"},{"size":3152,"mtime":1648713745966},{"size":1901,"mtime":1650082399244,"results":"94","hashOfConfig":"48"},{"filePath":"95","messages":"96","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1h9xfdh",{"filePath":"97","messages":"98","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"jpc0be",{"filePath":"99","messages":"100","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"101","messages":"102","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1qaimc",{"filePath":"103","messages":"104","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"105","messages":"106","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"107","messages":"108","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"109","messages":"110","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"111","messages":"112","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"113","messages":"114","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"115","messages":"116","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"117","messages":"118","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"119","messages":"120","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"121","messages":"122","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"123","messages":"124","errorCount":2,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"125","messages":"126","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"127","messages":"128","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"129","messages":"130","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"131","messages":"132","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"133","messages":"134","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"135","messages":"136","errorCount":1,"warningCount":4,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"137","messages":"138","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"139","messages":"140","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"141","messages":"142","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"143","messages":"144","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"145","messages":"146","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"147","messages":"148","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"149","messages":"150","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"151","messages":"152","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"153","messages":"154","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"155","messages":"156","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"157","messages":"158","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"159","messages":"160","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"161","messages":"162","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"163","messages":"164","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"165","messages":"166","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"167","messages":"168","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"169","messages":"170","errorCount":1,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"171","messages":"172","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"173","messages":"174","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"175","messages":"176","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"177","messages":"178","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"179","messages":"180","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"181","messages":"182","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"183","messages":"184","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/min/Documents/GMFE/gm-util/gm-printer/src/util.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/get_css.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/barcode.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/index.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockout/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockin/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_statement/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_settle/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_salemenus/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/editor_special_table.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor/context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/config.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/hoc_with_store.js",["185","186"],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/hoc_with_shadow_dom.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/get_editor_css.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_title.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_store.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_select.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_edit_field.js",["187","188","189","190","191"],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/component.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockout/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_stockin/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_statement/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_settle/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_salemenus/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_purchase/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account_statement/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor_account/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/editor/editor.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/components/tooltip/index.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_special_field.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/store.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/index.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/do_print.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/finance_printer.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/table_subtotal_tr.js",["192"],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/table.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/finance_voucher/components/finance_batch_printer.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/page.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table_subtotal_tr.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/printer.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table_overallOrder_tr.js",[],{"ruleId":"193","severity":2,"message":"194","line":10,"column":29,"nodeType":"195","endLine":10,"endColumn":35},{"ruleId":"193","severity":2,"message":"196","line":145,"column":63,"nodeType":"195","endLine":145,"endColumn":71},{"ruleId":"197","severity":1,"message":"198","line":305,"column":13,"nodeType":"199","endLine":305,"endColumn":49},{"ruleId":"197","severity":1,"message":"198","line":323,"column":13,"nodeType":"199","endLine":323,"endColumn":56},{"ruleId":"197","severity":1,"message":"198","line":446,"column":15,"nodeType":"199","endLine":446,"endColumn":53},{"ruleId":"197","severity":1,"message":"198","line":495,"column":11,"nodeType":"199","endLine":495,"endColumn":53},{"ruleId":"200","severity":2,"message":"201","line":544,"column":22,"nodeType":"202","messageId":"203","endLine":544,"endColumn":31},{"ruleId":"200","severity":2,"message":"201","line":120,"column":14,"nodeType":"202","messageId":"203","endLine":120,"endColumn":23},"react/prop-types","'config' is missing in props validation","Identifier","'mockData' 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.2-alpha.0",
+  "version": "10.14.2-alpha.3",
   "description": "diy printer",
   "main": "src/index.js",
   "scripts": {

package/src/common/editor_edit_field.js

@@ -184,7 +184,7 @@ 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 {
@@ -219,6 +219,11 @@ class EditorField extends React.Component {
     // 每页合计样式
     const overallOrderStyle =
       (overallOrder && overallOrder?.fields[0].style) || {}
+    // 每页合计自定义单元格
+    const subtotalUpperCustomCell =
+      (editStore.computedTableSpecialConfig?.subtotal &&
+        get(subtotal, 'isCustomCells')) ||
+      false
     //  整单合计是否大写
     const overallOrderNeedUpperCase =
       (editStore.computedTableSpecialConfig?.overallOrder &&
@@ -411,18 +416,38 @@ class EditorField extends React.Component {
           subtotalCheckOnChange={editStore.setSubtotalUpperCase}
           subtotalCheckText='显示大写金额'
         />
-        <EditorSubtotalCheck
-          subtotalCheckDisabled={subtotalNeedUpperCase}
-          subtotalChecked={subtotalUpperCaseBefore}
-          subtotalCheckOnChange={editStore.setSubtotalUpperCaseBefore}
-          subtotalCheckText='大写金额在前'
-        />
-        <EditorSubtotalCheck
-          subtotalCheckDisabled={subtotalNeedUpperCase}
-          subtotalChecked={subtotalUpperLowerCaseSeparate}
-          subtotalCheckOnChange={editStore.setSubtotalUpperLowerCaseSeparate}
-          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
@@ -490,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

@@ -74,7 +74,15 @@ class EditorStore {
       fontWeight: 'bold'
     }
   }
-  
+
+  // 每页合计自定义合并单元格
+  @observable
+  subtotalConfigFields = {
+    name: '',
+    valueField: '',
+    colSpan: 3 // 产品说3个,开启自定义单元格
+  }
+
   @computed
   get computedPrinterKey() {
     return _.map(this.config, (v, k) => {
@@ -525,11 +533,28 @@ 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
@@ -577,7 +602,7 @@ class EditorStore {
   @action
   changeTableDataKey(name, key) {
     const arr = name.split('.')
-    const { dataKey, overallOrder } = this.config.contents[arr[2]]
+    const { dataKey, overallOrder, subtotal } = this.config.contents[arr[2]]
     const keyArr = dataKey.split('_')
     let newDataKey
     // 当前有这个key则去掉
@@ -601,10 +626,10 @@ class EditorStore {
     ])
 
     this.config.contents[arr[2]].dataKey = newDataKey.join('_')
-    // 整单合计的单元格要修改
-    if (overallOrder?.show) {
-      overallOrder.show = false
-    }
+    // 整单合计不显示
+    if (overallOrder?.show) overallOrder.show = false
+    // 每页合计不显示
+    if (subtotal?.show) subtotal.show = false
   }
 
   @action
@@ -992,6 +1017,7 @@ 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
 
@@ -1011,6 +1037,7 @@ 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
 
@@ -1023,6 +1050,7 @@ 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
 
@@ -1033,6 +1061,72 @@ 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() {

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/style.lesss

@@ -169,3 +169,12 @@
 .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_overallOrder_tr.js

@@ -4,12 +4,11 @@ import _ from 'lodash'
 // import Big from 'big.js'
 import { coverDigit2Uppercase } from '../util'
 import { observer } from 'mobx-react'
-import { Flex } from '../components'
+import classNames from 'classnames'
 
 const OverallOrder = props => {
   const {
     config: { overallOrder },
-    // range,
     printerStore,
     printerStore: {
       data: { common }
@@ -23,11 +22,14 @@ const OverallOrder = props => {
         {_.map(overallOrder.fields, (item, index) => {
           return (
             <td colSpan={item.colSpan} key={index}>
-              <Flex style={{ ...item.style, display: 'flex' }}>
+              <div style={{ ...item.style }} className='gm-flex-page'>
                 {item.name}
-                <Flex
-                  justifyBetween={overallOrder?.isUpperLowerCaseSeparate}
-                  flexGrow={overallOrder?.isUpperLowerCaseSeparate}
+                <div
+                  className={classNames('gm-flex-page', {
+                    'gm-flex-justify-between-page':
+                      overallOrder?.isUpperLowerCaseSeparate,
+                    'gm-flex-grow-page': overallOrder?.isUpperLowerCaseSeparate
+                  })}
                 >
                   <span
                     className={
@@ -45,8 +47,8 @@ const OverallOrder = props => {
                         : ''}
                     </span>
                   )}
-                </Flex>
-              </Flex>
+                </div>
+              </div>
             </td>
           )
         })}

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'
           }
         ],
@@ -66,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,所以必须用这个方法
@@ -102,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>
       )
     }