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

package/package.json

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

package/src/common/editor_customize_config.js

@@ -12,10 +12,17 @@ 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 +35,10 @@ 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_store.js

@@ -49,6 +49,10 @@ class EditorStore {
   @observable
   isAutoFilling = false
 
+  /** 是否开启多位小数，默认不开启，取两位 */
+  @observable
+  isMultiDigitDecimal = false
+
   defaultTableDataKey = 'orders'
 
   // 默认table的dataKey
@@ -61,6 +65,11 @@ class EditorStore {
     this.isAutoFilling = bol
   }
 
+  @action
+  setMultiDigitDecimal(bool) {
+    this.isMultiDigitDecimal = bool
+  }
+
   @observable
   overallOrderShow = false
 
@@ -156,19 +165,14 @@ class EditorStore {
 
     set(this.config, {
       autoFillConfig: {
-        region: this.selectedRegion || autoFillConfig?.region,
+        region: this.selectedRegion,
         dataKey,
         checked: isAutoFilling
       }
     })
-
-    const hasHadEmptyData = _.some(table, data => data?._isEmptyData)
-
-    // 开关打开，且之前数组不包含空数据，再进行填充
-    if (isAutoFilling && !hasHadEmptyData) {
+    if (isAutoFilling) {
       table.push(...this.getFilledTableData(table))
-    }
-    if (!isAutoFilling) {
+    } else {
       this.clearExtraTableData(dataKey)
       return
     }
@@ -866,17 +870,14 @@ class EditorStore {
   // 获得表格自定义行高
   @computed
   get computedTableCustomerRowHeight() {
-    const _defaultRegion = this.config?.autoFillConfig?.region
-    let resHeight = 23
-    if (this.selectedRegion || _defaultRegion) {
-      const _selectedRegion = this.selectedRegion || _defaultRegion
-      const arr = _selectedRegion.split('.')
+    if (this.selectedRegion) {
+      const arr = this.selectedRegion.split('.')
       if (arr.includes('table')) {
         const height = this.config.contents[arr[2]].customerRowHeight
-        resHeight = height === undefined ? 23 : height
+        return height === undefined ? 23 : height
       }
     }
-    return resHeight
+    return 23
   }
 
   @action.bound

package/src/printer/printer.js

@@ -183,11 +183,7 @@ class Printer extends React.Component {
                   content?.dataKey === autoFillConfig?.dataKey
 
                 const end = isAutofillConfig
-                  ? panel.end +
-                    Math.floor(
-                      remainPageHeight /
-                        printerStore.computedTableCustomerRowHeight
-                    )
+                  ? panel.end + Math.floor(remainPageHeight / TR_BASE_HEIGHT)
                   : panel.end
                 switch (panel.type) {
                   case 'table':