gm-printer 10.30.2-beta.9 → 10.31.1-beta.0

package/package.json

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

package/src/common/component.js

@@ -676,6 +676,41 @@ TipInfo.propTypes = {
   color: PropTypes.string
 }
 
+const Checkbox = ({
+  id,
+  value,
+  radioChecked,
+  checked,
+  style,
+  inputName,
+  disabled
+}) => (
+  <div style={style}>
+    <input
+      type='checkbox'
+      value={value}
+      id={id}
+      name={inputName ?? 'radio'}
+      onChange={radioChecked}
+      checked={checked}
+      style={{ margin: '5px 5px 0 0' }}
+      disabled={disabled}
+    />
+    <label htmlFor={id}>{value}</label>
+    <Gap />
+  </div>
+)
+
+Checkbox.propTypes = {
+  id: PropTypes.string,
+  value: PropTypes.string,
+  style: PropTypes.string,
+  inputName: PropTypes.string,
+  radioChecked: PropTypes.func,
+  checked: PropTypes.bool,
+  disabled: PropTypes.bool
+}
+
 export {
   Text,
   Textarea,
@@ -696,5 +731,6 @@ export {
   Gap,
   RadioGap,
   FieldBtn,
-  TipInfo
+  TipInfo,
+  Checkbox
 }

package/src/common/editor_special_other_field.js

@@ -0,0 +1,45 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import { Gap, Checkbox } from './component'
+import { observer, inject } from 'mobx-react'
+
+@inject('editStore')
+@observer
+class SpecialOtherField extends React.Component {
+  render() {
+    const { addFields, mockData, editStore } = this.props
+    const specialOtherFields = addFields.specialOtherFields
+    const tableData = mockData?._table
+    const checked = editStore?.config?.specialOtherConfig || []
+    const specialConfig = editStore?.config?.specialConfig
+    return (
+      <div>
+        {specialOtherFields &&
+          specialOtherFields.map(fields => (
+            <Checkbox
+              id={fields.id}
+              value={fields.value}
+              key={fields.id}
+              checked={checked.includes(fields.id)}
+              radioChecked={() =>
+                editStore.multipleRadioChecked(fields, tableData)
+              }
+              disabled={specialConfig === 'noSpecail'}
+            />
+          ))}
+
+        <Gap />
+      </div>
+    )
+  }
+}
+
+SpecialOtherField.propTypes = {
+  fields: PropTypes.object,
+  handleAddField: PropTypes.func,
+  addFields: PropTypes.object.isRequired,
+  editStore: PropTypes.object,
+  mockData: PropTypes.object.isRequired
+}
+
+export default SpecialOtherField

package/src/common/editor_store.js

@@ -968,9 +968,32 @@ class EditorStore {
 
   @action.bound
   radioChecked(fields) {
+    if (fields.id === 'noSpecail') {
+      this.config.specialOtherConfig = []
+    }
     this.config.specialConfig = fields.id
   }
 
+  @action.bound
+  multipleRadioChecked(fields) {
+    if (this.config.specialConfig === 'noSpecail') {
+      this.config.specialOtherConfig = []
+      return
+    }
+    const arr = this.config?.specialOtherConfig
+      ? [...this.config.specialOtherConfig]
+      : []
+    if (arr.includes(fields.id)) {
+      // 如果已选中，则取消选中
+      const index = arr.indexOf(fields.id)
+      arr.splice(index, 1)
+    } else {
+      // 如果未选中，则添加
+      arr.push(fields.id)
+    }
+    this.config.specialOtherConfig = arr
+  }
+
   @action
   removeField() {
     if (!this.selected) {

package/src/editor/editor.js

@@ -8,6 +8,7 @@ import { observer, inject } from 'mobx-react'
 import EditorTitle from '../common/editor_title'
 import EditorSelect from '../common/editor_select'
 import SpecialField from '../common/editor_special_field'
+import SpecialOtherField from '../common/editor_special_other_field'
 import EditorField from '../common/editor_edit_field'
 import EditorAddField from '../common/editor_add_field'
 import EditorPageSummary from '../common/editor_page_summary'
@@ -85,6 +86,7 @@ class Editor extends React.Component {
             <EditorSelect />
             <Gap height='5px' />
             <SpecialField addFields={addFields} mockData={mockData} />
+            <SpecialOtherField addFields={addFields} mockData={mockData} />
             <EditorCutomizedConfig />
             <Gap height='5px' />
             <EditorField

package/src/printer/table_special_tr.js

@@ -32,6 +32,13 @@ const SpecialTr = ({ data, config }) => {
     compiled = () => template_text
   }
 
+  const defaultFields = [
+    {
+      valueField: '下单金额'
+    }
+  ]
+  const newFields = fields || defaultFields
+
   switch (type) {
     case 'flex':
       // eslint-disable-next-line no-case-declarations
@@ -95,6 +102,13 @@ const SpecialTr = ({ data, config }) => {
         throw Error('_special缺少text,请检查data_to_key处理table数据代码!')
 
       if (isUpperLowerCaseSeparate) {
+        const UpperCaseBefore =
+          data[newFields[0].valueField]
+            ?.upperLowerCaseSeparateAndUpperCaseBefore
+
+        const htmlStr = isUpperCaseBefore
+          ? UpperCaseBefore
+          : data[newFields[0].valueField]?.upperLowerCaseSeparate
         return (
           <tr>
             <td
@@ -102,11 +116,10 @@ const SpecialTr = ({ data, config }) => {
               style={Object.assign({ fontWeight: 'bold' }, style)}
             >
               <Flex
-                className='gm-flex-justify-between'
+                className='gm-flex-page gm-flex-justify-between-page'
+                style={{ 'justify-content': 'space-between' }}
                 dangerouslySetInnerHTML={{
-                  __html:
-                    data[fields[0].valueField]?.upperLowerCaseSeparate ||
-                    data.text
+                  __html: htmlStr || data.text
                 }}
               />
             </td>
@@ -117,12 +130,12 @@ const SpecialTr = ({ data, config }) => {
       // eslint-disable-next-line no-case-declarations
       const getHtml = () => {
         if (isUpperCaseBefore) {
-          return data[fields[0].valueField]?.upperCaseBefore
+          return data[newFields[0].valueField]?.upperCaseBefore
         }
         if (needUpperCase) {
-          return data[fields[0].valueField]?.upperCaseText
+          return data[newFields[0].valueField]?.upperCaseText
         }
-        return data[fields?.[0]?.valueField]?.text || data.text
+        return data[newFields[0]?.valueField]?.text || data.text
       }
 
       return (