@gm-mobile/c-react 3.9.3-beta.17 → 3.9.3-beta.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-mobile/c-react",
-  "version": "3.9.3-beta.17",
+  "version": "3.9.3-beta.20",
   "description": "> TODO: description",
   "author": "liyatang <liyatang@qq.com>",
   "homepage": "https://github.com/gmfe/gm-mobile#readme",
@@ -21,9 +21,9 @@
     "url": "https://github.com/gmfe/gm-mobile/issues"
   },
   "dependencies": {
-    "@gm-mobile/c-font": "^3.9.3-beta.17",
-    "@gm-mobile/c-tool": "^3.9.3-beta.17",
-    "@gm-mobile/locales": "^3.9.3-beta.17"
+    "@gm-mobile/c-font": "^3.9.3-beta.20",
+    "@gm-mobile/c-tool": "^3.9.3-beta.20",
+    "@gm-mobile/locales": "^3.9.3-beta.20"
   },
   "peerDependencies": {
     "@tarojs/components": "3.0.18",
@@ -33,5 +33,5 @@
     "prop-types": "^15.7.2",
     "react": "^16.13.1"
   },
-  "gitHead": "e78a422ee30327fbfd97136029423ba39c42c613"
+  "gitHead": "257d61e68ef1a76de48d9202a1a7b3c95c656f9d"
 }

package/src/component/dialog/common/base.less

@@ -0,0 +1,3 @@
+.m-customer-dialog-header{
+  background-color: var(--m-color-bg-back);
+}

package/src/component/dialog/common/base.tsx

@@ -1,6 +1,7 @@
 import React, { ReactNode } from 'react'
 import { Flex, Popup, View, Button } from '../../..'
 import { noop } from 'lodash'
+import './base.less'
 
 interface Option<T> {
   title: ReactNode
@@ -54,7 +55,11 @@ export function showDialog<T>({
     const Template = () => {
       return (
         <Flex column className='m-border-radius m-overflow-hidden m-bg-white'>
-          <Flex justifyBetween alignCenter className='m-padding-10 m-bg-back'>
+          <Flex
+            justifyBetween
+            alignCenter
+            className='m-customer-dialog-header m-padding-10'
+          >
             <Flex flex>{left}</Flex>
             <Flex
               flex
@@ -68,7 +73,6 @@ export function showDialog<T>({
                 <Button
                   mini
                   plain
-                  noRound
                   type='link'
                   className='m-text-desc m-margin-lr-0'
                   onClick={cancel}
@@ -81,7 +85,7 @@ export function showDialog<T>({
           {children}
           {bottom || (
             <Flex className='m-padding-lr-10'>
-              <Button block noRound type='primary' onClick={() => ok()}>
+              <Button block type='primary' onClick={() => ok()}>
                 {okText}
               </Button>
             </Flex>
@@ -94,7 +98,7 @@ export function showDialog<T>({
       disabledHeader: true,
       [direction]: true,
       disabledAnimate: false,
-      onHide: Popup.hide,
+      onHide: cancel,
       children: <Template />,
     })
   })

package/src/component/dialog/common/choose.tsx

@@ -24,6 +24,7 @@ export interface ChooseProps {
   /** 搜索功能 */
   // search?: boolean
   maxHeight?: string
+  onCancel?: () => void
 }
 
 /** 底部弹出的选择界面 */
@@ -34,6 +35,7 @@ export default function ({
   multiSelect = false,
   defaultSelected = [],
   maxHeight = '50vh',
+  onCancel,
 }: ChooseProps) {
   if (multiSelect) needConfirm = true
   const selected = [...defaultSelected] as Item[]
@@ -93,6 +95,7 @@ export default function ({
     title,
     children: <Children />,
     onOk: () => selected,
+    onCancel: onCancel,
     bottom: needConfirm ? undefined : <View />,
   })
   return promise

package/src/component/text_field/TextField.tsx

@@ -94,7 +94,6 @@ export class TextField extends Component<TextFieldProps, TextFieldState> {
       !value.endsWith('.') &&
       ['digit', 'number'].includes(this.props.type || '')
     ) {
-      console.log(value)
       const float = parseFloat(value.replace(/\D\./g, ''))
       if (isNaN(float)) {
         value = ''