gm-printer 10.14.4-beta.0 → 10.14.4-beta.3

package/package.json

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

package/src/common/editor_customize_config.js

@@ -17,12 +17,10 @@ class EditorCutomizedConfig extends React.Component {
     editStore.setMultiDigitDecimal(value)
   }
 
-
-
   render() {
     const {
       editStore,
-      editStore: { isAutoFilling,isMultiDigitDecimal }
+      editStore: { isAutoFilling, isMultiDigitDecimal }
     } = this.props
     // 是table
     if (editStore.computedRegionIsTable) {
@@ -37,7 +35,10 @@ class EditorCutomizedConfig extends React.Component {
           </Flex>
           <Flex alignCenter className='gm-padding-top-5'>
             <div>{i18next.t('是否开启多位小数')}：</div>
-            <Switch checked={isMultiDigitDecimal} onChange={this.handleMultiDigitDecimal} />
+            <Switch
+              checked={isMultiDigitDecimal}
+              onChange={this.handleMultiDigitDecimal}
+            />
           </Flex>
         </>
       )

package/src/common/editor_store.js

@@ -68,6 +68,13 @@ class EditorStore {
   @action
   setMultiDigitDecimal(bool) {
     this.isMultiDigitDecimal = bool
+    set(this.config, {
+      specialControlConfig: {
+        multiDigitDecimal: bool
+      }
+    })
+
+    this.selected && this.changeTableDataKey(this.selected, 'multiDigitDecimal')
   }
 
   @observable
@@ -195,6 +202,7 @@ class EditorStore {
     this.insertPanel = 'header'
     this.mockData = data
     this.isAutoFilling = false
+    this.isMultiDigitDecimal = false
   }
 
   @action
@@ -613,6 +621,7 @@ class EditorStore {
 
   @action
   changeTableDataKey(name, key) {
+    console.log('changeTableDataKey', name)
     const arr = name.split('.')
     const { dataKey, overallOrder, subtotal } = this.config.contents[arr[2]]
     const keyArr = dataKey.split('_')

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