gm-printer 10.13.18-alpha.0 → 10.13.19-alpha.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.eslintcache +1 -1
- package/package.json +1 -1
- package/src/common/editor_edit_field.js +4 -86
- package/src/common/editor_store.js +6 -194
- package/src/components/flex/index.js +43 -72
- package/src/components/flex/style.less +1 -5
- package/src/editor/context_menu.js +2 -18
- package/src/printer/printer.js +2 -5
- package/src/printer/store.js +3 -16
- package/src/printer/style.lesss +0 -3
- package/src/printer/table.js +0 -6
- package/src/printer/table_subtotal_tr.js +6 -1
- package/src/util.js +1 -22
- package/src/printer/table_overallOrder_tr.js +0 -63
package/.eslintcache
CHANGED
|
@@ -1 +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/printer/table_overallOrder_tr.js":"45","/Users/min/Documents/GMFE/gm-util/gm-printer/src/components/flex/index.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":29040,"mtime":1648805187401,"results":"68","hashOfConfig":"48"},{"size":4898,"mtime":1639992402586,"results":"69","hashOfConfig":"50"},{"size":16177,"mtime":1648785390895,"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":2226,"mtime":1638949842800,"results":"75","hashOfConfig":"50"},{"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":5086,"mtime":1648537823749,"results":"91","hashOfConfig":"48"},{"size":9717,"mtime":1648628215217,"results":"92","hashOfConfig":"48"},{"size":9001,"mtime":1648713828033,"results":"93","hashOfConfig":"48"},{"size":1780,"mtime":1648799966079,"results":"94","hashOfConfig":"48"},{"size":3152,"mtime":1648713745966},{"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":3,"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"],"/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",["191"],"/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":"192","severity":2,"message":"193","line":10,"column":29,"nodeType":"194","endLine":10,"endColumn":35},{"ruleId":"192","severity":2,"message":"195","line":145,"column":63,"nodeType":"194","endLine":145,"endColumn":71},{"ruleId":"196","severity":1,"message":"197","line":300,"column":13,"nodeType":"198","endLine":300,"endColumn":49},{"ruleId":"196","severity":1,"message":"197","line":318,"column":13,"nodeType":"198","endLine":318,"endColumn":56},{"ruleId":"196","severity":1,"message":"197","line":470,"column":11,"nodeType":"198","endLine":470,"endColumn":53},{"ruleId":"199","severity":2,"message":"200","line":518,"column":22,"nodeType":"201","messageId":"202","endLine":518,"endColumn":31},{"ruleId":"199","severity":2,"message":"200","line":120,"column":14,"nodeType":"201","messageId":"202","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"]
|
|
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"]
|
package/package.json
CHANGED
|
@@ -13,8 +13,7 @@ import {
|
|
|
13
13
|
ColumnWidth,
|
|
14
14
|
Textarea,
|
|
15
15
|
Title,
|
|
16
|
-
TipInfo
|
|
17
|
-
Text
|
|
16
|
+
TipInfo
|
|
18
17
|
} from '../common/component'
|
|
19
18
|
import { get } from 'mobx'
|
|
20
19
|
import PropTypes from 'prop-types'
|
|
@@ -74,11 +73,6 @@ class EditorField extends React.Component {
|
|
|
74
73
|
editStore.setSubtotalStyle(value)
|
|
75
74
|
}
|
|
76
75
|
|
|
77
|
-
handleOverallOrderStyleChange = value => {
|
|
78
|
-
const { editStore } = this.props
|
|
79
|
-
editStore.setOverallOrderStyle(value)
|
|
80
|
-
}
|
|
81
|
-
|
|
82
76
|
renderBlocks() {
|
|
83
77
|
const { editStore, showNewDate } = this.props
|
|
84
78
|
const { type, text, style, link } = editStore.computedSelectedInfo
|
|
@@ -187,12 +181,7 @@ class EditorField extends React.Component {
|
|
|
187
181
|
const { tableDataKeyList, editStore } = this.props
|
|
188
182
|
const { head, headStyle, text, style } = editStore.computedSelectedInfo
|
|
189
183
|
|
|
190
|
-
const {
|
|
191
|
-
specialConfig,
|
|
192
|
-
subtotal,
|
|
193
|
-
overallOrder
|
|
194
|
-
} = editStore.computedTableSpecialConfig
|
|
195
|
-
|
|
184
|
+
const { specialConfig, subtotal } = editStore.computedTableSpecialConfig
|
|
196
185
|
// 小计样式,specialConfig可能是undefined
|
|
197
186
|
const specialStyle =
|
|
198
187
|
editStore.computedTableSpecialConfig?.specialConfig?.style || {}
|
|
@@ -206,40 +195,16 @@ class EditorField extends React.Component {
|
|
|
206
195
|
(editStore.computedTableSpecialConfig.subtotal &&
|
|
207
196
|
get(subtotal, 'needUpperCase')) ||
|
|
208
197
|
false
|
|
209
|
-
//
|
|
198
|
+
// 大写的金额是否在前
|
|
210
199
|
const subtotalUpperCaseBefore =
|
|
211
200
|
(editStore.computedTableSpecialConfig.subtotal &&
|
|
212
201
|
get(subtotal, 'isUpperCaseBefore')) ||
|
|
213
202
|
false
|
|
214
|
-
//
|
|
203
|
+
// 大写和小写的金额是否分开
|
|
215
204
|
const subtotalUpperLowerCaseSeparate =
|
|
216
205
|
(editStore.computedTableSpecialConfig.subtotal &&
|
|
217
206
|
get(subtotal, 'isUpperLowerCaseSeparate')) ||
|
|
218
207
|
false
|
|
219
|
-
// 每页合计样式
|
|
220
|
-
const overallOrderStyle =
|
|
221
|
-
(overallOrder && overallOrder?.fields[0].style) || {}
|
|
222
|
-
// 整单合计是否大写
|
|
223
|
-
const overallOrderNeedUpperCase =
|
|
224
|
-
(editStore.computedTableSpecialConfig?.overallOrder &&
|
|
225
|
-
get(overallOrder, 'needUpperCase')) ||
|
|
226
|
-
false
|
|
227
|
-
// 整单合计大写的金额是否在前
|
|
228
|
-
const overallOrderCaseBefore =
|
|
229
|
-
(editStore.computedTableSpecialConfig?.overallOrder &&
|
|
230
|
-
get(overallOrder, 'isUpperCaseBefore')) ||
|
|
231
|
-
false
|
|
232
|
-
// 整单合计大写和小写的金额是否分开
|
|
233
|
-
const overallOrderUpperLowerCaseSeparate =
|
|
234
|
-
(editStore.computedTableSpecialConfig?.overallOrder &&
|
|
235
|
-
get(overallOrder, 'isUpperLowerCaseSeparate')) ||
|
|
236
|
-
false
|
|
237
|
-
// 整单合计自定义单元格
|
|
238
|
-
const overallOrderUpperCustomCell =
|
|
239
|
-
(editStore.computedTableSpecialConfig?.overallOrder &&
|
|
240
|
-
get(overallOrder, 'isCustomCells')) ||
|
|
241
|
-
false
|
|
242
|
-
|
|
243
208
|
return (
|
|
244
209
|
<div>
|
|
245
210
|
<Title title={i18next.t('编辑字段')} />
|
|
@@ -423,53 +388,6 @@ class EditorField extends React.Component {
|
|
|
423
388
|
subtotalCheckOnChange={editStore.setSubtotalUpperLowerCaseSeparate}
|
|
424
389
|
subtotalCheckText='大、小写金额分左右两边展示'
|
|
425
390
|
/>
|
|
426
|
-
<Flex>
|
|
427
|
-
<Flex>{i18next.t('整单合计')}:</Flex>
|
|
428
|
-
<Fonter
|
|
429
|
-
style={overallOrderStyle}
|
|
430
|
-
onChange={this.handleOverallOrderStyleChange}
|
|
431
|
-
/>
|
|
432
|
-
<Separator />
|
|
433
|
-
<TextAlign
|
|
434
|
-
style={overallOrderStyle}
|
|
435
|
-
onChange={this.handleOverallOrderStyleChange}
|
|
436
|
-
/>
|
|
437
|
-
</Flex>
|
|
438
|
-
<EditorSubtotalCheck
|
|
439
|
-
subtotalCheckDisabled
|
|
440
|
-
subtotalChecked={overallOrderNeedUpperCase}
|
|
441
|
-
subtotalCheckOnChange={editStore.setOverallOrderUpperCase}
|
|
442
|
-
subtotalCheckText='显示大写金额'
|
|
443
|
-
/>
|
|
444
|
-
<EditorSubtotalCheck
|
|
445
|
-
subtotalCheckDisabled={overallOrderNeedUpperCase}
|
|
446
|
-
subtotalChecked={overallOrderCaseBefore}
|
|
447
|
-
subtotalCheckOnChange={editStore.setOverallOrderUpperCaseBefore}
|
|
448
|
-
subtotalCheckText='大写金额在前'
|
|
449
|
-
/>
|
|
450
|
-
<EditorSubtotalCheck
|
|
451
|
-
subtotalCheckDisabled={overallOrderNeedUpperCase}
|
|
452
|
-
subtotalChecked={overallOrderUpperLowerCaseSeparate}
|
|
453
|
-
subtotalCheckOnChange={
|
|
454
|
-
editStore.setOverallOrderUpperLowerCaseSeparate
|
|
455
|
-
}
|
|
456
|
-
subtotalCheckText='大、小写金额分左右两边展示'
|
|
457
|
-
/>
|
|
458
|
-
<EditorSubtotalCheck
|
|
459
|
-
subtotalCheckDisabled
|
|
460
|
-
subtotalChecked={overallOrderUpperCustomCell}
|
|
461
|
-
subtotalCheckOnChange={editStore.setOverallOrderCustomCells}
|
|
462
|
-
subtotalCheckText='开启自定义单元格'
|
|
463
|
-
/>
|
|
464
|
-
<Text
|
|
465
|
-
value={
|
|
466
|
-
overallOrder && overallOrder?.fields?.[1]
|
|
467
|
-
? overallOrder.fields[1].name
|
|
468
|
-
: ''
|
|
469
|
-
}
|
|
470
|
-
onChange={editStore.setOverallOrderFields}
|
|
471
|
-
style={{ width: '65px', margin: '5px 0 5px 80px' }}
|
|
472
|
-
/>
|
|
473
391
|
</div>
|
|
474
392
|
)
|
|
475
393
|
}
|
|
@@ -2,27 +2,13 @@ import i18next from '../../locales'
|
|
|
2
2
|
import { action, computed, observable, set, toJS } from 'mobx'
|
|
3
3
|
import { pageTypeMap } from '../config'
|
|
4
4
|
import _ from 'lodash'
|
|
5
|
-
import { dispatchMsg, getBlockName, exchange
|
|
5
|
+
import { dispatchMsg, getBlockName, exchange } from '../util'
|
|
6
6
|
import React from 'react'
|
|
7
7
|
|
|
8
8
|
class EditorStore {
|
|
9
9
|
@observable
|
|
10
10
|
tableCustomStyle = 'default'
|
|
11
11
|
|
|
12
|
-
@observable
|
|
13
|
-
overallOrderShow = false
|
|
14
|
-
|
|
15
|
-
// 整单合计自定义合并单元格
|
|
16
|
-
@observable
|
|
17
|
-
overallOrderConfigFields = {
|
|
18
|
-
name: '',
|
|
19
|
-
valueField: '',
|
|
20
|
-
colSpan: 3, // 产品说3个
|
|
21
|
-
style: {
|
|
22
|
-
fontWeight: 'bold'
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
|
|
26
12
|
@action.bound
|
|
27
13
|
changeTableCustomStyle(v) {
|
|
28
14
|
if (this.selectedRegion) {
|
|
@@ -443,39 +429,6 @@ class EditorStore {
|
|
|
443
429
|
table.subtotal.show = !table.subtotal.show
|
|
444
430
|
}
|
|
445
431
|
|
|
446
|
-
@action
|
|
447
|
-
setOverallOrderShow(name) {
|
|
448
|
-
const arr = name.split('.')
|
|
449
|
-
const table = this.config.contents[arr[2]]
|
|
450
|
-
this.overallOrderShow = !this.overallOrderShow
|
|
451
|
-
const colSpanLength = getColSpanLength(table)
|
|
452
|
-
if (table.overallOrder) {
|
|
453
|
-
set(table.overallOrder, {
|
|
454
|
-
show: !table.overallOrder.show
|
|
455
|
-
})
|
|
456
|
-
table.overallOrder.fields[0].colSpan =
|
|
457
|
-
colSpanLength - (table.overallOrder.fields?.[1]?.colSpan ?? 0)
|
|
458
|
-
} else {
|
|
459
|
-
// 兼容已经存在的配送单据,他们的配置存在后端的,没有overallOrder这个配置,给加上
|
|
460
|
-
set(table, {
|
|
461
|
-
overallOrder: {
|
|
462
|
-
show: true,
|
|
463
|
-
fields: [
|
|
464
|
-
{
|
|
465
|
-
name: '整单合计:',
|
|
466
|
-
valueField: '出库金额',
|
|
467
|
-
style: {
|
|
468
|
-
fontWeight: 'bold'
|
|
469
|
-
},
|
|
470
|
-
colSpan: colSpanLength
|
|
471
|
-
}
|
|
472
|
-
]
|
|
473
|
-
}
|
|
474
|
-
})
|
|
475
|
-
}
|
|
476
|
-
this.config = toJS(this.config)
|
|
477
|
-
}
|
|
478
|
-
|
|
479
432
|
@action
|
|
480
433
|
setConfigTable(who, value) {
|
|
481
434
|
if (!this.computedIsSelectTable) {
|
|
@@ -488,7 +441,7 @@ class EditorStore {
|
|
|
488
441
|
@action
|
|
489
442
|
changeTableDataKey(name, key) {
|
|
490
443
|
const arr = name.split('.')
|
|
491
|
-
const { dataKey
|
|
444
|
+
const { dataKey } = this.config.contents[arr[2]]
|
|
492
445
|
const keyArr = dataKey.split('_')
|
|
493
446
|
let newDataKey
|
|
494
447
|
// 当前有这个key则去掉
|
|
@@ -512,10 +465,6 @@ class EditorStore {
|
|
|
512
465
|
])
|
|
513
466
|
|
|
514
467
|
this.config.contents[arr[2]].dataKey = newDataKey.join('_')
|
|
515
|
-
// 整单合计的单元格要修改
|
|
516
|
-
if (overallOrder?.show) {
|
|
517
|
-
overallOrder.show = false
|
|
518
|
-
}
|
|
519
468
|
}
|
|
520
469
|
|
|
521
470
|
@action
|
|
@@ -891,7 +840,7 @@ class EditorStore {
|
|
|
891
840
|
}
|
|
892
841
|
}
|
|
893
842
|
|
|
894
|
-
//
|
|
843
|
+
// 设置大写金额
|
|
895
844
|
@action.bound
|
|
896
845
|
setSubtotalUpperCase() {
|
|
897
846
|
if (this.selectedRegion) {
|
|
@@ -910,7 +859,7 @@ class EditorStore {
|
|
|
910
859
|
}
|
|
911
860
|
}
|
|
912
861
|
|
|
913
|
-
//
|
|
862
|
+
// 设置大写金额在前
|
|
914
863
|
@action.bound
|
|
915
864
|
setSubtotalUpperCaseBefore() {
|
|
916
865
|
if (this.selectedRegion) {
|
|
@@ -922,7 +871,7 @@ class EditorStore {
|
|
|
922
871
|
}
|
|
923
872
|
}
|
|
924
873
|
|
|
925
|
-
//
|
|
874
|
+
// 设置大小写金额分开
|
|
926
875
|
@action.bound
|
|
927
876
|
setSubtotalUpperLowerCaseSeparate() {
|
|
928
877
|
if (this.selectedRegion) {
|
|
@@ -936,144 +885,7 @@ class EditorStore {
|
|
|
936
885
|
}
|
|
937
886
|
}
|
|
938
887
|
|
|
939
|
-
//
|
|
940
|
-
@action.bound
|
|
941
|
-
setOverallOrderUpperCase() {
|
|
942
|
-
if (this.selectedRegion) {
|
|
943
|
-
this.overallOrderShow = !this.overallOrderShow
|
|
944
|
-
const arr = this.selectedRegion.split('.')
|
|
945
|
-
const overallOrderConfig = this.config.contents[arr[2]]?.overallOrder
|
|
946
|
-
|
|
947
|
-
const oldNeedUpperCase = overallOrderConfig?.needUpperCase
|
|
948
|
-
this.config.contents[arr[2]]?.overallOrder &&
|
|
949
|
-
set(overallOrderConfig, { needUpperCase: !oldNeedUpperCase })
|
|
950
|
-
// 没有大写金额时,将大写在前和大小写分开的多选框设置为false
|
|
951
|
-
if (
|
|
952
|
-
this.config.contents[arr[2]]?.overallOrder &&
|
|
953
|
-
overallOrderConfig.needUpperCase === false
|
|
954
|
-
) {
|
|
955
|
-
overallOrderConfig.isUpperCaseBefore &&
|
|
956
|
-
set(overallOrderConfig, { isUpperCaseBefore: false })
|
|
957
|
-
overallOrderConfig.isUpperLowerCaseSeparate &&
|
|
958
|
-
set(overallOrderConfig, { isUpperLowerCaseSeparate: false })
|
|
959
|
-
}
|
|
960
|
-
}
|
|
961
|
-
}
|
|
962
|
-
|
|
963
|
-
// 整单合计设置大写金额在前
|
|
964
|
-
@action.bound
|
|
965
|
-
setOverallOrderUpperCaseBefore() {
|
|
966
|
-
if (this.selectedRegion) {
|
|
967
|
-
this.overallOrderShow = !this.overallOrderShow
|
|
968
|
-
const arr = this.selectedRegion.split('.')
|
|
969
|
-
const overallOrderConfig = this.config.contents[arr[2]]?.overallOrder
|
|
970
|
-
|
|
971
|
-
const oldUpperCaseBefore = overallOrderConfig?.isUpperCaseBefore
|
|
972
|
-
this.config.contents[arr[2]]?.overallOrder &&
|
|
973
|
-
set(overallOrderConfig, { isUpperCaseBefore: !oldUpperCaseBefore })
|
|
974
|
-
}
|
|
975
|
-
}
|
|
976
|
-
|
|
977
|
-
// 整单合计设置大小写金额分开
|
|
978
|
-
@action.bound
|
|
979
|
-
setOverallOrderUpperLowerCaseSeparate() {
|
|
980
|
-
if (this.selectedRegion) {
|
|
981
|
-
this.overallOrderShow = !this.overallOrderShow
|
|
982
|
-
const arr = this.selectedRegion.split('.')
|
|
983
|
-
const overallOrderConfig = this.config.contents[arr[2]]?.overallOrder
|
|
984
|
-
|
|
985
|
-
const oldUpperLowerCaseSeparate =
|
|
986
|
-
overallOrderConfig.isUpperLowerCaseSeparate
|
|
987
|
-
set(overallOrderConfig, {
|
|
988
|
-
isUpperLowerCaseSeparate: !oldUpperLowerCaseSeparate
|
|
989
|
-
})
|
|
990
|
-
}
|
|
991
|
-
}
|
|
992
|
-
|
|
993
|
-
// 整单合计开启自定义单元格
|
|
994
|
-
@action.bound
|
|
995
|
-
setOverallOrderCustomCells() {
|
|
996
|
-
if (this.selectedRegion) {
|
|
997
|
-
// 作用:触发tableoverallordertr组件的更新
|
|
998
|
-
this.overallOrderShow = !this.overallOrderShow
|
|
999
|
-
const arr = this.selectedRegion.split('.')
|
|
1000
|
-
const table = this.config.contents[arr[2]]
|
|
1001
|
-
const overallOrderConfig = table?.overallOrder
|
|
1002
|
-
if (!overallOrderConfig || !overallOrderConfig?.show) return
|
|
1003
|
-
// 多栏表格情况
|
|
1004
|
-
const colSpanLength = getColSpanLength(table)
|
|
1005
|
-
const oldCustomCells = overallOrderConfig?.isCustomCells
|
|
1006
|
-
|
|
1007
|
-
set(overallOrderConfig, {
|
|
1008
|
-
isCustomCells: !oldCustomCells
|
|
1009
|
-
})
|
|
1010
|
-
|
|
1011
|
-
if (overallOrderConfig?.isCustomCells) {
|
|
1012
|
-
// fields添加自定义单元格
|
|
1013
|
-
overallOrderConfig.fields = [
|
|
1014
|
-
overallOrderConfig.fields[0],
|
|
1015
|
-
{
|
|
1016
|
-
...this.overallOrderConfigFields,
|
|
1017
|
-
// 和之前保持一样的样式
|
|
1018
|
-
style: { ...overallOrderConfig.fields[0].style }
|
|
1019
|
-
}
|
|
1020
|
-
]
|
|
1021
|
-
// 重新计算合并单元格的个数
|
|
1022
|
-
overallOrderConfig.fields[0].colSpan =
|
|
1023
|
-
colSpanLength - overallOrderConfig.fields[1].colSpan
|
|
1024
|
-
} else {
|
|
1025
|
-
// 关闭自定义单元格
|
|
1026
|
-
overallOrderConfig.fields = [overallOrderConfig.fields[0]]
|
|
1027
|
-
// 重新计算合并单元格的个数
|
|
1028
|
-
overallOrderConfig.fields[0].colSpan = colSpanLength
|
|
1029
|
-
}
|
|
1030
|
-
|
|
1031
|
-
this.config = toJS(this.config)
|
|
1032
|
-
}
|
|
1033
|
-
}
|
|
1034
|
-
|
|
1035
|
-
// 整单合计自定义单元格文本输入
|
|
1036
|
-
@action.bound
|
|
1037
|
-
setOverallOrderFields(value) {
|
|
1038
|
-
if (this.selectedRegion) {
|
|
1039
|
-
const arr = this.selectedRegion.split('.')
|
|
1040
|
-
const table = this.config.contents[arr[2]]
|
|
1041
|
-
const overallOrderConfig = table?.overallOrder
|
|
1042
|
-
|
|
1043
|
-
if (overallOrderConfig.isCustomCells) {
|
|
1044
|
-
const overallOrderConfigFields = table?.overallOrder.fields
|
|
1045
|
-
overallOrderConfigFields[1].name = value
|
|
1046
|
-
}
|
|
1047
|
-
}
|
|
1048
|
-
}
|
|
1049
|
-
|
|
1050
|
-
// 整单合计样式设置
|
|
1051
|
-
@action.bound
|
|
1052
|
-
setOverallOrderStyle(value) {
|
|
1053
|
-
if (this.selectedRegion) {
|
|
1054
|
-
const flexStyle = {
|
|
1055
|
-
left: 'flex-start',
|
|
1056
|
-
center: 'center',
|
|
1057
|
-
right: 'flex-end'
|
|
1058
|
-
}
|
|
1059
|
-
const arr = this.selectedRegion.split('.')
|
|
1060
|
-
const overallOrderConfigFields = this.config.contents[arr[2]]
|
|
1061
|
-
?.overallOrder.fields
|
|
1062
|
-
_.forEach(overallOrderConfigFields, item => {
|
|
1063
|
-
const oldStyle = item.style || {}
|
|
1064
|
-
set(item, {
|
|
1065
|
-
style: {
|
|
1066
|
-
...oldStyle,
|
|
1067
|
-
...value,
|
|
1068
|
-
// 整单合计里使用的flex布局,textAlign不生效
|
|
1069
|
-
'justify-content': flexStyle[value.textAlign]
|
|
1070
|
-
}
|
|
1071
|
-
})
|
|
1072
|
-
})
|
|
1073
|
-
}
|
|
1074
|
-
}
|
|
1075
|
-
|
|
1076
|
-
// 合计和每页合计设置交换位置
|
|
888
|
+
// 设置交换位置
|
|
1077
889
|
@action.bound
|
|
1078
890
|
setSubtotalCommutationPlace() {
|
|
1079
891
|
if (this.selectedRegion) {
|
|
@@ -3,87 +3,63 @@ import PropTypes from 'prop-types'
|
|
|
3
3
|
import classNames from 'classnames'
|
|
4
4
|
|
|
5
5
|
class Flex extends React.Component {
|
|
6
|
-
render() {
|
|
6
|
+
render () {
|
|
7
7
|
const {
|
|
8
8
|
flex,
|
|
9
9
|
|
|
10
|
-
auto,
|
|
11
|
-
none,
|
|
12
|
-
width,
|
|
13
|
-
height,
|
|
10
|
+
auto, none, width, height,
|
|
14
11
|
|
|
15
|
-
row,
|
|
16
|
-
column,
|
|
12
|
+
row, column,
|
|
17
13
|
|
|
18
|
-
wrap,
|
|
19
|
-
nowrap,
|
|
20
|
-
flexGrow,
|
|
14
|
+
wrap, nowrap,
|
|
21
15
|
|
|
22
|
-
justifyStart,
|
|
23
|
-
justifyEnd,
|
|
24
|
-
justifyCenter,
|
|
25
|
-
justifyBetween,
|
|
26
|
-
justifyAround,
|
|
16
|
+
justifyStart, justifyEnd, justifyCenter, justifyBetween, justifyAround,
|
|
27
17
|
|
|
28
|
-
alignStart,
|
|
29
|
-
alignEnd,
|
|
30
|
-
alignCenter,
|
|
31
|
-
alignBaseline,
|
|
32
|
-
alignStretch,
|
|
18
|
+
alignStart, alignEnd, alignCenter, alignBaseline, alignStretch,
|
|
33
19
|
|
|
34
|
-
alignContentStart,
|
|
35
|
-
alignContentEnd,
|
|
36
|
-
alignContentCenter,
|
|
37
|
-
alignContentBetween,
|
|
38
|
-
alignContentAround,
|
|
39
|
-
alignContentStretch,
|
|
20
|
+
alignContentStart, alignContentEnd, alignContentCenter, alignContentBetween, alignContentAround, alignContentStretch,
|
|
40
21
|
|
|
41
|
-
className,
|
|
42
|
-
style,
|
|
22
|
+
className, style,
|
|
43
23
|
|
|
44
24
|
...rest
|
|
45
25
|
} = this.props
|
|
46
|
-
const cn = classNames(
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
'gm-flex-align-content-stretch': alignContentStretch
|
|
79
|
-
},
|
|
80
|
-
className
|
|
81
|
-
)
|
|
26
|
+
const cn = classNames({
|
|
27
|
+
'gm-flex': true,
|
|
28
|
+
|
|
29
|
+
'gm-flex-flex': flex,
|
|
30
|
+
'gm-flex-auto': auto,
|
|
31
|
+
'gm-flex-none': none || width || height,
|
|
32
|
+
|
|
33
|
+
'gm-flex-row': row,
|
|
34
|
+
'gm-flex-column': column,
|
|
35
|
+
|
|
36
|
+
'gm-flex-wrap': wrap,
|
|
37
|
+
'gm-flex-nowrap': nowrap,
|
|
38
|
+
|
|
39
|
+
'gm-flex-justify-start': justifyStart,
|
|
40
|
+
'gm-flex-justify-end': justifyEnd,
|
|
41
|
+
'gm-flex-justify-center': justifyCenter,
|
|
42
|
+
'gm-flex-justify-between': justifyBetween,
|
|
43
|
+
'gm-flex-justify-around': justifyAround,
|
|
44
|
+
|
|
45
|
+
'gm-flex-align-start': alignStart,
|
|
46
|
+
'gm-flex-align-end': alignEnd,
|
|
47
|
+
'gm-flex-align-center': alignCenter,
|
|
48
|
+
'gm-flex-align-baseline': alignBaseline,
|
|
49
|
+
'gm-flex-align-stretch': alignStretch,
|
|
50
|
+
|
|
51
|
+
'gm-flex-align-content-start': alignContentStart,
|
|
52
|
+
'gm-flex-align-content-end': alignContentEnd,
|
|
53
|
+
'gm-flex-align-content-center': alignContentCenter,
|
|
54
|
+
'gm-flex-align-content-between': alignContentBetween,
|
|
55
|
+
'gm-flex-align-content-around': alignContentAround,
|
|
56
|
+
'gm-flex-align-content-stretch': alignContentStretch
|
|
57
|
+
}, className)
|
|
82
58
|
|
|
83
59
|
let s = Object.assign({}, style)
|
|
84
60
|
if (flex) {
|
|
85
|
-
s.flex = typeof flex === 'boolean' ? 1 : flex
|
|
86
|
-
s.WebKitFlex = typeof flex === 'boolean' ? 1 : flex
|
|
61
|
+
s.flex = (typeof flex === 'boolean') ? 1 : flex
|
|
62
|
+
s.WebKitFlex = (typeof flex === 'boolean') ? 1 : flex
|
|
87
63
|
}
|
|
88
64
|
if (height) {
|
|
89
65
|
s.height = height
|
|
@@ -92,11 +68,7 @@ class Flex extends React.Component {
|
|
|
92
68
|
s.width = width
|
|
93
69
|
}
|
|
94
70
|
|
|
95
|
-
return
|
|
96
|
-
<div {...rest} className={cn} style={s}>
|
|
97
|
-
{this.props.children}
|
|
98
|
-
</div>
|
|
99
|
-
)
|
|
71
|
+
return <div {...rest} className={cn} style={s}>{this.props.children}</div>
|
|
100
72
|
}
|
|
101
73
|
}
|
|
102
74
|
|
|
@@ -109,7 +81,6 @@ Flex.propTypes = {
|
|
|
109
81
|
row: PropTypes.bool,
|
|
110
82
|
column: PropTypes.bool,
|
|
111
83
|
wrap: PropTypes.bool,
|
|
112
|
-
flexGrow: PropTypes.bool,
|
|
113
84
|
nowrap: PropTypes.bool,
|
|
114
85
|
justifyStart: PropTypes.bool,
|
|
115
86
|
justifyEnd: PropTypes.bool,
|
|
@@ -19,10 +19,6 @@
|
|
|
19
19
|
align-items: stretch;
|
|
20
20
|
box-sizing: border-box;
|
|
21
21
|
|
|
22
|
-
&.gm-flex-grow {
|
|
23
|
-
flex-grow: 1;
|
|
24
|
-
}
|
|
25
|
-
|
|
26
22
|
&.gm-flex-wrap {
|
|
27
23
|
flex-wrap: wrap;
|
|
28
24
|
}
|
|
@@ -102,4 +98,4 @@
|
|
|
102
98
|
&.gm-flex-align-content-stretch {
|
|
103
99
|
align-content: stretch;
|
|
104
100
|
}
|
|
105
|
-
}
|
|
101
|
+
}
|
|
@@ -48,12 +48,8 @@ class ContextMenu extends React.Component {
|
|
|
48
48
|
|
|
49
49
|
handleSubtotal = name => {
|
|
50
50
|
const { editStore } = this.props
|
|
51
|
-
editStore.setSubtotalShow(name)
|
|
52
|
-
}
|
|
53
51
|
|
|
54
|
-
|
|
55
|
-
const { editStore } = this.props
|
|
56
|
-
editStore.setOverallOrderShow(name)
|
|
52
|
+
editStore.setSubtotalShow(name)
|
|
57
53
|
}
|
|
58
54
|
|
|
59
55
|
renderOrderActionBtn = name => {
|
|
@@ -69,18 +65,13 @@ class ContextMenu extends React.Component {
|
|
|
69
65
|
}
|
|
70
66
|
} = this.props
|
|
71
67
|
const arr = name.split('.')
|
|
72
|
-
const {
|
|
73
|
-
dataKey,
|
|
74
|
-
subtotal,
|
|
75
|
-
overallOrder
|
|
76
|
-
} = this.props.editStore.config.contents[arr[2]]
|
|
68
|
+
const { dataKey, subtotal } = this.props.editStore.config.contents[arr[2]]
|
|
77
69
|
const keyArr = dataKey.split('_')
|
|
78
70
|
|
|
79
71
|
const isMultiActive = keyArr.includes('multi')
|
|
80
72
|
const isThreeActive = keyArr.includes('multi3')
|
|
81
73
|
const isCategoryActive = keyArr.includes('category')
|
|
82
74
|
const isSubtotalActive = subtotal.show
|
|
83
|
-
const isOverallOrder = overallOrder?.show
|
|
84
75
|
|
|
85
76
|
return (
|
|
86
77
|
<>
|
|
@@ -111,12 +102,6 @@ class ContextMenu extends React.Component {
|
|
|
111
102
|
>
|
|
112
103
|
{i18next.t('每页合计')}
|
|
113
104
|
</div>
|
|
114
|
-
<div
|
|
115
|
-
onClick={this.handleOverallOrder.bind(this, name)}
|
|
116
|
-
className={isOverallOrder ? 'active' : ''}
|
|
117
|
-
>
|
|
118
|
-
{i18next.t('整单合计')}
|
|
119
|
-
</div>
|
|
120
105
|
</>
|
|
121
106
|
)
|
|
122
107
|
}
|
|
@@ -134,7 +119,6 @@ class ContextMenu extends React.Component {
|
|
|
134
119
|
selectedRegion={editStore.selectedRegion}
|
|
135
120
|
config={editStore.config}
|
|
136
121
|
data={mockData}
|
|
137
|
-
overallorder={editStore.overallOrderShow}
|
|
138
122
|
/>
|
|
139
123
|
</CommonContextMenu>
|
|
140
124
|
)
|
package/src/printer/printer.js
CHANGED
|
@@ -73,9 +73,6 @@ class Printer extends React.Component {
|
|
|
73
73
|
if (nextProps.selectedRegion !== this.props.selectedRegion) {
|
|
74
74
|
this.props.printerStore.setSelectedRegion(nextProps.selectedRegion)
|
|
75
75
|
}
|
|
76
|
-
if (nextProps.overallorder !== this.props.overallorder) {
|
|
77
|
-
this.props.printerStore.setOverallOrder(nextProps.config)
|
|
78
|
-
}
|
|
79
76
|
}
|
|
80
77
|
|
|
81
78
|
componentDidMount() {
|
|
@@ -140,6 +137,7 @@ class Printer extends React.Component {
|
|
|
140
137
|
renderPage() {
|
|
141
138
|
const { printerStore, isSomeSubtotalTr } = this.props
|
|
142
139
|
const { config } = printerStore
|
|
140
|
+
|
|
143
141
|
return (
|
|
144
142
|
<>
|
|
145
143
|
{_.map(printerStore.pages, (page, i) => {
|
|
@@ -290,8 +288,7 @@ Printer.propTypes = {
|
|
|
290
288
|
data: PropTypes.object.isRequired,
|
|
291
289
|
config: PropTypes.object.isRequired,
|
|
292
290
|
onReady: PropTypes.func,
|
|
293
|
-
isSomeSubtotalTr: PropTypes.bool
|
|
294
|
-
overallorder: PropTypes.bool
|
|
291
|
+
isSomeSubtotalTr: PropTypes.bool
|
|
295
292
|
}
|
|
296
293
|
|
|
297
294
|
Printer.defaultProps = {
|
package/src/printer/store.js
CHANGED
|
@@ -4,8 +4,7 @@ import {
|
|
|
4
4
|
getSumTrHeight,
|
|
5
5
|
isMultiTable,
|
|
6
6
|
caclSingleDetailsPageHeight,
|
|
7
|
-
getArrayMid
|
|
8
|
-
getOverallOrderTrHeight
|
|
7
|
+
getArrayMid
|
|
9
8
|
} from '../util'
|
|
10
9
|
import _ from 'lodash'
|
|
11
10
|
import Big from 'big.js'
|
|
@@ -79,11 +78,6 @@ class PrinterStore {
|
|
|
79
78
|
this.selectedRegion = selected || null
|
|
80
79
|
}
|
|
81
80
|
|
|
82
|
-
@action
|
|
83
|
-
setOverallOrder(config) {
|
|
84
|
-
this.config = config || {}
|
|
85
|
-
}
|
|
86
|
-
|
|
87
81
|
@action
|
|
88
82
|
computedData(dataKey, table, end, currentRemainTableHeight) {
|
|
89
83
|
/** 当前数据 */
|
|
@@ -153,13 +147,9 @@ class PrinterStore {
|
|
|
153
147
|
tableCount++
|
|
154
148
|
// 表格原始的高度和宽度信息
|
|
155
149
|
const table = this.tablesInfo[`contents.table.${index}`]
|
|
156
|
-
const { subtotal, dataKey, summaryConfig
|
|
150
|
+
const { subtotal, dataKey, summaryConfig } = content
|
|
157
151
|
// 如果显示每页合计,那么table高度多预留一行高度
|
|
158
152
|
const subtotalTrHeight = subtotal.show ? getSumTrHeight(subtotal) : 0
|
|
159
|
-
// 如果显示整单合计,那么table高度多预留一行高度
|
|
160
|
-
const overallOrderTrHeight = overallOrder?.show
|
|
161
|
-
? getOverallOrderTrHeight(overallOrder)
|
|
162
|
-
: 0
|
|
163
153
|
// 如果每页合计(新的),那么table高度多预留一行高度
|
|
164
154
|
const pageSummaryTrHeight =
|
|
165
155
|
summaryConfig?.pageSummaryShow && !isMultiTable(dataKey) // 双栏table没有每页合计
|
|
@@ -167,10 +157,7 @@ class PrinterStore {
|
|
|
167
157
|
: 0
|
|
168
158
|
// 每个表格都具有的高度
|
|
169
159
|
const allTableHaveThisHeight =
|
|
170
|
-
table.head.height +
|
|
171
|
-
subtotalTrHeight +
|
|
172
|
-
pageSummaryTrHeight +
|
|
173
|
-
overallOrderTrHeight
|
|
160
|
+
table.head.height + subtotalTrHeight + pageSummaryTrHeight
|
|
174
161
|
/** 当前page页面的最小高度 */
|
|
175
162
|
const currentPageMinimumHeight =
|
|
176
163
|
allPagesHaveThisHeight + allTableHaveThisHeight
|
package/src/printer/style.lesss
CHANGED
package/src/printer/table.js
CHANGED
|
@@ -16,7 +16,6 @@ import { MULTI_SUFFIX } from '../config'
|
|
|
16
16
|
import SpecialTr from './table_special_tr'
|
|
17
17
|
import SubtotalTr from './table_subtotal_tr'
|
|
18
18
|
import PageSummary from './page_summary'
|
|
19
|
-
import OverallOrder from './table_overallOrder_tr'
|
|
20
19
|
|
|
21
20
|
@inject('printerStore')
|
|
22
21
|
@observer
|
|
@@ -291,11 +290,6 @@ class Table extends React.Component {
|
|
|
291
290
|
{this.props.config.subtotal.isCommutationPlace
|
|
292
291
|
? PageSummarySubtotalTr()
|
|
293
292
|
: subtotalTrPageSummary()}
|
|
294
|
-
<OverallOrder
|
|
295
|
-
range={range}
|
|
296
|
-
config={config}
|
|
297
|
-
printerStore={printerStore}
|
|
298
|
-
/>
|
|
299
293
|
</tbody>
|
|
300
294
|
</table>
|
|
301
295
|
)
|
|
@@ -2,7 +2,7 @@ import React from 'react'
|
|
|
2
2
|
import i18next from '../../locales'
|
|
3
3
|
import PropTypes from 'prop-types'
|
|
4
4
|
import _ from 'lodash'
|
|
5
|
-
import { MULTI_SUFFIX } from '../config'
|
|
5
|
+
import { MULTI_SUFFIX, MULTI_SUFFIX3 } from '../config'
|
|
6
6
|
import Big from 'big.js'
|
|
7
7
|
import { coverDigit2Uppercase, getDataKey } from '../util'
|
|
8
8
|
import { observer } from 'mobx-react'
|
|
@@ -36,6 +36,7 @@ const SubtotalTr = props => {
|
|
|
36
36
|
printerStore,
|
|
37
37
|
isSomeSubtotalTr
|
|
38
38
|
} = props
|
|
39
|
+
|
|
39
40
|
const tableData = printerStore.data._table[getDataKey(dataKey, arrange)] || []
|
|
40
41
|
// 计算合计
|
|
41
42
|
const sumData = (list, field) => {
|
|
@@ -46,11 +47,15 @@ const SubtotalTr = props => {
|
|
|
46
47
|
|
|
47
48
|
const _origin = b._origin || {}
|
|
48
49
|
const _origin2 = b['_origin' + MULTI_SUFFIX] || {}
|
|
50
|
+
const _origin3 = b['_origin' + MULTI_SUFFIX3] || {}
|
|
49
51
|
|
|
50
52
|
result = a.plus(_origin[field] || 0)
|
|
51
53
|
if (_origin2[field]) {
|
|
52
54
|
result = result.plus(_origin2[field])
|
|
53
55
|
}
|
|
56
|
+
if (_origin3[field]) {
|
|
57
|
+
result = result.plus(_origin3[field])
|
|
58
|
+
}
|
|
54
59
|
return result
|
|
55
60
|
},
|
|
56
61
|
Big(0)
|
package/src/util.js
CHANGED
|
@@ -108,14 +108,6 @@ function getSumTrHeight(SumTr) {
|
|
|
108
108
|
return (parseInt(fontSize) - 12) * 1.5 + 26
|
|
109
109
|
}
|
|
110
110
|
|
|
111
|
-
function getOverallOrderTrHeight(overallOrder) {
|
|
112
|
-
const { fields = [] } = overallOrder
|
|
113
|
-
const fontSize = fields?.[0]?.style?.fontSize || '12px'
|
|
114
|
-
|
|
115
|
-
// 12px => 26, 14px => 29, 16px => 33, ...
|
|
116
|
-
return (parseInt(fontSize) - 12) * 1.5 + 26
|
|
117
|
-
}
|
|
118
|
-
|
|
119
111
|
// eslint-disable-next-line
|
|
120
112
|
const coverDigit2Uppercase = n => {
|
|
121
113
|
if (_.isNil(n) || _.isNaN(n)) {
|
|
@@ -282,17 +274,6 @@ const getArrayMid = arr => {
|
|
|
282
274
|
return majority
|
|
283
275
|
}
|
|
284
276
|
|
|
285
|
-
/**
|
|
286
|
-
* 获取整单合计colSpan合并的个数
|
|
287
|
-
* @param {*} table
|
|
288
|
-
* @returns number
|
|
289
|
-
*/
|
|
290
|
-
const getColSpanLength = table => {
|
|
291
|
-
return /multi/.test(table.dataKey)
|
|
292
|
-
? getMultiNumber(table.dataKey) * table.columns.length
|
|
293
|
-
: table.columns.length
|
|
294
|
-
}
|
|
295
|
-
|
|
296
277
|
export {
|
|
297
278
|
getHeight,
|
|
298
279
|
getWidth,
|
|
@@ -310,7 +291,5 @@ export {
|
|
|
310
291
|
isMultiTable,
|
|
311
292
|
getMultiNumber,
|
|
312
293
|
caclSingleDetailsPageHeight,
|
|
313
|
-
getArrayMid
|
|
314
|
-
getColSpanLength,
|
|
315
|
-
getOverallOrderTrHeight
|
|
294
|
+
getArrayMid
|
|
316
295
|
}
|
|
@@ -1,63 +0,0 @@
|
|
|
1
|
-
import React from 'react'
|
|
2
|
-
import PropTypes from 'prop-types'
|
|
3
|
-
import _ from 'lodash'
|
|
4
|
-
// import Big from 'big.js'
|
|
5
|
-
import { coverDigit2Uppercase } from '../util'
|
|
6
|
-
import { observer } from 'mobx-react'
|
|
7
|
-
import { Flex } from '../components'
|
|
8
|
-
|
|
9
|
-
const OverallOrder = props => {
|
|
10
|
-
const {
|
|
11
|
-
config: { overallOrder },
|
|
12
|
-
// range,
|
|
13
|
-
printerStore,
|
|
14
|
-
printerStore: {
|
|
15
|
-
data: { common }
|
|
16
|
-
}
|
|
17
|
-
} = props
|
|
18
|
-
|
|
19
|
-
return (
|
|
20
|
-
overallOrder?.show &&
|
|
21
|
-
printerStore?.ready && (
|
|
22
|
-
<tr>
|
|
23
|
-
{_.map(overallOrder.fields, (item, index) => {
|
|
24
|
-
return (
|
|
25
|
-
<td colSpan={item.colSpan} key={index}>
|
|
26
|
-
<Flex style={{ ...item.style, display: 'flex' }}>
|
|
27
|
-
{item.name}
|
|
28
|
-
<Flex
|
|
29
|
-
justifyBetween={overallOrder?.isUpperLowerCaseSeparate}
|
|
30
|
-
flexGrow={overallOrder?.isUpperLowerCaseSeparate}
|
|
31
|
-
>
|
|
32
|
-
<span
|
|
33
|
-
className={
|
|
34
|
-
overallOrder?.isUpperCaseBefore
|
|
35
|
-
? 'gm-printer-subtotal-isUpperCaseBefore-inter'
|
|
36
|
-
: ''
|
|
37
|
-
}
|
|
38
|
-
>
|
|
39
|
-
{common?.[item.valueField] ?? ''}
|
|
40
|
-
</span>
|
|
41
|
-
{overallOrder?.needUpperCase && (
|
|
42
|
-
<span>
|
|
43
|
-
{common?.[item.valueField]
|
|
44
|
-
? coverDigit2Uppercase(common[item.valueField])
|
|
45
|
-
: ''}
|
|
46
|
-
</span>
|
|
47
|
-
)}
|
|
48
|
-
</Flex>
|
|
49
|
-
</Flex>
|
|
50
|
-
</td>
|
|
51
|
-
)
|
|
52
|
-
})}
|
|
53
|
-
</tr>
|
|
54
|
-
)
|
|
55
|
-
)
|
|
56
|
-
}
|
|
57
|
-
OverallOrder.propTypes = {
|
|
58
|
-
config: PropTypes.object.isRequired,
|
|
59
|
-
range: PropTypes.object.isRequired,
|
|
60
|
-
printerStore: PropTypes.object
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
export default observer(OverallOrder)
|