gm-printer 10.15.9-beta.0 → 10.16.0-beta.1

package/.eslintcache

@@ -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",[]]
+[{"/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

@@ -1,6 +1,6 @@
 {
   "name": "gm-printer",
-  "version": "10.15.9-beta.0",
+  "version": "10.16.0-beta.1",
   "description": "diy printer",
   "main": "src/index.js",
   "scripts": {
@@ -112,4 +112,4 @@
   "dependencies": {
     "qrcode.react": "^0.9.2"
   }
-}
+}

package/src/common/component.js

@@ -643,16 +643,26 @@ Gap.propTypes = {
   height: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
 }
 
-const FieldBtn = ({ name, onClick }) => (
-  <Flex alignCenter style={{ width: '50%', margin: '3px 0' }}>
-    <span className='gm-printer-edit-plus-btn' onClick={onClick}>
-      +
-    </span>
-    <span className='gm-padding-left-5'>{name}</span>
-  </Flex>
+const FieldBtn = ({ name, remark, onClick }) => (
+  <>
+    <Flex alignCenter={!remark} style={{ width: '50%', margin: '3px 0' }}>
+      <span className='gm-printer-edit-plus-btn' onClick={onClick}>
+        +
+      </span>
+      <Flex column>
+        <span className='gm-padding-left-5'>{name}</span>
+        {remark && (
+          <span style={{ transform: 'scale(0.8) translateX(-20px)' }}>
+            {remark}
+          </span>
+        )}
+      </Flex>
+    </Flex>
+  </>
 )
 FieldBtn.propTypes = {
   name: PropTypes.string,
+  remark: PropTypes.string,
   onClick: PropTypes.func
 }
 

package/src/common/editor_add_field.js

@@ -22,6 +22,7 @@ class FieldList extends React.Component {
                   <FieldBtn
                     key={o.key}
                     name={o.key}
+                    remark={o.remark}
                     onClick={handleAddField.bind(this, o)}
                   />
                 ))}

package/src/common/editor_edit_field.js

@@ -20,6 +20,7 @@ import {
 import { get, toJS } from 'mobx'
 import PropTypes from 'prop-types'
 import { subtotalRadioList } from './util'
+import _ from 'lodash'
 
 @inject('editStore')
 @observer
@@ -81,6 +82,11 @@ class EditorField extends React.Component {
     editStore.setOverallOrderStyle(value)
   }
 
+  handleDiyOverallOrderStyleChange = value => {
+    const { editStore } = this.props
+    editStore.setDiyOverallOrderStyle(value)
+  }
+
   renderBlocks() {
     const { editStore, showNewDate } = this.props
     const { type, text, style, link } = editStore.computedSelectedInfo
@@ -192,7 +198,8 @@ class EditorField extends React.Component {
     const {
       specialConfig,
       subtotal,
-      overallOrder
+      overallOrder,
+      diyOverallOrder
     } = editStore.computedTableSpecialConfig
 
     // 小计样式,specialConfig可能是undefined
@@ -226,6 +233,13 @@ class EditorField extends React.Component {
       (editStore.computedTableSpecialConfig?.subtotal &&
         get(subtotal, 'isCustomCells')) ||
       false
+
+    // 打印账户总计金额
+    const printAccount =
+      (editStore.computedTableSpecialConfig?.subtotal &&
+        get(subtotal, 'isPrintAccount')) ||
+      false
+
     //  整单合计是否大写
     const overallOrderNeedUpperCase =
       (editStore.computedTableSpecialConfig?.overallOrder &&
@@ -246,7 +260,30 @@ class EditorField extends React.Component {
       (editStore.computedTableSpecialConfig?.overallOrder &&
         get(overallOrder, 'isCustomCells')) ||
       false
+    // 自定义整单合计样式
+    const diyOverallOrderStyle =
+      (diyOverallOrder && diyOverallOrder?.fields[0].style) || {}
+
+    //  自定义整单合计是否大写
+    const diyOverallOrderNeedUpperCase =
+      (editStore.computedTableSpecialConfig?.diyOverallOrder &&
+        get(diyOverallOrder, 'needUpperCase')) ||
+      false
+    // 自定义整单合计大写的金额是否在前
+    const diyOverallOrderCaseBefore =
+      (editStore.computedTableSpecialConfig?.diyOverallOrder &&
+        get(diyOverallOrder, 'isUpperCaseBefore')) ||
+      false
+    // 自定义整单合计大写和小写的金额是否分开
+    const diyOverallOrderUpperLowerCaseSeparate =
+      (editStore.computedTableSpecialConfig?.diyOverallOrder &&
+        get(diyOverallOrder, 'isUpperLowerCaseSeparate')) ||
+      false
+    // 自定义整单合计内容
 
+    const diyOverallOrderValueField =
+      editStore.computedTableSpecialConfig?.diyOverallOrder?.fields?.[0]
+        .valueField
     return (
       <div>
         <Title title={i18next.t('编辑字段')} />
@@ -433,7 +470,15 @@ class EditorField extends React.Component {
             </Flex>
           </div>
         )}
-
+        {/* 结款单不需要这个配置 */}
+        {!isSomeSubtotalTr && (
+          <EditorSubtotalCheck
+            subtotalCheckDisabled
+            subtotalChecked={printAccount}
+            subtotalCheckOnChange={editStore.setPrintAccount}
+            subtotalCheckText='打印账户总计金额'
+          />
+        )}
         <EditorSubtotalCheck
           subtotalCheckDisabled
           subtotalChecked={subtotalNeedUpperCase}
@@ -464,8 +509,12 @@ class EditorField extends React.Component {
               subtotalCheckText='开启自定义单元格'
             />
             <Text
+              // 只有自定义单元格的valueField值是空的，以后自每页合计，记得加type，之前没加，都无法区分
               value={
-                subtotal && subtotal?.fields?.[1] ? subtotal.fields[1].name : ''
+                subtotal && subtotal?.fields?.length > 1
+                  ? _.find(subtotal?.fields, item => !item.valueField)?.name ??
+                    ''
+                  : ''
               }
               onChange={editStore.setSubtotalFields}
               style={{ width: '65px', margin: '5px 0 5px 80px' }}
@@ -519,6 +568,68 @@ class EditorField extends React.Component {
           onChange={editStore.setOverallOrderFields}
           style={{ width: '65px', margin: '5px 0 5px 80px' }}
         />
+        {/* 自定义整单合计 */}
+        {editStore.config.showDiyOverAllOrder && (
+          <Flex>
+            <Flex>{i18next.t('自定义整单合计')}：</Flex>
+            <div>
+              <Fonter
+                style={diyOverallOrderStyle}
+                onChange={this.handleOverallOrderStyleChange}
+              />
+              <Separator />
+              <TextAlign
+                style={overallOrderStyle}
+                onChange={this.handleOverallOrderStyleChange}
+              />
+              <EditorSubtotalCheck
+                subtotalCheckDisabled
+                subtotalChecked={diyOverallOrderNeedUpperCase}
+                subtotalCheckOnChange={editStore.setDiyOverallOrderUpperCase}
+                subtotalCheckText='显示大写金额'
+                marginLeft
+              />
+              <EditorSubtotalCheck
+                subtotalCheckDisabled={diyOverallOrderNeedUpperCase}
+                subtotalChecked={diyOverallOrderCaseBefore}
+                subtotalCheckOnChange={
+                  editStore.setDiyOverallOrderUpperCaseBefore
+                }
+                subtotalCheckText='大写金额在前'
+                marginLeft
+              />
+              <EditorSubtotalCheck
+                subtotalCheckDisabled={diyOverallOrderNeedUpperCase}
+                subtotalChecked={diyOverallOrderUpperLowerCaseSeparate}
+                subtotalCheckOnChange={
+                  editStore.setDiyOverallOrderUpperLowerCaseSeparate
+                }
+                subtotalCheckText='大、小写金额分左右两边展示'
+                marginLeft
+              />
+              <Flex>
+                <Flex alignCenter>文案修改：</Flex>
+                <Text
+                  value={
+                    diyOverallOrder && diyOverallOrder?.fields?.[0]
+                      ? diyOverallOrder.fields[0].name
+                      : ''
+                  }
+                  onChange={editStore.setDiyOverallOrderFields}
+                  style={{ width: '100px', margin: '5px 0 5px 0px' }}
+                />
+              </Flex>
+              <Textarea
+                value={diyOverallOrderValueField}
+                placeholder={i18next.t('请输入要整单合计字段')}
+                onChange={value =>
+                  editStore.setDiyOverallOrderValueField(value)
+                }
+              />
+              <TipInfo text={i18next.t('不支持双栏和三栏模式')} />
+            </div>
+          </Flex>
+        )}
       </div>
     )
   }
@@ -552,11 +663,17 @@ class EditorSubtotalCheck extends React.Component {
       subtotalCheckDisabled,
       subtotalChecked,
       subtotalCheckOnChange,
-      subtotalCheckText
+      subtotalCheckText,
+      marginLeft
     } = this.props
 
     return (
-      <Flex style={{ margin: '5px 0 5px 62px' }}>
+      <Flex
+        style={{
+          margin: '5px 0 5px 62px',
+          marginLeft: marginLeft ? '0' : '62px'
+        }}
+      >
         <Flex alignCenter>
           <input
             type='checkbox'
@@ -575,7 +692,8 @@ EditorSubtotalCheck.propTypes = {
   subtotalCheckDisabled: PropTypes.bool,
   subtotalChecked: PropTypes.bool,
   subtotalCheckOnChange: PropTypes.func,
-  subtotalCheckText: PropTypes.string
+  subtotalCheckText: PropTypes.string,
+  marginLeft: PropTypes.string
 }
 
 export default EditorField

package/src/common/editor_store.js

@@ -3,6 +3,7 @@ import { action, computed, observable, set, toJS } from 'mobx'
 import { pageTypeMap } from '../config'
 import _ from 'lodash'
 import { dispatchMsg, getBlockName, exchange, getColSpanLength } from '../util'
+import { accountRadioList } from './util'
 import React from 'react'
 
 class EditorStore {
@@ -65,6 +66,15 @@ class EditorStore {
     this.isAutoFilling = bol
   }
 
+  @action
+  setSubtotalFieldsCol(arr) {
+    // this.overallOrderShow = !this.overallOrderShow
+    // 重新计算每页合计的单元格
+    const table = this.config.contents[arr[2]]
+    const subtotalLength = table.subtotal.fields.length
+    table.subtotal.fields[subtotalLength - 1].colSpan += 1
+  }
+
   @action
   setMultiDigitDecimal(bool) {
     this.isMultiDigitDecimal = bool
@@ -97,6 +107,15 @@ class EditorStore {
     colSpan: 6 // 产品说3个,开启自定义单元格,客户不满意，改成6个
   }
 
+  // 每页合计打印账户总计金额
+  @observable
+  subtotalAccountConfigFields = {
+    name: '总计金额：',
+    valueField: '下单金额',
+    colSpan: 3,
+    type: 'useSummarize'
+  }
+
   @computed
   get computedPrinterKey() {
     return _.map(this.config, (v, k) => {
@@ -575,8 +594,11 @@ class EditorStore {
         ]
       })
     } else {
+      // 重新计算下单元格的格数
       table.subtotal.fields[0].colSpan =
-        colSpanLength - (table.subtotal.fields?.[1]?.colSpan ?? 0)
+        colSpanLength -
+        (table.subtotal.fields?.[1]?.colSpan ?? 0) -
+        (table.subtotal.fields?.[2]?.colSpan ?? 0)
     }
   }
 
@@ -586,6 +608,14 @@ class EditorStore {
       this.overallOrderShow = !this.overallOrderShow
       const arr = this.selectedRegion.split('.')
       this.config.contents[arr[2]].subtotal.fields[0].valueField = fields.id
+
+      const fieldList = this.config.contents[arr[2]].subtotal.fields
+      // 打印账户总计金额的valueField也要修改
+      if (_.find(fieldList, item => item.type === 'useSummarize')) {
+        // 打印账户总计金额 固定是数组的第二个
+        this.config.contents[arr[2]].subtotal.fields[1].valueField =
+          accountRadioList[fields.id]
+      }
     }
   }
 
@@ -622,6 +652,38 @@ class EditorStore {
     this.config = toJS(this.config)
   }
 
+  @action
+  setDiyOverallOrderShow(name) {
+    const arr = name.split('.')
+    const table = this.config.contents[arr[2]]
+    this.overallOrderShow = !this.overallOrderShow
+    // const colSpanLength = getColSpanLength(table)
+    if (table.diyOverallOrder) {
+      set(table.diyOverallOrder, {
+        show: !table.diyOverallOrder.show
+      })
+      // table.overallOrder.fields[0].colSpan =
+      //   colSpanLength - (table.overallOrder.fields?.[1]?.colSpan ?? 0)
+    } else {
+      // 兼容已经存在的配送单据，他们的配置存在后端的，没有overallOrder这个配置，给加上
+      set(table, {
+        diyOverallOrder: {
+          show: true,
+          fields: [
+            {
+              name: '自定义整单合计：',
+              valueField: '{{出库金额}}',
+              style: {
+                fontWeight: 'bold'
+              }
+            }
+          ]
+        }
+      })
+    }
+    this.config = toJS(this.config)
+  }
+
   @action
   setConfigTable(who, value) {
     if (!this.computedIsSelectTable) {
@@ -634,7 +696,12 @@ class EditorStore {
   @action
   changeTableDataKey(name, key) {
     const arr = name.split('.')
-    const { dataKey, overallOrder, subtotal } = this.config.contents[arr[2]]
+    const {
+      dataKey,
+      overallOrder,
+      subtotal,
+      diyOverallOrder
+    } = this.config.contents[arr[2]]
     const keyArr = dataKey.split('_')
     let newDataKey
     // 当前有这个key则去掉
@@ -662,6 +729,8 @@ class EditorStore {
     if (overallOrder?.show) overallOrder.show = false
     // 每页合计不显示
     if (subtotal?.show) subtotal.show = false
+    // 自定义每页合计不显示
+    if (diyOverallOrder?.show) diyOverallOrder.show = false
   }
 
   @action
@@ -778,6 +847,7 @@ class EditorStore {
 
       this.clearExtraTableData(dataKey)
       this.setAutoFillingConfig(false)
+      this.setSubtotalFieldsCol(arr)
     }
   }
 
@@ -896,8 +966,8 @@ class EditorStore {
       const _selectedRegion = this.selectedRegion || _defaultRegion
       const arr = _selectedRegion.split('.')
       if (arr.includes('table')) {
-        const height = this.config.contents[arr[2]].customerRowHeight
-        resHeight = height === undefined ? 23 : height
+        const height = this.config.contents[arr[2]]?.customerRowHeight
+        resHeight = [undefined, ''].includes(height) ? 23 : height
       }
     }
     return resHeight
@@ -1097,6 +1167,86 @@ class EditorStore {
     }
   }
 
+  // 每页合计打印账户总计金额
+  // 写的很垃圾，因为每页合计这里改了4、5次，各种兼容，我人麻了
+  // 每页合计这一行单元格，要计算每个要占几列，就很烦
+  @action.bound
+  setPrintAccount() {
+    if (this.selectedRegion) {
+      // 作用：触发组件的更新
+      this.overallOrderShow = !this.overallOrderShow
+      const arr = this.selectedRegion.split('.')
+      const table = this.config.contents[arr[2]]
+      const subtotalConfig = table?.subtotal
+      // 没有显示每页合计的时候不可以设置
+      if (!subtotalConfig?.show) return
+      // 多栏表格情况，计算colSpan总列数
+      const colSpanLength = getColSpanLength(table)
+      const oldPrintAccount = subtotalConfig?.isPrintAccount
+
+      set(subtotalConfig, {
+        isPrintAccount: !oldPrintAccount
+      })
+      // 兼容已经存在后端的模板，每页合计直接是显示的，导致每页合计配置没有fields,isCustomCells，手动添加上
+      if (oldPrintAccount === undefined && !subtotalConfig.fields) {
+        set(subtotalConfig, {
+          fields: [
+            {
+              name: '每页合计：',
+              valueField: 'real_item_price',
+              colSpan: colSpanLength
+            }
+          ]
+        })
+      }
+      // 开启打印账户总计金额
+      if (subtotalConfig?.isPrintAccount) {
+        // 同时还开启了自定义单元格选项
+        if (subtotalConfig?.fields?.length === 2) {
+          // fields添加自定义单元格
+          subtotalConfig.fields = [
+            subtotalConfig.fields[0],
+            this.subtotalAccountConfigFields,
+            subtotalConfig.fields[1]
+          ]
+          // 重新计算合并单元格的个数
+          subtotalConfig.fields[0].colSpan = Math.floor(colSpanLength / 3)
+          subtotalConfig.fields[1].colSpan = Math.floor(colSpanLength / 3)
+          subtotalConfig.fields[2].colSpan =
+            colSpanLength -
+            subtotalConfig.fields[0].colSpan -
+            subtotalConfig.fields[1].colSpan
+        } else {
+          // fields添加自定义单元格
+          subtotalConfig.fields = [
+            subtotalConfig.fields[0],
+            this.subtotalAccountConfigFields
+          ]
+          // 重新计算合并单元格的个数
+          subtotalConfig.fields[0].colSpan =
+            colSpanLength - subtotalConfig.fields[1].colSpan
+        }
+      } else {
+        // 关闭打印账户总计金额
+        // 存在自定义单元格
+        if (subtotalConfig?.fields?.length === 3) {
+          subtotalConfig.fields = [
+            subtotalConfig.fields[0],
+            this.subtotalConfigFields
+          ]
+          // 重新计算合并单元格的个数
+          subtotalConfig.fields[0].colSpan =
+            colSpanLength - subtotalConfig.fields[1].colSpan
+        } else {
+          // 关闭，fields只有一个
+          subtotalConfig.fields = [subtotalConfig.fields[0]]
+          // 重新计算合并单元格的个数
+          subtotalConfig.fields[0].colSpan = colSpanLength
+        }
+      }
+    }
+  }
+
   // 每页合计开启自定义单元格
   @action.bound
   setSubtotalCustomCells() {
@@ -1129,21 +1279,48 @@ class EditorStore {
       }
       // 开启自定义单元格
       if (subtotalConfig?.isCustomCells) {
-        // fields添加自定义单元格
-        subtotalConfig.fields = [
-          subtotalConfig.fields[0],
-          {
-            ...this.subtotalConfigFields
-          }
-        ]
-        // 重新计算合并单元格的个数
-        subtotalConfig.fields[0].colSpan =
-          colSpanLength - subtotalConfig.fields[1].colSpan
+        // 同时还开启了自定义单元格选项
+        if (subtotalConfig?.fields?.length === 2) {
+          // fields添加自定义单元格
+          subtotalConfig.fields = [
+            subtotalConfig.fields[0],
+            this.subtotalAccountConfigFields,
+            this.subtotalConfigFields
+          ]
+          // 重新计算合并单元格的个数
+          subtotalConfig.fields[0].colSpan = Math.floor(colSpanLength / 3)
+          subtotalConfig.fields[1].colSpan = Math.floor(colSpanLength / 3)
+          subtotalConfig.fields[2].colSpan =
+            colSpanLength -
+            subtotalConfig.fields[0].colSpan -
+            subtotalConfig.fields[1].colSpan
+        } else {
+          // fields添加自定义单元格
+          subtotalConfig.fields = [
+            subtotalConfig.fields[0],
+            this.subtotalConfigFields
+          ]
+          // 重新计算合并单元格的个数
+          subtotalConfig.fields[0].colSpan =
+            colSpanLength - subtotalConfig.fields[1].colSpan
+        }
       } else {
-        // 关闭自定义单元格，fields只有一个
-        subtotalConfig.fields = [subtotalConfig.fields[0]]
-        // 重新计算合并单元格的个数
-        subtotalConfig.fields[0].colSpan = colSpanLength
+        // 关闭自定义单元格
+        // 存在打印账户总计金额
+        if (subtotalConfig?.fields?.length === 3) {
+          subtotalConfig.fields = [
+            subtotalConfig.fields[0],
+            this.subtotalAccountConfigFields
+          ]
+          // 重新计算合并单元格的个数
+          subtotalConfig.fields[0].colSpan =
+            colSpanLength - subtotalConfig.fields[1].colSpan
+        } else {
+          // 关闭，fields只有一个
+          subtotalConfig.fields = [subtotalConfig.fields[0]]
+          // 重新计算合并单元格的个数
+          subtotalConfig.fields[0].colSpan = colSpanLength
+        }
       }
     }
   }
@@ -1158,7 +1335,9 @@ class EditorStore {
 
       if (subtotalConfig.isCustomCells) {
         const subtotalConfig = table?.subtotal.fields
-        subtotalConfig[1].name = value
+        subtotalConfig.length === 3
+          ? (subtotalConfig[2].name = value)
+          : (subtotalConfig[1].name = value)
       }
     }
   }
@@ -1300,6 +1479,121 @@ class EditorStore {
     }
   }
 
+  // 自定义整单合计样式设置
+  @action.bound
+  setDiyOverallOrderStyle(value) {
+    if (this.selectedRegion) {
+      const flexStyle = {
+        left: 'flex-start',
+        center: 'center',
+        right: 'flex-end'
+      }
+      const arr = this.selectedRegion.split('.')
+      const diyOverallOrderConfigFields = this.config.contents[arr[2]]
+        ?.diyOverallOrder.fields
+      _.forEach(diyOverallOrderConfigFields, item => {
+        const oldStyle = item.style || {}
+        set(item, {
+          style: {
+            ...oldStyle,
+            ...value,
+            // 整单合计里使用的flex布局，textAlign不生效
+            'justify-content': flexStyle[value.textAlign]
+          }
+        })
+      })
+    }
+  }
+
+  // 自定义整单合计设置大写金额
+  @action.bound
+  setDiyOverallOrderUpperCase() {
+    if (this.selectedRegion) {
+      this.overallOrderShow = !this.overallOrderShow
+      const arr = this.selectedRegion.split('.')
+      const diyOverallOrderConfig = this.config.contents[arr[2]]
+        ?.diyOverallOrder
+
+      const oldNeedUpperCase = diyOverallOrderConfig?.needUpperCase
+      this.config.contents[arr[2]]?.diyOverallOrder &&
+        set(diyOverallOrderConfig, { needUpperCase: !oldNeedUpperCase })
+      // 没有大写金额时，将大写在前和大小写分开的多选框设置为false
+      if (
+        this.config.contents[arr[2]]?.diyOverallOrder &&
+        diyOverallOrderConfig.needUpperCase === false
+      ) {
+        diyOverallOrderConfig.isUpperCaseBefore &&
+          set(diyOverallOrderConfig, { isUpperCaseBefore: false })
+        diyOverallOrderConfig.isUpperLowerCaseSeparate &&
+          set(diyOverallOrderConfig, { isUpperLowerCaseSeparate: false })
+      }
+    }
+  }
+
+  // 自定义整单合计设置大写金额在前
+  @action.bound
+  setDiyOverallOrderUpperCaseBefore() {
+    if (this.selectedRegion) {
+      this.overallOrderShow = !this.overallOrderShow
+      const arr = this.selectedRegion.split('.')
+      const diyOverallOrderConfig = this.config.contents[arr[2]]
+        ?.diyOverallOrder
+
+      const oldUpperCaseBefore = diyOverallOrderConfig?.isUpperCaseBefore
+      this.config.contents[arr[2]]?.diyOverallOrder &&
+        set(diyOverallOrderConfig, { isUpperCaseBefore: !oldUpperCaseBefore })
+    }
+  }
+
+  // 自定义整单合计设置大小写金额分开
+  @action.bound
+  setDiyOverallOrderUpperLowerCaseSeparate() {
+    if (this.selectedRegion) {
+      this.overallOrderShow = !this.overallOrderShow
+      const arr = this.selectedRegion.split('.')
+      const diyOverallOrderConfig = this.config.contents[arr[2]]
+        ?.diyOverallOrder
+
+      const oldUpperLowerCaseSeparate =
+        diyOverallOrderConfig.isUpperLowerCaseSeparate
+      set(diyOverallOrderConfig, {
+        isUpperLowerCaseSeparate: !oldUpperLowerCaseSeparate
+      })
+    }
+  }
+
+  // 自定义整单合计 字段设置
+  @action.bound
+  setDiyOverallOrderValueField(value) {
+    if (this.selectedRegion) {
+      this.overallOrderShow = !this.overallOrderShow
+      const arr = this.selectedRegion.split('.')
+      const diyOverallOrderConfig = this.config.contents[arr[2]]
+        ?.diyOverallOrder
+
+      const oldValueField = diyOverallOrderConfig.fields?.[0]
+      set(oldValueField, {
+        valueField: value
+      })
+    }
+  }
+
+  // 整单合计自定义单元格文本输入
+  @action.bound
+  setDiyOverallOrderFields(value) {
+    if (this.selectedRegion) {
+      this.overallOrderShow = !this.overallOrderShow
+      const arr = this.selectedRegion.split('.')
+      const table = this.config.contents[arr[2]]
+      const diyOverallOrderConfig = table?.diyOverallOrder
+
+      const oldValueField = diyOverallOrderConfig.fields?.[0]
+      set(oldValueField, {
+        name: value
+      })
+    }
+  }
+
   // 合计和每页合计设置交换位置
   @action.bound
   setSubtotalCommutationPlace() {

package/src/common/util.js

@@ -16,4 +16,9 @@ const subtotalRadioList = [
   }
 ]
 
-export { subtotalRadioList }
+const accountRadioList = {
+  total_item_price: i18next.t('下单金额'),
+  real_item_price: i18next.t('出库金额')
+}
+
+export { subtotalRadioList, accountRadioList }

package/src/editor/context_menu.js

@@ -5,6 +5,7 @@ import CommonContextMenu from '../common/common_context_menu'
 import { inject, observer } from 'mobx-react'
 import _ from 'lodash'
 import { Printer } from '../printer'
+import { isMultiTable } from '../util'
 
 const blockTypeList = [
   { value: '', text: i18next.t('插入文本') },
@@ -79,6 +80,11 @@ class ContextMenu extends React.Component {
     editStore.setOverallOrderShow(name)
   }
 
+  handleDiyOverallOrder = name => {
+    const { editStore } = this.props
+    editStore.setDiyOverallOrderShow(name)
+  }
+
   renderOrderActionBtn = name => {
     if (!this.hasSubtotalBtn(name)) {
       return null
@@ -87,7 +93,8 @@ class ContextMenu extends React.Component {
     const {
       editStore: {
         config: {
-          page: { type }
+          page: { type },
+          showDiyOverAllOrder
         },
         isAutoFilling
       }
@@ -96,7 +103,8 @@ class ContextMenu extends React.Component {
     const {
       dataKey,
       subtotal,
-      overallOrder
+      overallOrder,
+      diyOverallOrder
     } = this.props.editStore.config.contents[arr[2]]
     const keyArr = dataKey.split('_')
 
@@ -105,6 +113,7 @@ class ContextMenu extends React.Component {
     const isCategoryActive = keyArr.includes('category')
     const isSubtotalActive = subtotal.show
     const isOverallOrder = overallOrder?.show
+    const isDiyOverallOrder = diyOverallOrder?.show
 
     return (
       <>
@@ -147,6 +156,14 @@ class ContextMenu extends React.Component {
         >
           {i18next.t('整单合计')}
         </div>
+        {!isMultiTable(dataKey) && showDiyOverAllOrder && (
+          <div
+            onClick={this.handleDiyOverallOrder.bind(this, name)}
+            className={isDiyOverallOrder ? 'active' : ''}
+          >
+            {i18next.t('自定义整单合计')}
+          </div>
+        )}
       </>
     )
   }

package/src/editor/editor.js

@@ -50,16 +50,16 @@ class Editor extends React.Component {
             text={
               <span className='gm-text-desc gm-padding-left-5'>
                 {i18next.t(
-                  '说明：选中内容进行编辑，可拖动字段移动位置，右键使用更多功能，更多详情点击'
+                  '说明：选中内容进行编辑，可拖动字段移动位置，右键使用更多功能'
                 )}
-                <a
+                {/* <a
                   href='https://v.qq.com/x/page/t08044292dd.html'
                   target='_blank'
                   className='btn-link'
                   rel='noopener noreferrer'
                 >
                   {i18next.t('查看视频教程')}
-                </a>
+                </a> */}
               </span>
             }
           />

package/src/editor_account/editor.js

@@ -28,16 +28,16 @@ class Editor extends React.Component {
             text={
               <span className='gm-text-desc gm-padding-left-5'>
                 {i18next.t(
-                  '说明：选中内容进行编辑，可拖动字段移动位置，右键使用更多功能，更多详情点击'
+                  '说明：选中内容进行编辑，可拖动字段移动位置，右键使用更多功能'
                 )}
-                <a
+                {/* <a
                   href='https://v.qq.com/x/page/t08044292dd.html'
                   target='_blank'
                   className='btn-link'
                   rel='noopener noreferrer'
                 >
                   {i18next.t('查看视频教程')}
-                </a>
+                </a> */}
               </span>
             }
           />

package/src/editor_salemenus/editor.js

@@ -50,16 +50,16 @@ class Editor extends React.Component {
             text={
               <span className='gm-text-desc gm-padding-left-5'>
                 {i18next.t(
-                  '说明：选中内容进行编辑，可拖动字段移动位置，右键使用更多功能，更多详情点击'
+                  '说明：选中内容进行编辑，可拖动字段移动位置，右键使用更多功能'
                 )}
-                <a
+                {/* <a
                   href='https://v.qq.com/x/page/t08044292dd.html'
                   target='_blank'
                   className='btn-link'
                   rel='noopener noreferrer'
                 >
                   {i18next.t('查看视频教程')}
-                </a>
+                </a> */}
               </span>
             }
           />

package/src/printer/store.js

@@ -139,8 +139,8 @@ class PrinterStore {
       const _selectedRegion = this.selectedRegion || _defaultRegion
       const arr = _selectedRegion.split('.')
       if (arr.includes('table')) {
-        const height = this.config.contents[arr[2]].customerRowHeight
-        return height === undefined ? 23 : height
+        const height = this.config.contents[arr[2]]?.customerRowHeight
+        return [undefined, ''].includes(height) ? 23 : height
       }
     }
     return 23

package/src/printer/table.js

@@ -17,6 +17,7 @@ import SpecialTr from './table_special_tr'
 import SubtotalTr from './table_subtotal_tr'
 import PageSummary from './page_summary'
 import OverallOrder from './table_overallOrder_tr'
+import DiyOverallOrder from './table_diy_overallOrder_tr'
 
 @inject('printerStore')
 @observer
@@ -303,6 +304,12 @@ class Table extends React.Component {
             config={config}
             printerStore={printerStore}
           />
+          <DiyOverallOrder
+            range={range}
+            config={config}
+            printerStore={printerStore}
+            pageIndex={pageIndex}
+          />
         </tbody>
       </table>
     )

package/src/printer/table_diy_overallOrder_tr.js

@@ -0,0 +1,83 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import _ from 'lodash'
+// import Big from 'big.js'
+import { coverDigit2Uppercase, getDataKey } from '../util'
+import { observer } from 'mobx-react'
+import classNames from 'classnames'
+import Big from 'big.js'
+
+const DiyOverallOrder = props => {
+  const {
+    config: { diyOverallOrder, dataKey },
+    printerStore,
+    pageIndex
+  } = props
+  const tableData = printerStore.data._table[getDataKey(dataKey)] || []
+
+  // 计算合计
+  const sumData = field => {
+    return _.reduce(
+      tableData,
+      (a, b, i) => {
+        let result = a
+        const bRes = printerStore
+          .templateTable(field, dataKey, i, pageIndex)
+          .replace(/\(\)/g, '')
+        result = a.plus(+bRes || 0)
+        return result
+      },
+      Big(0)
+    ).toFixed(2)
+  }
+
+  return (
+    diyOverallOrder?.show &&
+    printerStore?.ready && (
+      <tr>
+        {_.map(diyOverallOrder.fields, (item, index) => {
+          return (
+            <td colSpan={item.colSpan ?? 99} key={index}>
+              <div style={{ ...item.style }} className='gm-flex-page'>
+                {item.name}
+                <div
+                  className={classNames('gm-flex-page', {
+                    'gm-flex-justify-between-page':
+                      diyOverallOrder?.isUpperLowerCaseSeparate,
+                    'gm-flex-grow-page':
+                      diyOverallOrder?.isUpperLowerCaseSeparate
+                  })}
+                >
+                  <span
+                    className={
+                      diyOverallOrder?.isUpperCaseBefore
+                        ? 'gm-printer-subtotal-isUpperCaseBefore-inter'
+                        : ''
+                    }
+                  >
+                    {sumData(item.valueField)}
+                  </span>
+                  {diyOverallOrder?.needUpperCase && (
+                    <span>
+                      {coverDigit2Uppercase(sumData(item.valueField))
+                        ? coverDigit2Uppercase(sumData(item.valueField))
+                        : ''}
+                    </span>
+                  )}
+                </div>
+              </div>
+            </td>
+          )
+        })}
+      </tr>
+    )
+  )
+}
+DiyOverallOrder.propTypes = {
+  config: PropTypes.object.isRequired,
+  range: PropTypes.object.isRequired,
+  printerStore: PropTypes.object,
+  pageIndex: PropTypes.number
+}
+
+export default observer(DiyOverallOrder)

package/src/printer/table_subtotal_tr.js

@@ -68,6 +68,10 @@ const SubtotalTr = props => {
     ).toFixed(2)
   }
 
+  const getData = field => {
+    const data = printerStore.data.common
+    return data?.[field] ?? ''
+  }
   // 每页小计
   // show 是否展示小计，fields<Array> 合计的字段和展现的name，displayName 是否显示名字
   if (show && printerStore.ready) {
@@ -113,7 +117,7 @@ const SubtotalTr = props => {
                 <div
                   style={{
                     fontWeight: 'bold',
-                    'justify-content': flexStyle[subtotal.style?.textAlign], // flex布局中textAlign不生效，改使用justify-content
+                    justifyContent: flexStyle[subtotal.style?.textAlign], // flex布局中textAlign不生效，改使用justify-content
                     ...subtotal.style
                   }}
                   className='gm-flex-page'
@@ -133,11 +137,19 @@ const SubtotalTr = props => {
                       }
                     >
                       {/* 这样写是为了支持自定义单元，index = 1时是自定义单元格 */}
-                      {index === 0 ? sumData(list, item.valueField) : ''}
+                      {item.type === 'useSummarize'
+                        ? getData(item.valueField)
+                        : index === 0
+                        ? sumData(list, item.valueField)
+                        : ''}
+                      {/* {index === 0 ? sumData(list, item.valueField) : ''} */}
                     </span>
                     {subtotal?.needUpperCase && ( // 是否需要大写金额
                       <span>
-                        {index === 0
+                        {item.type === 'useSummarize'
+                          ? '大写：' +
+                            coverDigit2Uppercase(getData(item.valueField))
+                          : index === 0
                           ? '大写：' +
                             coverDigit2Uppercase(sumData(list, item.valueField))
                           : ''}