gm-printer 10.16.0-beta.0 → 10.16.0-beta.2

package/package.json

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

package/src/common/editor_edit_field.js

@@ -569,63 +569,67 @@ class EditorField extends React.Component {
           style={{ width: '65px', margin: '5px 0 5px 80px' }}
         />
         {/* 自定义整单合计 */}
-        <Flex>
-          <Flex>{i18next.t('自定义整单合计')}：</Flex>
-          <div>
-            <Fonter
-              style={diyOverallOrderStyle}
-              onChange={this.handleOverallOrderStyleChange}
-            />
-            <Separator />
-            <TextAlign
-              style={overallOrderStyle}
-              onChange={this.handleOverallOrderStyleChange}
-            />
-            <EditorSubtotalCheck
-              subtotalCheckDisabled
-              subtotalChecked={diyOverallOrderNeedUpperCase}
-              subtotalCheckOnChange={editStore.setDiyOverallOrderUpperCase}
-              subtotalCheckText='显示大写金额'
-              marginLeft
-            />
-            <EditorSubtotalCheck
-              subtotalCheckDisabled={diyOverallOrderNeedUpperCase}
-              subtotalChecked={diyOverallOrderCaseBefore}
-              subtotalCheckOnChange={
-                editStore.setDiyOverallOrderUpperCaseBefore
-              }
-              subtotalCheckText='大写金额在前'
-              marginLeft
-            />
-            <EditorSubtotalCheck
-              subtotalCheckDisabled={diyOverallOrderNeedUpperCase}
-              subtotalChecked={diyOverallOrderUpperLowerCaseSeparate}
-              subtotalCheckOnChange={
-                editStore.setDiyOverallOrderUpperLowerCaseSeparate
-              }
-              subtotalCheckText='大、小写金额分左右两边展示'
-              marginLeft
-            />
-            <Flex>
-              <Flex alignCenter>文案修改：</Flex>
-              <Text
-                value={
-                  diyOverallOrder && diyOverallOrder?.fields?.[0]
-                    ? diyOverallOrder.fields[0].name
-                    : ''
+        {editStore.config.showDiyOverAllOrder && (
+          <Flex>
+            <Flex>{i18next.t('自定义整单合计')}：</Flex>
+            <div>
+              <Fonter
+                style={diyOverallOrderStyle}
+                onChange={this.handleDiyOverallOrderStyleChange}
+              />
+              <Separator />
+              <TextAlign
+                style={diyOverallOrderStyle}
+                onChange={this.handleDiyOverallOrderStyleChange}
+              />
+              <EditorSubtotalCheck
+                subtotalCheckDisabled
+                subtotalChecked={diyOverallOrderNeedUpperCase}
+                subtotalCheckOnChange={editStore.setDiyOverallOrderUpperCase}
+                subtotalCheckText='显示大写金额'
+                marginLeft
+              />
+              <EditorSubtotalCheck
+                subtotalCheckDisabled={diyOverallOrderNeedUpperCase}
+                subtotalChecked={diyOverallOrderCaseBefore}
+                subtotalCheckOnChange={
+                  editStore.setDiyOverallOrderUpperCaseBefore
                 }
-                onChange={editStore.setDiyOverallOrderFields}
-                style={{ width: '100px', margin: '5px 0 5px 0px' }}
+                subtotalCheckText='大写金额在前'
+                marginLeft
               />
-            </Flex>
-            <Textarea
-              value={diyOverallOrderValueField}
-              placeholder={i18next.t('请输入要整单合计字段')}
-              onChange={value => editStore.setDiyOverallOrderValueField(value)}
-            />
-            <TipInfo text={i18next.t('不支持双栏和三栏模式')} />
-          </div>
-        </Flex>
+              <EditorSubtotalCheck
+                subtotalCheckDisabled={diyOverallOrderNeedUpperCase}
+                subtotalChecked={diyOverallOrderUpperLowerCaseSeparate}
+                subtotalCheckOnChange={
+                  editStore.setDiyOverallOrderUpperLowerCaseSeparate
+                }
+                subtotalCheckText='大、小写金额分左右两边展示'
+                marginLeft
+              />
+              <Flex>
+                <Flex alignCenter>文案修改：</Flex>
+                <Text
+                  value={
+                    diyOverallOrder && diyOverallOrder?.fields?.[0]
+                      ? diyOverallOrder.fields[0].name
+                      : ''
+                  }
+                  onChange={editStore.setDiyOverallOrderFields}
+                  style={{ width: '100px', margin: '5px 0 5px 0px' }}
+                />
+              </Flex>
+              <Textarea
+                value={diyOverallOrderValueField}
+                placeholder={i18next.t('请输入要整单合计字段')}
+                onChange={value =>
+                  editStore.setDiyOverallOrderValueField(value)
+                }
+              />
+              <TipInfo text={i18next.t('不支持双栏和三栏模式')} />
+            </div>
+          </Flex>
+        )}
       </div>
     )
   }

package/src/editor/context_menu.js

@@ -93,7 +93,8 @@ class ContextMenu extends React.Component {
     const {
       editStore: {
         config: {
-          page: { type }
+          page: { type },
+          showDiyOverAllOrder
         },
         isAutoFilling
       }
@@ -155,7 +156,7 @@ class ContextMenu extends React.Component {
         >
           {i18next.t('整单合计')}
         </div>
-        {!isMultiTable(dataKey) && (
+        {!isMultiTable(dataKey) && showDiyOverAllOrder && (
           <div
             onClick={this.handleDiyOverallOrder.bind(this, name)}
             className={isDiyOverallOrder ? 'active' : ''}