gm-printer 10.28.4-beta.4 → 10.28.4

package/.github/workflows/release.yml

@@ -22,7 +22,10 @@ jobs:
           node-version: 16.x
           registry-url: 'https://registry.npmjs.org'
 
-  
+      - name: ChangeLog
+        run: npx changelogithub
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
       - name: Setup
         run: npm i -g @antfu/ni
@@ -44,7 +47,3 @@ jobs:
           fi
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
-          # - name: ChangeLog
-          # run: npx changelogithub
-          # env:
-          #   GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}

package/package.json

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

package/src/common/editor_customize_config.js

@@ -2,25 +2,13 @@ import i18next from '../../locales'
 import { inject, observer } from 'mobx-react'
 import PropTypes from 'prop-types'
 import React from 'react'
-import { Flex, Switch, Select, Option } from '../components'
-import _ from 'lodash'
-
-const initOptionsList = [
-  { name: i18next.t('自适应'), value: 0 },
-  { name: i18next.t('20行'), value: 20 },
-  { name: i18next.t('30行'), value: 30 },
-  { name: i18next.t('40行'), value: 40 }
-]
+import { Flex, Switch } from '../components'
 
 @inject('editStore')
 @observer
 class EditorCutomizedConfig extends React.Component {
   handleAutoFilling = value => {
     const { editStore } = this.props
-    editStore.setFillRowValue(0)
-    if (!value) {
-      editStore.setFillIndex(false)
-    }
     editStore.handleChangeTableData(value)
   }
 
@@ -29,21 +17,10 @@ class EditorCutomizedConfig extends React.Component {
     editStore.setMultiDigitDecimal(value)
   }
 
-  handleFillRowValue = value => {
-    const { editStore } = this.props
-    editStore.setFillRowValue(value)
-    editStore.handleChangeTableData(true)
-  }
-
-  handleFillIndex = value => {
-    const { editStore } = this.props
-    editStore.setFillIndex(value)
-  }
-
   render() {
     const {
       editStore,
-      editStore: { isAutoFilling, isMultiDigitDecimal, fillRowValue, fillIndex }
+      editStore: { isAutoFilling, isMultiDigitDecimal }
     } = this.props
     // 是table
     if (editStore.computedRegionIsTable) {
@@ -52,29 +29,7 @@ class EditorCutomizedConfig extends React.Component {
           <Flex alignCenter className='gm-padding-top-5'>
             <div>{i18next.t('行数是否自动填充')}：</div>
             <Switch checked={isAutoFilling} onChange={this.handleAutoFilling} />
-            {isAutoFilling && (
-              <Select
-                value={fillRowValue}
-                onChange={this.handleFillRowValue}
-                options={initOptionsList}
-              >
-                {_.map(initOptionsList, (v, k) => (
-                  <Option key={k} value={v.value}>
-                    {v.name}
-                  </Option>
-                ))}
-              </Select>
-            )}
-          </Flex>
-
-          <Flex className='gm-padding-top-5 '>
-            <div>{i18next.t('行数是否空白行是否填充序号')}：</div>
-            <Switch
-              checked={fillIndex || false}
-              onChange={this.handleFillIndex}
-            />
           </Flex>
-
           <Flex className='gm-padding-top-5 gm-text-red' column>
             {i18next.t('注意：填充仅支持单栏数据使用')}
           </Flex>

package/src/common/editor_select.js

@@ -1,7 +1,8 @@
 import i18next from '../../locales'
 import React from 'react'
 import { observer, inject } from 'mobx-react'
-import { Flex, Option, Select, RadioGroup, Radio } from '../components'
+import { Flex, Option, Select } from '../components'
+import { RadioGroup, Radio } from '@gmfe/react'
 import { InputWithUnit } from '../common/component'
 import { pageTypeMap, printDirectionList, LONG_PRINT } from '../config'
 import _ from 'lodash'

package/src/common/editor_store.js

@@ -22,12 +22,6 @@ class EditorStore {
   @observable
   remainPageHeihgt = 0
 
-  @observable
-  fillRowValue = 0
-
-  @observable
-  fillIndex = 0
-
   // 初始模板
   originConfig = null
 
@@ -65,44 +59,6 @@ class EditorStore {
   // 默认table的dataKey
   setTableDataKeyEffect() {} // 改变dataKey后,做的副作用操作
 
-  @action
-  setFillRowValue(value) {
-    const { autoFillConfig } = this.config
-    if (!this.selectedRegion && !autoFillConfig?.checked) return
-    this.fillRowValue = value
-    const dataKey =
-      this.computedTableSpecialConfig?.dataKey || autoFillConfig?.dataKey
-    set(this.config, {
-      autoFillConfig: {
-        region: this.selectedRegion || autoFillConfig?.region,
-        dataKey,
-        checked: this.isAutoFilling,
-        // 填充行数字段
-        fillRowValue: this.fillRowValue,
-        fillIndex: this.fillIndex
-      }
-    })
-  }
-
-  @action
-  setFillIndex(value) {
-    const { autoFillConfig } = this.config
-    if (!this.selectedRegion && !autoFillConfig?.checked) return
-    this.fillIndex = value
-    const dataKey =
-      this.computedTableSpecialConfig?.dataKey || autoFillConfig?.dataKey
-    set(this.config, {
-      autoFillConfig: {
-        region: this.selectedRegion || autoFillConfig?.region,
-        dataKey,
-        checked: this.isAutoFilling,
-        // 填充行数字段
-        fillRowValue: this.fillRowValue,
-        fillIndex: value
-      }
-    })
-  }
-
   defaultTableSubtotal = { show: false }
 
   @action
@@ -209,14 +165,9 @@ class EditorStore {
   getFilledTableData(tableData) {
     const { autoFillConfig } = this.config
     if (!this.selectedRegion && !autoFillConfig?.checked) return []
-    let tr_count = 0
-    if (this.fillRowValue === 0) {
-      tr_count = Math.floor(
-        this.remainPageHeihgt / this.computedTableCustomerRowHeight
-      )
-    } else {
-      tr_count = this.fillRowValue
-    }
+    const tr_count = Math.floor(
+      this.remainPageHeihgt / this.computedTableCustomerRowHeight
+    )
 
     const filledData = {
       _isEmptyData: true // 表示是填充的空白数据
@@ -233,27 +184,20 @@ class EditorStore {
     if (!this.selectedRegion && !autoFillConfig?.checked) return
     const dataKey =
       this.computedTableSpecialConfig?.dataKey || autoFillConfig?.dataKey
-    // 每次都更新一下？
     const table = this.mockData._table[dataKey]
-    // 赋值一下
     this.setAutoFillingConfig(isAutoFilling)
-    this.setFillRowValue(autoFillConfig?.fillRowValue || 0)
-    this.setFillIndex(autoFillConfig?.fillIndex || false)
+
     set(this.config, {
       autoFillConfig: {
         region: this.selectedRegion || autoFillConfig?.region,
         dataKey,
-        checked: isAutoFilling,
-        // 填充行数字段
-        fillRowValue: this.fillRowValue,
-        fillIndex: this.fillIndex
+        checked: isAutoFilling
       }
     })
 
     const hasHadEmptyData = _.some(table, data => data?._isEmptyData)
 
     // 开关打开，且之前数组不包含空数据，再进行填充
-
     if (isAutoFilling && !hasHadEmptyData) {
       table.push(...this.getFilledTableData(table))
     }
@@ -283,8 +227,6 @@ class EditorStore {
     this.insertPanel = 'header'
     this.mockData = data
     this.isAutoFilling = false
-    this.fillRowValue = 0
-    this.fillIndex = false
     this.isMultiDigitDecimal = false
   }
 

package/src/components/index.js

@@ -5,12 +5,9 @@ import { DropDown, DropDownItem, DropDownItems } from './dropdown'
 import Dialog from './dialog'
 import Switch from './switch'
 import ToolTip from './tooltip'
-import { RadioGroup, Radio } from './radio'
 
 export {
   Flex,
-  RadioGroup,
-  Radio,
   Select,
   Option,
   Tip,

package/src/editor/context_menu.js

@@ -199,8 +199,6 @@ class ContextMenu extends React.Component {
           selected={editStore.selected}
           selectedRegion={editStore.selectedRegion}
           isAutoFilling={editStore.isAutoFilling}
-          fillRowValue={editStore.fillRowValue}
-          fillIndex={editStore.fillIndex}
           lineheight={editStore.computedTableCustomerRowHeight}
           config={editStore.config}
           data={editStore.mockData}

package/src/printer/printer.js

@@ -11,7 +11,6 @@ import Table from './table'
 import LongPrintTable from './long_print_table'
 import MergePage from './merge_page'
 import { LONG_PRINT } from '../config'
-import Big from 'big.js'
 
 // Header Sign Footer 相对特殊，要单独处理
 const Header = props => (
@@ -73,26 +72,12 @@ class Printer extends React.Component {
     if (nextProps.selectedRegion !== this.props.selectedRegion) {
       this.props.printerStore.setSelectedRegion(nextProps.selectedRegion)
     }
-
-    if (
-      nextProps.isAutoFilling !== this.props.isAutoFilling ||
-      nextProps.fillRowValue !== this.props.printerStore.fillRowValue ||
-      nextProps.fillIndex !== this.props.printerStore.fillIndex
-    ) {
+    if (nextProps.isAutoFilling !== this.props.isAutoFilling) {
       await this.props.printerStore.setAutofillConfig(nextProps.isAutoFilling)
-      await this.props.printerStore.setFillRowValue(nextProps.fillRowValue)
-      await this.props.printerStore.setFillIndex(nextProps.fillIndex)
       await this.props.printerStore.setData(nextProps.data)
       await this.props.printerStore.setReady(true)
-      if (nextProps.fillRowValue === 0) {
-        // 自适应要先reset一下 在计算高度
-        await this.props.printerStore.resetTableData()
-        await this.props.printerStore.computedPages()
-      }
-      await this.props.printerStore.changeTableData()
       await this.props.printerStore.computedPages()
     }
-
     if (nextProps.lineheight !== this.props.lineheight) {
       await this.props.getremainpageHeight(
         this.props.printerStore.remainPageHeight
@@ -111,30 +96,19 @@ class Printer extends React.Component {
       // didMount 代表第一次渲染完成
       printerStore.setReady(true)
 
+      // 开始计算，获取各种数据
+      printerStore.computedPages()
+
       if (config.autoFillConfig?.checked) {
         this.props.printerStore.setAutofillConfig(
           config.autoFillConfig?.checked || false
         )
-        this.props.printerStore.setFillRowValue(
-          config.autoFillConfig?.fillRowValue || 0
-        )
-        this.props.printerStore.setFillIndex(
-          config.autoFillConfig?.fillIndex || false
-        )
-      }
-      // 开始计算，获取各种数据
-      // 如果是自适应要先计算高度，在算出行数 不是自适应就先计算行数 在计算高度
-      if (config.autoFillConfig?.fillRowValue === 0) {
-        printerStore.computedPages()
-        printerStore.changeTableData()
-      } else {
-        printerStore.changeTableData()
-        printerStore.computedPages()
+        this.props.printerStore.changeTableData()
       }
+
       // 获取剩余空白高度，传到editor
       getremainpageHeight && getremainpageHeight(printerStore.remainPageHeight)
     }
-
     // Printer 不是立马就呈现出最终样式，有个过程。这个过程需要时间，什么 ready，不太清楚，估借 setState 来获取过程结束时刻
     this.setState({}, () => {
       this.props.onReady()
@@ -246,19 +220,16 @@ class Printer extends React.Component {
 
   renderPage() {
     const { printerStore, isSomeSubtotalTr } = this.props
-    const {
-      config,
-      remainPageHeight,
-      isAutoFilling,
-      fillRowValue
-    } = printerStore
+    const { config, remainPageHeight, isAutoFilling } = printerStore
     return (
       <>
         {_.map(printerStore.pages, (page, i) => {
           const isLastPage = i === printerStore.pages.length - 1
+
           return (
             <Page key={i}>
               <Header config={config.header} pageIndex={i} />
+
               {_.map(page, (panel, ii) => {
                 const content = config.contents[panel.index]
                 const autoFillConfig = config?.autoFillConfig || {}
@@ -266,16 +237,15 @@ class Printer extends React.Component {
                   isLastPage &&
                   isAutoFilling &&
                   panel.end &&
-                  content?.dataKey === autoFillConfig?.dataKey &&
-                  fillRowValue === 0
-                const endList = isAutofillConfig
-                  ? Math.floor(
+                  content?.dataKey === autoFillConfig?.dataKey
+
+                const end = isAutofillConfig
+                  ? panel.end +
+                    Math.floor(
                       remainPageHeight /
                         printerStore.computedTableCustomerRowHeight
                     )
-                  : 0
-                const end = +Big(panel?.end || 0).add(endList)
-
+                  : panel.end
                 switch (panel.type) {
                   case 'table':
                     return (
@@ -421,8 +391,6 @@ Printer.propTypes = {
   selected: PropTypes.string,
   selectedRegion: PropTypes.string,
   isAutoFilling: PropTypes.bool,
-  fillRowValue: PropTypes.number,
-  fillIndex: PropTypes.number,
   lineheight: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   data: PropTypes.object.isRequired,
   config: PropTypes.object.isRequired,

package/src/printer/store.js

@@ -1,5 +1,5 @@
 import i18next from '../../locales'
-import { action, observable, computed, toJS } from 'mobx'
+import { action, observable, computed } from 'mobx'
 import {
   getSumTrHeight,
   isMultiTable,
@@ -48,14 +48,6 @@ class PrinterStore {
   @observable
   isAutoFilling = false
 
-  // 是否自动行数填充
-  @observable
-  fillRowValue = 0
-
-  // 是否自动行数填充
-  @observable
-  fillIndex = 0
-
   /** 是否开启多位小数，默认不开启，取两位 */
   @observable
   isMultiDigitDecimal = false
@@ -80,21 +72,6 @@ class PrinterStore {
   @action
   setAutofillConfig(bol) {
     this.isAutoFilling = bol
-    if (!bol) {
-      this.pages = []
-      this.fillIndex = false
-      this.fillRowValue = 0
-    }
-  }
-
-  @action
-  setFillRowValue(value) {
-    this.fillRowValue = value
-  }
-
-  @action
-  setFillIndex(value) {
-    this.fillIndex = value
   }
 
   @action
@@ -133,11 +110,11 @@ class PrinterStore {
     return tableConfig
   }
 
-  @computed
   get tableData() {
     if (!this.tableConfig) return []
     const { autoFillConfig } = this.config
     const { dataKey } = this.tableConfig
+
     if (autoFillConfig?.region) {
       /** 当前数据 */
       return this.data._table[dataKey] || []
@@ -148,7 +125,7 @@ class PrinterStore {
     return this.data._table[dataKey] || []
   }
 
-  @computed // 空数据的长度
+  // 空数据的长度
   get filledTableLen() {
     const filledData = this.tableData.filter(x => x._isEmptyData)
     return filledData.length
@@ -181,12 +158,15 @@ class PrinterStore {
 
   getNormalTableBodyHeights(heights, dataKey) {
     if (!this.tableConfig) return heights
+
     const len = this.tableData.length
     // 如果是已经开了填充配置，回显的heights包括了填充的表格部分，关闭配置时，这种情况就要去掉填充的
     if (_.gt(heights.length, len)) return heights.slice(0, len)
+
     const hasEmptyData = this.tableData.some(x => x._isEmptyData)
     const isOrderCategroy = dataKey === this.config?.autoFillConfig?.dataKey
     const { customerRowHeight = TR_BASE_HEIGHT } = this.tableConfig
+
     if (hasEmptyData && !this.isAutoFilling && isOrderCategroy) {
       // 如果tableData有填充的空数据， 则去掉
       return heights.slice(0, -this.filledTableLen)
@@ -214,6 +194,7 @@ class PrinterStore {
   computedData(dataKey, table, end, currentRemainTableHeight) {
     /** 当前数据 */
     const tableData = this.data._table[dataKey] || []
+
     let count = 0
     _.forEach(Array(end).fill(1), (val, i) => {
       const details = tableData[i]?.__details || []
@@ -245,7 +226,7 @@ class PrinterStore {
 
     // 分局明细拆分后的数据
     const splitTableData = _.map(
-      _.filter(ranges, i => i[0] !== i[1]), // 过滤掉 {[0,3],[3,3]}这周情况
+      _.filter(ranges, i[0] !== i[1] || (!i[0] && !i[1])), // 过滤掉 {[0,3],[3,3]}这周情况
       range => {
         const _tableData = Object.assign({}, tableData[end])
         _tableData.__details = data.slice(...range)
@@ -257,9 +238,11 @@ class PrinterStore {
         return _tableData
       }
     )
+
     // 插入原table数据中
     tableData.splice(end, 1, ...splitTableData)
     this.data._table[dataKey] = tableData
+
     return detailsPageHeight
   }
 
@@ -317,6 +300,7 @@ class PrinterStore {
         let pageAccomodateTableHeight = +new Big(this.pageHeight)
           .minus(currentPageHeight)
           .toFixed(2)
+
         const heights = this.getNormalTableBodyHeights(
           table.body.heights,
           dataKey
@@ -336,6 +320,7 @@ class PrinterStore {
           let currentRemainTableHeight = 0
           /** 去最小的tr高度，用于下面的计算compare,(避免特殊情况：一般来说最小tr——height = 23, 比23还小的不考虑计算) */
           const minHeight = Math.max(getArrayMid(heights), 23)
+
           /* 遍历表格每一行，填充表格内容 */
           while (end < heights.length) {
             currentTableHeight += heights[end]
@@ -431,7 +416,6 @@ class PrinterStore {
         if (index === this.config.contents.length - 1) {
           currentPageHeight += this.height?.sign
         }
-
         if (currentPageHeight <= this.pageHeight) {
           // 空间充足，把信息加入 page，并轮下一个contents
           page.push({
@@ -451,6 +435,7 @@ class PrinterStore {
       }
     }
     this.pages.push(page)
+
     this.remainPageHeight = +Big(this.pageHeight - currentPageHeight).toFixed(0)
   }
 
@@ -514,17 +499,14 @@ class PrinterStore {
     // 做好保护，出错就返回 text
     try {
       let list = this.data._table[dataKey] || this.data._table.orders
-
       // 采购任务打印存在两个表格，第二表格没有明细，数据需要做去重
       if (dataKey === 'purchase_no_detail') {
         list = _.uniqBy(list, '序号')
       }
-
       return _.template(text, {
         interpolate: /{{([\s\S]+?)}}/g
       })({
         ...this.data.common,
-
         [i18next.t('列')]: list[index],
         [i18next.t('当前页码')]: pageIndex + 1,
         [i18next.t('页码总数')]: this.pages.length,
@@ -598,21 +580,16 @@ class PrinterStore {
   getFilledTableData(tableData) {
     const { autoFillConfig } = this.config
     if (!this.selectedRegion && !autoFillConfig?.checked) return []
-    let tr_count = 0
-    if (this.fillRowValue === 0) {
-      tr_count = Math.floor(
-        this.remainPageHeight / this.computedTableCustomerRowHeight
-      )
-    } else {
-      tr_count = this.fillRowValue
-    }
+    const tr_count = Math.floor(
+      this.remainPageHeight / this.computedTableCustomerRowHeight
+    )
+
     const filledData = {
       _isEmptyData: true // 表示是填充的空白数据
     }
     _.map(tableData[0], (val, key) => {
       filledData[key] = ''
     })
-
     return Array(tr_count).fill(filledData)
   }
 
@@ -621,32 +598,11 @@ class PrinterStore {
     const { autoFillConfig } = this.config
     if (!this.isAutoFilling) return
     const dataKey = autoFillConfig?.dataKey
-    const table = this.data._table[dataKey]?.filter(item => !item._isEmptyData)
+    const table = this.data._table[dataKey]
 
-    const lastKey = _.findLast(table, item => item?.序号)?.序号 + 1
-    console.log(lastKey, 'lastKey=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-')
-    const fillList = _.map(this.getFilledTableData(table), (item, index) => {
-      if (this.fillIndex) {
-        return { ...item, 序号: index + lastKey }
-      } else {
-        return { ...item }
-      }
-    })
-    table.push(...fillList)
+    table.push(...this.getFilledTableData(table))
     this.data._table[dataKey] = table
   }
-
-  @action.bound
-  resetTableData() {
-    const { autoFillConfig } = this.config
-    if (!this.isAutoFilling) return
-    const dataKey = autoFillConfig?.dataKey
-    const table = this.data._table[dataKey]?.filter(item => !item._isEmptyData)
-    const restTable = _.map(table, item => {
-      return { ...item }
-    })
-    this.data._table[dataKey] = restTable
-  }
 }
 
 export default PrinterStore

package/src/printer/table.js

@@ -19,7 +19,6 @@ import SubtotalTr from './table_subtotal_tr'
 import PageSummary from './page_summary'
 import OverallOrder from './table_overallOrder_tr'
 import DiyOverallOrder from './table_diy_overallOrder_tr'
-import { toJS } from 'mobx'
 
 @inject('printerStore')
 @observer
@@ -41,7 +40,7 @@ class Table extends React.Component {
       const ths = tHead.querySelectorAll('th') || []
       const trs = $table.querySelectorAll('tbody tr') || []
       const detailsDiv = $table.querySelectorAll('tr td .b-table-details')
-      // 问题出现在这里
+
       printerStore.setHeight(name, getHeight($table))
 
       printerStore.setTable(name, {
@@ -169,9 +168,11 @@ class Table extends React.Component {
       printerStore,
       isSomeSubtotalTr
     } = this.props
+
     // 数据
     dataKey = getDataKey(dataKey, arrange)
     const tableData = printerStore.data._table[dataKey] || []
+
     // 列
     const columns = this.getColumns()
     // 列宽固定(避免跳页bug)
@@ -224,6 +225,7 @@ class Table extends React.Component {
       }
       return tdStyle
     }
+
     return (
       <table
         style={{
@@ -259,7 +261,6 @@ class Table extends React.Component {
             ))}
           </tr>
         </thead>
-
         <tbody>
           {_.map(_.range(range.begin, range.end), i => {
             const _special = tableData[i] && tableData[i]._special
@@ -270,14 +271,11 @@ class Table extends React.Component {
               return <SpecialTr key={i} config={config} data={_special} />
             // 如果项为空对象展现一个占满一行的td
             const isItemNone = !_.keys(tableData[i]).length
+
             return (
               <tr style={{ height: `${customerRowHeight}px` }} key={i}>
                 {isItemNone ? (
-                  !printerStore?.isAutoFilling ? (
-                    <td colSpan='99' />
-                  ) : (
-                    <></>
-                  )
+                  <td colSpan='99' />
                 ) : (
                   _.map(columns, (col, j) => {
                     return (