gm-printer 10.37.1 → 10.37.3-beta.0

package/src/examining_report_editor/editor.js

@@ -0,0 +1,85 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import _ from 'lodash'
+import { Flex } from '../components'
+import { Gap, Title } from '../common/component'
+import editStore from './store'
+import { observer, inject } from 'mobx-react'
+import EditorTitle from '../common/editor_title'
+import EditorSelect from '../common/editor_select'
+import EditorField from '../common/editor_edit_field'
+import EditorAddField from '../common/editor_add_field'
+import ContextMenu from './context_menu'
+import i18next from '../../locales'
+import withStore from '../common/hoc_with_store'
+
+const tableDataKeyList = [
+  {
+    value: 'examiningDetail',
+    text: i18next.t('检测明细'),
+    hasSubtotalBtn: true
+  }
+]
+
+@withStore(editStore)
+@inject('editStore')
+@observer
+class Editor extends React.Component {
+  render() {
+    const { onSave, showEditor, addFields, menuConfig } = this.props
+
+    return (
+      <div className='gm-printer-edit'>
+        <Flex className='gm-printer-edit-title-fixed'>
+          <Title
+            title={i18next.t('模板预览')}
+            text={
+              <span className='gm-text-desc gm-padding-left-5'>
+                {i18next.t(
+                  '说明：选中内容进行编辑，可拖动字段移动位置，右键使用更多功能'
+                )}
+              </span>
+            }
+          />
+        </Flex>
+
+        {showEditor && (
+          <div className='gm-printer-edit-zone'>
+            <EditorTitle onSave={onSave} />
+            <Gap height='10px' />
+            <EditorSelect />
+            <Gap height='5px' />
+            <EditorField tableDataKeyList={tableDataKeyList} />
+            <Gap height='5px' />
+            <EditorAddField addFields={addFields} />
+
+            <div id='gm-printer-tip' />
+            <div id='gm-printer-modal' />
+          </div>
+        )}
+
+        <div className='gm-printer-edit-wrap'>
+          <ContextMenu menuConfig={menuConfig} />
+        </div>
+      </div>
+    )
+  }
+}
+
+Editor.propTypes = {
+  config: PropTypes.object.isRequired,
+  onSave: PropTypes.func,
+  showEditor: PropTypes.bool,
+  mockData: PropTypes.object.isRequired,
+  addFields: PropTypes.object.isRequired,
+  menuConfig: PropTypes.oneOfType([
+    PropTypes.arrayOf(PropTypes.string),
+    PropTypes.object
+  ])
+}
+
+Editor.defaultProps = {
+  onSave: _.noop
+}
+
+export default Editor

package/src/examining_report_editor/index.js

@@ -0,0 +1,4 @@
+import withShadowDom from '../common/hoc_with_shadow_dom'
+import Editor from './editor'
+
+export default withShadowDom(Editor)

package/src/examining_report_editor/store.js

@@ -0,0 +1,74 @@
+import EditorStore from '../common/editor_store'
+import { action, toJS } from 'mobx'
+import i18next from '../../locales'
+
+const DEFAULT_TABLE_COLUMNS = [
+  {
+    head: i18next.t('序号'),
+    text: i18next.t('{{列.序号}}'),
+    style: { textAlign: 'center' },
+    headStyle: { textAlign: 'center' }
+  },
+  {
+    head: i18next.t('样品名称'),
+    text: i18next.t('{{列.样品名称}}'),
+    style: { textAlign: 'center' },
+    headStyle: { textAlign: 'center' }
+  },
+  {
+    head: i18next.t('样品编码'),
+    text: i18next.t('{{列.样品编码}}'),
+    style: { textAlign: 'center' },
+    headStyle: { textAlign: 'center' }
+  },
+  {
+    head: i18next.t('检测结果'),
+    text: i18next.t('{{列.检测结果}}'),
+    style: { textAlign: 'center' },
+    headStyle: { textAlign: 'center' }
+  }
+]
+
+class Store extends EditorStore {
+  constructor({ defaultTableDataKey }) {
+    super()
+    this.defaultTableDataKey = defaultTableDataKey
+  }
+
+  getDefaultTableConfig() {
+    return {
+      dataKey: this.defaultTableDataKey,
+      subtotal: { show: false },
+      columns: DEFAULT_TABLE_COLUMNS
+    }
+  }
+
+  @action
+  init(config, data) {
+    super.init(config, data)
+    this.defaultTableDataKey = 'examiningDetail'
+  }
+
+  @action.bound
+  addContent(name, index, type, tableConfig = null) {
+    if (type === 'table' && !tableConfig) {
+      tableConfig = this.getDefaultTableConfig()
+    }
+    super.addContent(name, index, type, tableConfig)
+    this.config = toJS(this.config)
+  }
+
+  @action
+  changeTableDataKey(name, key, options = {}) {
+    super.changeTableDataKey(name, key, options)
+    this.config = toJS(this.config)
+  }
+
+  @action
+  removeContent(name) {
+    super.removeContent(name)
+    this.config = toJS(this.config)
+  }
+}
+
+export default new Store({ defaultTableDataKey: 'examiningDetail' })

package/src/index.js

@@ -1,7 +1,9 @@
 // ‼️优先初始化语言设置(必须先初始化语言)
 import '../locales'
-import Editor from './editor'
+import Editor, { Editor2 } from './editor'
+
 import EditorPurchase from './editor_purchase'
+import examiningReportEditor from './examining_report_editor'
 import EditorStockIn from './editor_stockin'
 import EditorStockOut from './editor_stockout'
 import EditorSettle from './editor_settle'
@@ -27,9 +29,11 @@ export { setLocale } from '../locales'
 
 export {
   Editor,
+  Editor2,
   EditorStockIn,
   EditorStockOut,
   EditorPurchase,
+  examiningReportEditor,
   EditorSettle,
   EditorStatement,
   EditorAccoutStatement,

package/src/printer/printer.js

@@ -103,10 +103,10 @@ class Printer extends React.Component {
   componentDidMount() {
     const { printerStore, config, getremainpageHeight } = this.props
     const batchPrintConfig = config.batchPrintConfig
-    // 连续打印不需要计算
+    // didMount 代表第一次渲染完成
+    printerStore.setReady(true)
+    // 连续打印不需要分页计算
     if (batchPrintConfig !== 2) {
-      // didMount 代表第一次渲染完成
-      printerStore.setReady(true)
       printerStore.computedPages()
       if (config.autoFillConfig?.checked) {
         this.props.printerStore.setAutofillConfig(