gm-printer 10.14.6 → 10.14.7-beta.3

package/.eslintcache

@@ -0,0 +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"},{"size":18202,"mtime":1653550658475,"results":"5","hashOfConfig":"6"},{"size":5189,"mtime":1653550658475,"results":"7","hashOfConfig":"6"},{"size":36126,"mtime":1653550658474,"results":"8","hashOfConfig":"6"},{"size":1578,"mtime":1653550658473,"results":"9","hashOfConfig":"6"},{"filePath":"10","messages":"11","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"cvcgct",{"filePath":"12","messages":"13","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"14","messages":"15","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"16","messages":"17","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/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",[]]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-printer",
-  "version": "10.14.6",
+  "version": "10.14.7-beta.3",
   "description": "diy printer",
   "main": "src/index.js",
   "scripts": {

package/src/common/component.js

@@ -602,16 +602,16 @@ Title.propTypes = {
   text: PropTypes.object
 }
 
-const Radio = ({ id, value, radioChecked, checked }) => (
-  <div>
+const Radio = ({ id, value, radioChecked, checked, style, inputName }) => (
+  <div style={style}>
     <input
       type='radio'
       value={value}
       id={id}
-      name='radio'
+      name={inputName ?? 'radio'}
       onChange={radioChecked}
       checked={checked}
-      style={{ margin: '5px 10px 0 0' }}
+      style={{ margin: '5px 5px 0 0' }}
     />
     <label htmlFor={id}>{value}</label>
     <Gap />
@@ -621,6 +621,8 @@ const Radio = ({ id, value, radioChecked, checked }) => (
 Radio.propTypes = {
   id: PropTypes.string,
   value: PropTypes.string,
+  style: PropTypes.string,
+  inputName: PropTypes.string,
   radioChecked: PropTypes.func,
   checked: PropTypes.bool
 }

package/src/common/editor_customize_config.js

@@ -12,10 +12,15 @@ class EditorCutomizedConfig extends React.Component {
     editStore.handleChangeTableData(value)
   }
 
+  handleMultiDigitDecimal = value => {
+    const { editStore } = this.props
+    editStore.setMultiDigitDecimal(value)
+  }
+
   render() {
     const {
       editStore,
-      editStore: { isAutoFilling }
+      editStore: { isAutoFilling, isMultiDigitDecimal }
     } = this.props
     // 是table
     if (editStore.computedRegionIsTable) {
@@ -28,6 +33,13 @@ class EditorCutomizedConfig extends React.Component {
           <Flex className='gm-padding-top-5 gm-text-red' column>
             {i18next.t('注意：填充仅支持单栏数据使用')}
           </Flex>
+          <Flex alignCenter className='gm-padding-top-5'>
+            <div>{i18next.t('是否开启多位小数')}：</div>
+            <Switch
+              checked={isMultiDigitDecimal}
+              onChange={this.handleMultiDigitDecimal}
+            />
+          </Flex>
         </>
       )
     } else {

package/src/common/editor_edit_field.js

@@ -14,10 +14,12 @@ import {
   Textarea,
   Title,
   TipInfo,
-  Text
+  Text,
+  Radio
 } from '../common/component'
 import { get, toJS } from 'mobx'
 import PropTypes from 'prop-types'
+import { subtotalRadioList } from './util'
 
 @inject('editStore')
 @observer
@@ -399,7 +401,7 @@ class EditorField extends React.Component {
         />
 
         <Flex>
-          <Flex>{i18next.t('合计设置')}：</Flex>
+          <Flex>{i18next.t('每页合计设置')}：</Flex>
           <Fonter
             style={subtotalStyle}
             onChange={this.handleSubtotalStyleChange}
@@ -410,6 +412,28 @@ class EditorField extends React.Component {
             onChange={this.handleSubtotalStyleChange}
           />
         </Flex>
+        <Gap />
+        {!isSomeSubtotalTr && (
+          <div>
+            <Flex>{i18next.t('合金栏打印金额')}：</Flex>
+            <Flex style={{ marginLeft: 57 }}>
+              {subtotalRadioList.map(fields => {
+                return (
+                  <Radio
+                    style={{ marginLeft: 5 }}
+                    id={fields.id}
+                    value={fields.value}
+                    key={fields.id}
+                    inputName='subtotalRadio'
+                    checked={subtotal?.fields?.[0].valueField === fields.id}
+                    radioChecked={() => editStore.subtotalRadioCheck(fields)}
+                  />
+                )
+              })}
+            </Flex>
+          </div>
+        )}
+
         <EditorSubtotalCheck
           subtotalCheckDisabled
           subtotalChecked={subtotalNeedUpperCase}

package/src/common/editor_store.js

@@ -49,6 +49,10 @@ class EditorStore {
   @observable
   isAutoFilling = false
 
+  /** 是否开启多位小数，默认不开启，取两位 */
+  @observable
+  isMultiDigitDecimal = false
+
   defaultTableDataKey = 'orders'
 
   // 默认table的dataKey
@@ -61,6 +65,16 @@ class EditorStore {
     this.isAutoFilling = bol
   }
 
+  @action
+  setMultiDigitDecimal(bool) {
+    this.isMultiDigitDecimal = bool
+    set(this.config, {
+      specialControlConfig: {
+        multiDigitDecimal: bool
+      }
+    })
+  }
+
   @observable
   overallOrderShow = false
 
@@ -191,6 +205,7 @@ class EditorStore {
     this.insertPanel = 'header'
     this.mockData = data
     this.isAutoFilling = false
+    this.isMultiDigitDecimal = false
   }
 
   @action
@@ -565,6 +580,15 @@ class EditorStore {
     }
   }
 
+  @action
+  subtotalRadioCheck(fields) {
+    if (this.selectedRegion) {
+      this.overallOrderShow = !this.overallOrderShow
+      const arr = this.selectedRegion.split('.')
+      this.config.contents[arr[2]].subtotal.fields[0].valueField = fields.id
+    }
+  }
+
   @action
   setOverallOrderShow(name) {
     const arr = name.split('.')

package/src/common/util.js

@@ -0,0 +1,19 @@
+import i18next from '../../locales'
+
+/**
+ * 每页合计设置单选按钮
+ * id的值是用来计算每页的金额总数，不要轻易随便改
+ * id值暂时使用_origin的值，可优化改为{{列.xxxx}}的值，改起来有代价，先不改
+ */
+const subtotalRadioList = [
+  {
+    value: i18next.t('下单金额'),
+    id: 'total_item_price'
+  },
+  {
+    value: i18next.t('出库金额'),
+    id: 'real_item_price'
+  }
+]
+
+export { subtotalRadioList }

package/src/editor/context_menu.js

@@ -26,7 +26,7 @@ class ContextMenu extends React.Component {
     const {
       editStore,
       editStore: {
-        config: { autoFillConfig }
+        config: { autoFillConfig, specialControlConfig }
       }
     } = this.props
 
@@ -36,6 +36,11 @@ class ContextMenu extends React.Component {
         autoFillConfig?.dataKey
       )
     }
+    /** 初始化特殊控制的配置 */
+    if (specialControlConfig?.multiDigitDecimal) {
+      // 多位小数
+      editStore.setMultiDigitDecimal(specialControlConfig?.multiDigitDecimal)
+    }
   }
 
   /**
@@ -100,7 +105,7 @@ class ContextMenu extends React.Component {
     const isCategoryActive = keyArr.includes('category')
     const isSubtotalActive = subtotal.show
     const isOverallOrder = overallOrder?.show
-
+    console.log('name', name)
     return (
       <>
         <div

package/src/printer/store.js

@@ -48,6 +48,15 @@ class PrinterStore {
   @observable
   isAutoFilling = false
 
+  /** 是否开启多位小数，默认不开启，取两位 */
+  @observable
+  isMultiDigitDecimal = false
+
+  @action
+  setMultiDigitDecimal(bool) {
+    this.isMultiDigitDecimal = bool
+  }
+
   @action
   init(config, data) {
     this.ready = false