gm-printer 10.15.9-beta.0 → 10.16.0-beta.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 +2 -2
- package/src/common/component.js +17 -7
- package/src/common/editor_add_field.js +1 -0
- package/src/common/editor_edit_field.js +120 -6
- package/src/common/editor_store.js +313 -19
- package/src/common/util.js +6 -1
- package/src/editor/context_menu.js +17 -1
- package/src/editor/editor.js +3 -3
- package/src/editor_account/editor.js +3 -3
- package/src/editor_salemenus/editor.js +3 -3
- package/src/printer/store.js +2 -2
- package/src/printer/table.js +7 -0
- package/src/printer/table_diy_overallOrder_tr.js +83 -0
- package/src/printer/table_subtotal_tr.js +15 -3
- package/yarn-error.log +0 -9663
package/.eslintcache
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
[{"/Users/ganmeng/Documents/GM-项目/gm-printer/src/printer/store.js":"1","/Users/ganmeng/Documents/GM-项目/gm-printer/src/editor/context_menu.js":"2","/Users/ganmeng/Documents/GM-项目/gm-printer/src/common/editor_store.js":"3","/Users/ganmeng/Documents/GM-项目/gm-printer/src/common/editor_customize_config.js":"4","/Users/ganmeng/Documents/GM-项目/gm-printer2/src/editor/context_menu.js":"5"},{"size":18202,"mtime":1653550658475,"results":"6","hashOfConfig":"7"},{"size":5189,"mtime":1653550658475,"results":"8","hashOfConfig":"7"},{"size":36126,"mtime":1653550658474,"results":"9","hashOfConfig":"7"},{"size":1578,"mtime":1653550658473,"results":"10","hashOfConfig":"7"},{"size":5160,"mtime":1654484017653,"results":"11","hashOfConfig":"12"},{"filePath":"13","messages":"14","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"cvcgct",{"filePath":"15","messages":"16","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"17","messages":"18","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"19","messages":"20","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"21","messages":"22","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"8681vq","/Users/ganmeng/Documents/GM-项目/gm-printer/src/printer/store.js",[],"/Users/ganmeng/Documents/GM-项目/gm-printer/src/editor/context_menu.js",[],"/Users/ganmeng/Documents/GM-项目/gm-printer/src/common/editor_store.js",[],"/Users/ganmeng/Documents/GM-项目/gm-printer/src/common/editor_customize_config.js",[],"/Users/ganmeng/Documents/GM-项目/gm-printer2/src/editor/context_menu.js",[]]
|
|
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","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table_overallOrder_tr.js":"46","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/util.js":"47","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_add_field.js":"48","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/counter.js":"49","/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/common_context_menu.js":"50","/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table_diy_overallOrder_tr.js":"51"},{"size":7813,"mtime":1648799098282,"results":"52","hashOfConfig":"53"},{"size":291,"mtime":1638935573926,"results":"54","hashOfConfig":"55"},{"size":523,"mtime":1638935549030,"results":"56","hashOfConfig":"55"},{"size":1139,"mtime":1644572548725,"results":"57","hashOfConfig":"58"},{"size":2293,"mtime":1638948548042,"results":"59","hashOfConfig":"55"},{"size":2292,"mtime":1638948522492,"results":"60","hashOfConfig":"55"},{"size":1078,"mtime":1638948543271,"results":"61","hashOfConfig":"55"},{"size":2067,"mtime":1648466228565,"results":"62","hashOfConfig":"53"},{"size":2991,"mtime":1638948535719,"results":"63","hashOfConfig":"55"},{"size":4379,"mtime":1638935458586,"results":"64","hashOfConfig":"55"},{"size":2428,"mtime":1648466380496,"results":"65","hashOfConfig":"53"},{"size":2955,"mtime":1647850650993,"results":"66","hashOfConfig":"58"},{"size":5660,"mtime":1695026529575,"results":"67","hashOfConfig":"68"},{"size":2833,"mtime":1638861837310,"results":"69","hashOfConfig":"55"},{"size":4212,"mtime":1638935746667,"results":"70","hashOfConfig":"55"},{"size":861,"mtime":1638931446915,"results":"71","hashOfConfig":"55"},{"size":178,"mtime":1638931439249,"results":"72","hashOfConfig":"55"},{"size":3272,"mtime":1648713847909,"results":"73","hashOfConfig":"53"},{"size":46636,"mtime":1695028084459,"results":"74","hashOfConfig":"68"},{"size":4898,"mtime":1639992402586,"results":"75","hashOfConfig":"55"},{"size":21854,"mtime":1695028069713,"results":"76","hashOfConfig":"68"},{"size":15155,"mtime":1657626470824,"results":"77","hashOfConfig":"78"},{"size":2165,"mtime":1638949854481,"results":"79","hashOfConfig":"55"},{"size":2165,"mtime":1638949840121,"results":"80","hashOfConfig":"55"},{"size":2223,"mtime":1638949823846,"results":"81","hashOfConfig":"55"},{"size":2356,"mtime":1650083974574,"results":"82","hashOfConfig":"53"},{"size":3367,"mtime":1638949855771,"results":"83","hashOfConfig":"55"},{"size":2305,"mtime":1638949843817,"results":"84","hashOfConfig":"55"},{"size":3294,"mtime":1638949855131,"results":"85","hashOfConfig":"55"},{"size":2850,"mtime":1638949842017,"results":"86","hashOfConfig":"55"},{"size":4157,"mtime":1638949853726,"results":"87","hashOfConfig":"55"},{"size":605,"mtime":1638949882777,"results":"88","hashOfConfig":"55"},{"size":1175,"mtime":1638949720500,"results":"89","hashOfConfig":"55"},{"size":18215,"mtime":1670988134370,"results":"90","hashOfConfig":"78"},{"size":332,"mtime":1644573509040,"results":"91","hashOfConfig":"58"},{"size":4080,"mtime":1648536160221,"results":"92","hashOfConfig":"53"},{"size":8842,"mtime":1646363892377,"results":"93","hashOfConfig":"58"},{"size":4317,"mtime":1646376602197,"results":"94","hashOfConfig":"58"},{"size":9440,"mtime":1644993553716,"results":"95","hashOfConfig":"58"},{"size":724,"mtime":1644808940649,"results":"96","hashOfConfig":"58"},{"size":1717,"mtime":1648466368772,"results":"97","hashOfConfig":"53"},{"size":5563,"mtime":1658392065200,"results":"98","hashOfConfig":"78"},{"size":10376,"mtime":1695025236432,"results":"99","hashOfConfig":"68"},{"size":9001,"mtime":1648713828033,"results":"100","hashOfConfig":"53"},{"size":3152,"mtime":1648713745966},{"size":1901,"mtime":1650082399244,"results":"101","hashOfConfig":"53"},{"size":600,"mtime":1657507507231,"results":"102","hashOfConfig":"78"},{"size":1945,"mtime":1657624830918,"results":"103","hashOfConfig":"78"},{"size":2009,"mtime":1659343100368,"results":"104","hashOfConfig":"78"},{"size":9861,"mtime":1659343100367,"results":"105","hashOfConfig":"78"},{"size":2513,"mtime":1695028123275,"results":"106","hashOfConfig":"68"},{"filePath":"107","messages":"108","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1h9xfdh",{"filePath":"109","messages":"110","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"jpc0be",{"filePath":"111","messages":"112","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"113","messages":"114","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1qaimc",{"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":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},"yfiwrq",{"filePath":"133","messages":"134","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"135","messages":"136","errorCount":2,"warningCount":0,"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":1,"warningCount":4,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"149","messages":"150","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"su5mnm",{"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":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},{"filePath":"181","messages":"182","errorCount":1,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"183","messages":"184","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"185","messages":"186","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"187","messages":"188","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"189","messages":"190","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"191","messages":"192","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"193","messages":"194","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"195","messages":"196","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"197","messages":"198","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"199","messages":"200","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"201","messages":"202","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"203","messages":"204","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"205","messages":"206","errorCount":1,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"/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",["207","208"],"/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",["209","210","211","212","213"],"/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",["214"],"/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",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/util.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/editor_add_field.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/counter.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/common/common_context_menu.js",[],"/Users/min/Documents/GMFE/gm-util/gm-printer/src/printer/table_diy_overallOrder_tr.js",["215"],{"ruleId":"216","severity":2,"message":"217","line":10,"column":29,"nodeType":"218","endLine":10,"endColumn":35},{"ruleId":"216","severity":2,"message":"219","line":145,"column":63,"nodeType":"218","endLine":145,"endColumn":71},{"ruleId":"220","severity":1,"message":"221","line":344,"column":13,"nodeType":"222","endLine":344,"endColumn":49},{"ruleId":"220","severity":1,"message":"221","line":362,"column":13,"nodeType":"222","endLine":362,"endColumn":56},{"ruleId":"220","severity":1,"message":"221","line":519,"column":15,"nodeType":"222","endLine":519,"endColumn":53},{"ruleId":"220","severity":1,"message":"221","line":568,"column":11,"nodeType":"222","endLine":568,"endColumn":53},{"ruleId":"223","severity":2,"message":"224","line":669,"column":22,"nodeType":"225","messageId":"226","endLine":669,"endColumn":31},{"ruleId":"223","severity":2,"message":"224","line":120,"column":14,"nodeType":"225","messageId":"226","endLine":120,"endColumn":23},{"ruleId":"227","severity":2,"message":"228","line":13,"column":5,"nodeType":"218","endLine":13,"endColumn":11},"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","no-unused-vars","'config' is assigned a value but never used."]
|
package/package.json
CHANGED
package/src/common/component.js
CHANGED
|
@@ -643,16 +643,26 @@ Gap.propTypes = {
|
|
|
643
643
|
height: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
|
|
644
644
|
}
|
|
645
645
|
|
|
646
|
-
const FieldBtn = ({ name, onClick }) => (
|
|
647
|
-
|
|
648
|
-
<
|
|
649
|
-
|
|
650
|
-
|
|
651
|
-
|
|
652
|
-
|
|
646
|
+
const FieldBtn = ({ name, remark, onClick }) => (
|
|
647
|
+
<>
|
|
648
|
+
<Flex alignCenter={!remark} style={{ width: '50%', margin: '3px 0' }}>
|
|
649
|
+
<span className='gm-printer-edit-plus-btn' onClick={onClick}>
|
|
650
|
+
+
|
|
651
|
+
</span>
|
|
652
|
+
<Flex column>
|
|
653
|
+
<span className='gm-padding-left-5'>{name}</span>
|
|
654
|
+
{remark && (
|
|
655
|
+
<span style={{ transform: 'scale(0.8) translateX(-20px)' }}>
|
|
656
|
+
{remark}
|
|
657
|
+
</span>
|
|
658
|
+
)}
|
|
659
|
+
</Flex>
|
|
660
|
+
</Flex>
|
|
661
|
+
</>
|
|
653
662
|
)
|
|
654
663
|
FieldBtn.propTypes = {
|
|
655
664
|
name: PropTypes.string,
|
|
665
|
+
remark: PropTypes.string,
|
|
656
666
|
onClick: PropTypes.func
|
|
657
667
|
}
|
|
658
668
|
|
|
@@ -20,6 +20,7 @@ import {
|
|
|
20
20
|
import { get, toJS } from 'mobx'
|
|
21
21
|
import PropTypes from 'prop-types'
|
|
22
22
|
import { subtotalRadioList } from './util'
|
|
23
|
+
import _ from 'lodash'
|
|
23
24
|
|
|
24
25
|
@inject('editStore')
|
|
25
26
|
@observer
|
|
@@ -81,6 +82,11 @@ class EditorField extends React.Component {
|
|
|
81
82
|
editStore.setOverallOrderStyle(value)
|
|
82
83
|
}
|
|
83
84
|
|
|
85
|
+
handleDiyOverallOrderStyleChange = value => {
|
|
86
|
+
const { editStore } = this.props
|
|
87
|
+
editStore.setDiyOverallOrderStyle(value)
|
|
88
|
+
}
|
|
89
|
+
|
|
84
90
|
renderBlocks() {
|
|
85
91
|
const { editStore, showNewDate } = this.props
|
|
86
92
|
const { type, text, style, link } = editStore.computedSelectedInfo
|
|
@@ -192,7 +198,8 @@ class EditorField extends React.Component {
|
|
|
192
198
|
const {
|
|
193
199
|
specialConfig,
|
|
194
200
|
subtotal,
|
|
195
|
-
overallOrder
|
|
201
|
+
overallOrder,
|
|
202
|
+
diyOverallOrder
|
|
196
203
|
} = editStore.computedTableSpecialConfig
|
|
197
204
|
|
|
198
205
|
// 小计样式,specialConfig可能是undefined
|
|
@@ -226,6 +233,13 @@ class EditorField extends React.Component {
|
|
|
226
233
|
(editStore.computedTableSpecialConfig?.subtotal &&
|
|
227
234
|
get(subtotal, 'isCustomCells')) ||
|
|
228
235
|
false
|
|
236
|
+
|
|
237
|
+
// 打印账户总计金额
|
|
238
|
+
const printAccount =
|
|
239
|
+
(editStore.computedTableSpecialConfig?.subtotal &&
|
|
240
|
+
get(subtotal, 'isPrintAccount')) ||
|
|
241
|
+
false
|
|
242
|
+
|
|
229
243
|
// 整单合计是否大写
|
|
230
244
|
const overallOrderNeedUpperCase =
|
|
231
245
|
(editStore.computedTableSpecialConfig?.overallOrder &&
|
|
@@ -246,7 +260,30 @@ class EditorField extends React.Component {
|
|
|
246
260
|
(editStore.computedTableSpecialConfig?.overallOrder &&
|
|
247
261
|
get(overallOrder, 'isCustomCells')) ||
|
|
248
262
|
false
|
|
263
|
+
// 自定义整单合计样式
|
|
264
|
+
const diyOverallOrderStyle =
|
|
265
|
+
(diyOverallOrder && diyOverallOrder?.fields[0].style) || {}
|
|
266
|
+
|
|
267
|
+
// 自定义整单合计是否大写
|
|
268
|
+
const diyOverallOrderNeedUpperCase =
|
|
269
|
+
(editStore.computedTableSpecialConfig?.diyOverallOrder &&
|
|
270
|
+
get(diyOverallOrder, 'needUpperCase')) ||
|
|
271
|
+
false
|
|
272
|
+
// 自定义整单合计大写的金额是否在前
|
|
273
|
+
const diyOverallOrderCaseBefore =
|
|
274
|
+
(editStore.computedTableSpecialConfig?.diyOverallOrder &&
|
|
275
|
+
get(diyOverallOrder, 'isUpperCaseBefore')) ||
|
|
276
|
+
false
|
|
277
|
+
// 自定义整单合计大写和小写的金额是否分开
|
|
278
|
+
const diyOverallOrderUpperLowerCaseSeparate =
|
|
279
|
+
(editStore.computedTableSpecialConfig?.diyOverallOrder &&
|
|
280
|
+
get(diyOverallOrder, 'isUpperLowerCaseSeparate')) ||
|
|
281
|
+
false
|
|
282
|
+
// 自定义整单合计内容
|
|
249
283
|
|
|
284
|
+
const diyOverallOrderValueField =
|
|
285
|
+
editStore.computedTableSpecialConfig?.diyOverallOrder?.fields?.[0]
|
|
286
|
+
.valueField
|
|
250
287
|
return (
|
|
251
288
|
<div>
|
|
252
289
|
<Title title={i18next.t('编辑字段')} />
|
|
@@ -433,7 +470,15 @@ class EditorField extends React.Component {
|
|
|
433
470
|
</Flex>
|
|
434
471
|
</div>
|
|
435
472
|
)}
|
|
436
|
-
|
|
473
|
+
{/* 结款单不需要这个配置 */}
|
|
474
|
+
{!isSomeSubtotalTr && (
|
|
475
|
+
<EditorSubtotalCheck
|
|
476
|
+
subtotalCheckDisabled
|
|
477
|
+
subtotalChecked={printAccount}
|
|
478
|
+
subtotalCheckOnChange={editStore.setPrintAccount}
|
|
479
|
+
subtotalCheckText='打印账户总计金额'
|
|
480
|
+
/>
|
|
481
|
+
)}
|
|
437
482
|
<EditorSubtotalCheck
|
|
438
483
|
subtotalCheckDisabled
|
|
439
484
|
subtotalChecked={subtotalNeedUpperCase}
|
|
@@ -464,8 +509,12 @@ class EditorField extends React.Component {
|
|
|
464
509
|
subtotalCheckText='开启自定义单元格'
|
|
465
510
|
/>
|
|
466
511
|
<Text
|
|
512
|
+
// 只有自定义单元格的valueField值是空的,以后自每页合计,记得加type,之前没加,都无法区分
|
|
467
513
|
value={
|
|
468
|
-
subtotal && subtotal?.fields?.
|
|
514
|
+
subtotal && subtotal?.fields?.length > 1
|
|
515
|
+
? _.find(subtotal?.fields, item => !item.valueField)?.name ??
|
|
516
|
+
''
|
|
517
|
+
: ''
|
|
469
518
|
}
|
|
470
519
|
onChange={editStore.setSubtotalFields}
|
|
471
520
|
style={{ width: '65px', margin: '5px 0 5px 80px' }}
|
|
@@ -519,6 +568,64 @@ class EditorField extends React.Component {
|
|
|
519
568
|
onChange={editStore.setOverallOrderFields}
|
|
520
569
|
style={{ width: '65px', margin: '5px 0 5px 80px' }}
|
|
521
570
|
/>
|
|
571
|
+
{/* 自定义整单合计 */}
|
|
572
|
+
<Flex>
|
|
573
|
+
<Flex>{i18next.t('自定义整单合计')}:</Flex>
|
|
574
|
+
<div>
|
|
575
|
+
<Fonter
|
|
576
|
+
style={diyOverallOrderStyle}
|
|
577
|
+
onChange={this.handleOverallOrderStyleChange}
|
|
578
|
+
/>
|
|
579
|
+
<Separator />
|
|
580
|
+
<TextAlign
|
|
581
|
+
style={overallOrderStyle}
|
|
582
|
+
onChange={this.handleOverallOrderStyleChange}
|
|
583
|
+
/>
|
|
584
|
+
<EditorSubtotalCheck
|
|
585
|
+
subtotalCheckDisabled
|
|
586
|
+
subtotalChecked={diyOverallOrderNeedUpperCase}
|
|
587
|
+
subtotalCheckOnChange={editStore.setDiyOverallOrderUpperCase}
|
|
588
|
+
subtotalCheckText='显示大写金额'
|
|
589
|
+
marginLeft
|
|
590
|
+
/>
|
|
591
|
+
<EditorSubtotalCheck
|
|
592
|
+
subtotalCheckDisabled={diyOverallOrderNeedUpperCase}
|
|
593
|
+
subtotalChecked={diyOverallOrderCaseBefore}
|
|
594
|
+
subtotalCheckOnChange={
|
|
595
|
+
editStore.setDiyOverallOrderUpperCaseBefore
|
|
596
|
+
}
|
|
597
|
+
subtotalCheckText='大写金额在前'
|
|
598
|
+
marginLeft
|
|
599
|
+
/>
|
|
600
|
+
<EditorSubtotalCheck
|
|
601
|
+
subtotalCheckDisabled={diyOverallOrderNeedUpperCase}
|
|
602
|
+
subtotalChecked={diyOverallOrderUpperLowerCaseSeparate}
|
|
603
|
+
subtotalCheckOnChange={
|
|
604
|
+
editStore.setDiyOverallOrderUpperLowerCaseSeparate
|
|
605
|
+
}
|
|
606
|
+
subtotalCheckText='大、小写金额分左右两边展示'
|
|
607
|
+
marginLeft
|
|
608
|
+
/>
|
|
609
|
+
<Flex>
|
|
610
|
+
<Flex alignCenter>文案修改:</Flex>
|
|
611
|
+
<Text
|
|
612
|
+
value={
|
|
613
|
+
diyOverallOrder && diyOverallOrder?.fields?.[0]
|
|
614
|
+
? diyOverallOrder.fields[0].name
|
|
615
|
+
: ''
|
|
616
|
+
}
|
|
617
|
+
onChange={editStore.setDiyOverallOrderFields}
|
|
618
|
+
style={{ width: '100px', margin: '5px 0 5px 0px' }}
|
|
619
|
+
/>
|
|
620
|
+
</Flex>
|
|
621
|
+
<Textarea
|
|
622
|
+
value={diyOverallOrderValueField}
|
|
623
|
+
placeholder={i18next.t('请输入要整单合计字段')}
|
|
624
|
+
onChange={value => editStore.setDiyOverallOrderValueField(value)}
|
|
625
|
+
/>
|
|
626
|
+
<TipInfo text={i18next.t('不支持双栏和三栏模式')} />
|
|
627
|
+
</div>
|
|
628
|
+
</Flex>
|
|
522
629
|
</div>
|
|
523
630
|
)
|
|
524
631
|
}
|
|
@@ -552,11 +659,17 @@ class EditorSubtotalCheck extends React.Component {
|
|
|
552
659
|
subtotalCheckDisabled,
|
|
553
660
|
subtotalChecked,
|
|
554
661
|
subtotalCheckOnChange,
|
|
555
|
-
subtotalCheckText
|
|
662
|
+
subtotalCheckText,
|
|
663
|
+
marginLeft
|
|
556
664
|
} = this.props
|
|
557
665
|
|
|
558
666
|
return (
|
|
559
|
-
<Flex
|
|
667
|
+
<Flex
|
|
668
|
+
style={{
|
|
669
|
+
margin: '5px 0 5px 62px',
|
|
670
|
+
marginLeft: marginLeft ? '0' : '62px'
|
|
671
|
+
}}
|
|
672
|
+
>
|
|
560
673
|
<Flex alignCenter>
|
|
561
674
|
<input
|
|
562
675
|
type='checkbox'
|
|
@@ -575,7 +688,8 @@ EditorSubtotalCheck.propTypes = {
|
|
|
575
688
|
subtotalCheckDisabled: PropTypes.bool,
|
|
576
689
|
subtotalChecked: PropTypes.bool,
|
|
577
690
|
subtotalCheckOnChange: PropTypes.func,
|
|
578
|
-
subtotalCheckText: PropTypes.string
|
|
691
|
+
subtotalCheckText: PropTypes.string,
|
|
692
|
+
marginLeft: PropTypes.string
|
|
579
693
|
}
|
|
580
694
|
|
|
581
695
|
export default EditorField
|