@gm-mobile/c-react 3.9.1 → 3.9.3-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-mobile/c-react",
-  "version": "3.9.1",
+  "version": "3.9.3-beta.10",
   "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.1",
-    "@gm-mobile/c-tool": "^3.9.0",
-    "@gm-mobile/locales": "^3.9.1"
+    "@gm-mobile/c-font": "^3.9.3-beta.10",
+    "@gm-mobile/c-tool": "^3.9.3-beta.10",
+    "@gm-mobile/locales": "^3.9.3-beta.10"
   },
   "peerDependencies": {
     "@tarojs/components": "3.0.18",
@@ -33,5 +33,5 @@
     "prop-types": "^15.7.2",
     "react": "^16.13.1"
   },
-  "gitHead": "c5f87f6b8a00f0db61dc040476e364de97756644"
+  "gitHead": "319aa341cee95047c299feaa5206711113b4c092"
 }

package/src/component/button/button.tsx

@@ -5,19 +5,22 @@ import { Loading } from '../loading'
 import BaseButton from './base'
 import { is } from '@gm-mobile/c-tool'
 import type { ButtonProps } from './types'
+import { Flex } from '../flex'
 
 export const Button: FC<ButtonProps> = ({
   type = 'default',
   plain,
   mini,
   block,
-  noRound,
+  round,
   disabled,
   onClick = _.noop,
   loading,
   children,
   htmlType = 'button',
   className,
+  style,
+  minWidth,
   ...rest
 }) => {
   const [isLoading, setIsLoading] = useState<boolean>(false)
@@ -57,16 +60,22 @@ export const Button: FC<ButtonProps> = ({
         {
           'm-btn-block': block,
           'm-btn-mini': mini,
-          'm-btn-no-round': noRound,
+          'm-btn-round': round,
           'm-btn-plain': type !== 'link' && plain,
         },
         className
       )}
+      style={{
+        ...style,
+        minWidth,
+      }}
       disabled={!!(loadFlag || disabled)}
       onClick={handleClick}
     >
       {loadFlag && <Loading className='m-btn-loading' />}
-      {children}
+      <Flex alignCenter justifyCenter style={{ display: 'inline-flex' }}>
+        {children}
+      </Flex>
     </BaseButton>
   )
 }

package/src/component/button/stories.tsx

@@ -64,16 +64,15 @@ export const normal: FC<ButtonProps> = (args) => (
     </View>
     block
     <View>
-      <Button {...args} block type='primary'>
+      <Button {...args} block type='primary' round>
         主色
       </Button>
       <Button {...args} block mini plain>
         主色
       </Button>
     </View>
-    noRound
     <View>
-      <Button {...args} noRound type='primary'>
+      <Button {...args} type='primary'>
         主色
       </Button>
     </View>

package/src/component/button/style.less

@@ -2,18 +2,16 @@
   height: var(--m-size-form-height);
   line-height: var(--m-size-form-height);
   border-width: 0;
-  border-radius: var(--m-size-form-height);
   display: inline-block;
   text-align: center;
   vertical-align: middle;
   cursor: pointer;
   white-space: nowrap;
-  padding: 0 var(--m-size-form-height);
+  padding: 0 15px;
   font-size: var(--m-size-text-16);
   user-select: none;
   outline: none;
-  min-width: 180px;
-
+  border-radius: var(--m-btn-border-radius);
   &.m-btn-default {
     .mBtnVariants(var(--m-btn-color-bg-default), var(--m-btn-color-bg-default-active));
 
@@ -51,7 +49,6 @@
 
   &.m-btn-link {
     background: transparent;
-    border-radius: 0;
     color: var(--m-color-link);
     padding: 0 15px;
     min-width: 0;
@@ -78,11 +75,11 @@
     width: 100%;
   }
 
-  &.m-btn-no-round {
-    border-radius: 0;
+  &.m-btn-round {
+    border-radius: var(--m-size-form-height);
 
     &::after {
-      border-radius: 0;
+      border-radius: var(--m-size-form-height);
     }
   }
 
@@ -131,7 +128,7 @@
     top: 0;
     left: 0;
     border: 1px solid @borderColor;
-    border-radius: @height;
+    border-radius: calc(var(--m-btn-border-radius) * 2);
     transform: scale(0.5);
     transform-origin: 0 0;
     box-sizing: border-box;

package/src/component/button/types.ts

@@ -14,7 +14,7 @@ interface ButtonProps extends HTMLAttributes<HTMLButtonElement> {
   plain?: boolean
   mini?: boolean
   block?: boolean
-  noRound?: boolean
+  round?: boolean
   loading?: boolean
   /** 仅web 用。原生的 type */
   htmlType?: ButtonHTMLType
@@ -25,6 +25,7 @@ interface ButtonProps extends HTMLAttributes<HTMLButtonElement> {
   /** 返回 Promise 才有 loading */
   onClick?: (event: MouseEvent<HTMLButtonElement>) => void
   disabled?: boolean
+  minWidth?: string
 }
 interface ButtonTimeProps extends ButtonProps {
   /** 计时的时间 */

package/src/component/calendar/index.ts

@@ -5,5 +5,6 @@ export { default as MultipleCalendar } from './multiple_calendar'
 export type {
   BaseCalendarProps,
   RangeCalendarProps,
+  CalendarProps,
   MultipleCalendarProps,
 } from './types'

package/src/component/cell/cell.tsx

@@ -19,35 +19,37 @@ export const Cell: FC<CellProps> = ({
   ...rest
 }) => {
   return (
-    <Flex
-      {...rest}
-      alignCenter
-      className={classNames(
-        'm-cell',
-        {
-          'm-cell-access': access,
-          'm-cell-with-icon': icon,
-          'm-cell-no-active': noActive,
-        },
-        className
-      )}
-      onClick={onClick}
-    >
-      {icon && <View className='m-cell-icon'>{icon}</View>}
-      {left && <View className='m-cell-left'>{left}</View>}
-      <View className='m-cell-body'>{children}</View>
-      <Flex alignCenter>
-        {right &&
-          (_.isString(right) ? (
-            <View className='m-cell-right'>{right}</View>
-          ) : (
-            right
-          ))}
-        {access && (
-          <Text className='m-font m-font-angle-right m-cell-access-icon' />
+    <>
+      <Flex
+        {...rest}
+        alignCenter
+        className={classNames(
+          'm-cell',
+          {
+            'm-cell-access': access,
+            'm-cell-with-icon': icon,
+            'm-cell-no-active': noActive,
+          },
+          className
         )}
+        onClick={onClick}
+      >
+        {icon && <View className='m-cell-icon'>{icon}</View>}
+        {left && <View className='m-cell-left'>{left}</View>}
+        <View className='m-cell-body'>{children}</View>
+        <Flex alignCenter>
+          {right &&
+            (_.isString(right) ? (
+              <View className='m-cell-right'>{right}</View>
+            ) : (
+              right
+            ))}
+          {access && (
+            <Text className='m-font m-font-angle-right m-cell-access-icon' />
+          )}
+        </Flex>
       </Flex>
-    </Flex>
+    </>
   )
 }
 

package/src/component/cell/style.less

@@ -30,7 +30,6 @@
       background: var(--m-color-bg-white);
     }
   }
-  .mCellBorderBottomAfter(15px, 0);
 
   &.m-cell-access {
     cursor: pointer;
@@ -41,10 +40,6 @@
     }
   }
 
-  &.m-cell-with-icon {
-    .mCellBorderBottomAfter(50px, 0);
-  }
-
   .m-cell-icon {
     width: 35px;
   }
@@ -105,4 +100,12 @@
   .m-cell:not(.m-cell-form):last-child::after {
     display: none;
   }
+  
+  .m-cell {
+    .mCellBorderBottomAfter(15px, 0);
+
+    &.m-cell-with-icon {
+      .mCellBorderBottomAfter(50px, 0);
+    }
+  }
 }

package/src/component/dialog/dialog.tsx

@@ -44,6 +44,11 @@ const ErrorInput: FC<ErrorInputProps> = ({
 
 const DialogStatics: DialogStaticsTypes<string | RenderOptions> = {
   render(options, type) {
+    const autoHide = !(
+      typeof options === 'object' &&
+      options.onConfirm &&
+      typeof options.children === 'object'
+    )
     if (typeof options === 'string') {
       options = {
         children: options as string,
@@ -92,7 +97,7 @@ const DialogStatics: DialogStaticsTypes<string | RenderOptions> = {
         }
 
         Promise.resolve(result).then(() => {
-          DialogStatics.hide()
+          if (autoHide) DialogStatics.hide()
 
           return setTimeout(() => {
             resolve(type === 'prompt' ? inputValue : undefined)

package/src/component/dialog/types.ts

@@ -23,22 +23,23 @@ interface DialogBaseProps {
   promptGetError?: (value: string) => string | void
   hideBottom?: boolean
 }
-interface RenderOptions extends PromptOptions {
-  children?: string | React.ReactNode
-  confirmText?: React.ReactNode
-  onCancel?: () => void
-  otherText?: string
-  onOther?: () => void
-  hideBottom?: boolean
-}
 
 interface PromptOptions {
+  title?: string
   promptGetError?: (value: string) => string | void
   promptText?: string
   promptInputProps?: ErrorInputProps
   onConfirm?: (value: string) => void | boolean
 }
 
+interface RenderOptions extends PromptOptions {
+  children?: string | React.ReactNode
+  confirmText?: React.ReactNode
+  onCancel?: () => void
+  otherText?: string
+  onOther?: () => void
+  hideBottom?: boolean
+}
 interface DialogStaticsTypes<T> {
   render: (options: T, type?: string) => Promise<void | string>
   alert: (options: string | RenderOptions) => Promise<void | string>

package/src/component/digital_keyboard/Base.tsx

@@ -2,7 +2,7 @@ import React, { FC, HTMLAttributes } from 'react'
 // import { Flex, Popup, View } from '@gm-mobile/mp'
 import _ from 'lodash'
 import classNames from 'classnames'
-import Btn from './Btn'
+import DKBtn from './Btn'
 import './base.less'
 import './font/iconfont.css'
 import { View } from '../view'
@@ -11,11 +11,11 @@ import { Flex } from '../flex'
 
 /** 数字按钮 */
 export const defaultDigitalKeys = [
-  ...['7', '8', '9'].map((v, _) => new Btn({ label: v })),
-  ...['4', '5', '6'].map((v, _) => new Btn({ label: v })),
-  ...['1', '2', '3'].map((v, _) => new Btn({ label: v })),
-  new Btn({ label: '0' }),
-  new Btn({
+  ...['7', '8', '9'].map((v, _) => new DKBtn({ label: v })),
+  ...['4', '5', '6'].map((v, _) => new DKBtn({ label: v })),
+  ...['1', '2', '3'].map((v, _) => new DKBtn({ label: v })),
+  new DKBtn({ label: '0' }),
+  new DKBtn({
     label: '.',
     fn: (value = '') => {
       if (value === '') {
@@ -28,7 +28,7 @@ export const defaultDigitalKeys = [
       }
     },
   }),
-  new Btn({
+  new DKBtn({
     className: 'iconfont icon-backspace',
     fn: (value) => {
       if (value.length === 0) return value
@@ -39,9 +39,9 @@ export const defaultDigitalKeys = [
 
 /** 右侧功能按钮  */
 export const defaultActionKeys = [
-  new Btn({ label: '取消', fn: (_) => '' }),
-  new Btn({ label: '完成', className: 'm-bg-primary' }),
-  new Btn({
+  new DKBtn({ label: '取消', fn: (_) => '' }),
+  new DKBtn({ label: '完成', className: 'm-bg-primary' }),
+  new DKBtn({
     label: '大按钮',
     flex: 2,
     className: 'm-bg-primary',
@@ -57,9 +57,9 @@ export interface KeyboardProps
   /** 输入框当前值 */
   value: string
   /** 虚拟键盘的点击事件 */
-  onInput?: (value: string | undefined, key: Btn) => void
+  onInput?: (value: string | undefined, key: DKBtn) => void
   /** 虚拟键盘的功能键(actionKeys)点击事件 */
-  onAction?: (key: Btn) => void
+  onAction?: (key: DKBtn) => void
   /** 自定义功能键盘 */
   actionKeys?: typeof defaultActionKeys
   /** 自定义数字键盘 */
@@ -81,7 +81,7 @@ export const Keyboard: FC<KeyboardProps> = ({
   int,
   ...rest
 }) => {
-  const handleInput = (btn: Btn) => {
+  const handleInput = (btn: DKBtn) => {
     if (!btn.fn) {
       onInput && onInput(undefined, btn)
       return

package/src/component/digital_keyboard/Btn.ts

@@ -1,4 +1,4 @@
-export class Btn {
+export class DKBtn {
   /** 按钮文本 */
   label?: string
   /** 按钮占位，默认1个位置 */
@@ -8,7 +8,7 @@ export class Btn {
   /** 按钮功能,传入value为输入框当前值，返回一个按钮功能处理后的值 */
   fn?: (value: string) => string
   type?: 'digit' | 'action'
-  constructor({ label = '', flex = 0, className = '', fn }: Btn) {
+  constructor({ label = '', flex = 0, className = '', fn }: DKBtn) {
     this.type = /([0-9.])/.test(label) ? 'digit' : 'action'
     if (!fn && this.type === 'digit') {
       fn = (value = '') => value + label
@@ -17,4 +17,4 @@ export class Btn {
   }
 }
 
-export default Btn
+export default DKBtn

package/src/component/digital_keyboard/index.tsx

@@ -1,10 +1,10 @@
-import React, { ReactNode, useEffect, useState } from 'react'
+import React, { ReactNode, useEffect, useRef, useState } from 'react'
 import { makeObservable } from 'mobx'
 import { Keyboard, KeyboardProps } from './Base'
 import { observer } from 'mobx-react'
 import { clamp } from 'lodash'
 import { View } from '../view'
-import Btn from './Btn'
+import { DKBtn } from './Btn'
 import { Popup } from '../popup'
 
 /** 是否小程序端 */
@@ -30,6 +30,7 @@ export type DigitalKeyboardProps = Omit<KeyboardProps, 'value' | 'int'> & {
   min?: number
   /** 最大值 */
   max?: number
+  withUseRef?: boolean
 }
 
 export class DigitalKeyboard {
@@ -45,11 +46,12 @@ export class DigitalKeyboard {
     min,
     max,
     style,
+    withUseRef = true,
     ...rest
   }: DigitalKeyboardProps) {
     this.form = form
     this.active = active || Object.keys(form)[0]
-    const Children = observer(() => {
+    const Node = observer(() => {
       const sys = mp && wx.getSystemInfoSync()
       const safeMargin =
         withSafeArea && mp ? sys.screenHeight - sys.safeArea.bottom : 5
@@ -125,7 +127,7 @@ export class DigitalKeyboard {
         </View>
       )
     })
-    this.children = <Children />
+    this.node = <Node />
     makeObservable(this, {
       form: true,
       active: true,
@@ -135,6 +137,8 @@ export class DigitalKeyboard {
       int: true,
       setInt: true,
     })
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    return withUseRef ? useRef(this).current : this
   }
 
   active: string
@@ -144,7 +148,7 @@ export class DigitalKeyboard {
   }
 
   /** 键盘组件 */
-  readonly children: ReactNode
+  readonly node: ReactNode
   /** 整数型键盘 */
   int = false
   /** 设置为整数型键盘 */
@@ -156,8 +160,8 @@ export class DigitalKeyboard {
   /** 自定义功能按钮 */
   get actionKeys() {
     return [
-      new Btn({ label: '清零', fn: (_) => '' }),
-      new Btn({
+      new DKBtn({ label: '清零', fn: (_) => '' }),
+      new DKBtn({
         label: '下一个',
         className: 'm-bg-primary m-text-white',
         fn: (value) => {
@@ -165,7 +169,7 @@ export class DigitalKeyboard {
           return this.form[this.active]
         },
       }),
-      new Btn({
+      new DKBtn({
         label: '确认',
         flex: 2,
         className: 'm-bg-primary m-text-white',
@@ -211,7 +215,7 @@ export class DigitalKeyboard {
       disabledHeader: true,
       disabledAnimate: false,
       bottom: true,
-      children: this.children,
+      children: this.node,
     })
     mp && wx.hideKeyboard()
   }
@@ -222,4 +226,4 @@ export class DigitalKeyboard {
 }
 export default DigitalKeyboard
 
-export { Btn } from './Btn'
+export { DKBtn } from './Btn'

package/src/component/digital_keyboard/stories.tsx

@@ -3,7 +3,7 @@ import { Story } from '@storybook/react'
 import { TextField } from '../text_field'
 import { DigitalKeyboard, DigitalKeyboardProps } from '.'
 import { Text } from '../text'
-import { Btn } from './Btn'
+import { DKBtn } from './Btn'
 import { View } from '../view'
 import { Toast } from '../toast'
 import { Page } from '../page'
@@ -19,19 +19,17 @@ const Template: Story<DigitalKeyboardProps> = (args) => {
     apple: '1.00',
     peach: '0.50',
   }
-  const { current: keyboard } = useRef(
-    new DigitalKeyboard({
-      ...args,
-      form: form,
-      active: '',
-      async onAction(btn) {
-        if (btn.label === '确认') {
-          console.log('result:', 'apple', keyboard.get('apple'))
-          keyboard.hide()
-        }
-      },
-    })
-  )
+  const keyboard = new DigitalKeyboard({
+    ...args,
+    form: form,
+    active: '',
+    async onAction(btn) {
+      if (btn.label === '确认') {
+        console.log('result:', 'apple', keyboard.get('apple'))
+        keyboard.hide()
+      }
+    },
+  })
 
   return (
     <View style={{ height: '300px' }}>
@@ -60,7 +58,7 @@ const Template: Story<DigitalKeyboardProps> = (args) => {
 export const Usage = Template.bind({})
 Usage.argTypes = {
   form: {
-    description: '`Object` 表单的字段键值对',
+    description: '`Object` 表单的字段键值对，可以通过.set增改，通过.get读取',
     type: {
       required: true,
     },
@@ -122,13 +120,13 @@ Usage.argTypes = {
   },
   onInput: {
     description:
-      '`(value: string | undefined, key: Btn) => void` 虚拟键盘的点击事件',
+      '`(value: string | undefined, key: DKBtn) => void` 虚拟键盘的点击事件',
     control: false,
     type: {},
   },
   onAction: {
     description:
-      '`(value: string | undefined, key: Btn) => void` 虚拟键盘的功能键(actionKeys)点击事件',
+      '`(value: string | undefined, key: DKBtn) => void` 虚拟键盘的功能键(actionKeys)点击事件',
     control: false,
     type: {},
   },
@@ -154,7 +152,7 @@ Usage.argTypes = {
       name: 'function',
     },
   },
-  '.children': {
+  '.node': {
     description: '`ReactComponent` 键盘组件节点',
     type: {
       name: 'function',
@@ -210,12 +208,10 @@ export const CustomLayout = () => {
     apple: '1.00',
     peach: '0.50',
   }
-  const { current: keyboard } = useRef(
-    new DigitalKeyboard({
-      form: form,
-      active: '',
-    })
-  )
+  const keyboard = new DigitalKeyboard({
+    form: form,
+    active: '',
+  })
 
   return (
     <Page style={{ width: '100%' }}>
@@ -228,7 +224,7 @@ export const CustomLayout = () => {
         头部
       </Flex>
       <View>显示在指定位置</View>
-      <View>{keyboard.children}</View>
+      <View>{keyboard.node}</View>
       <Flex
         height='100px'
         className='m-bg-accent m-margin-tb-10'
@@ -246,7 +242,7 @@ export const CustomActions = () => {
   class Keyboard extends DigitalKeyboard {
     get actionKeys() {
       return [
-        new Btn({
+        new DKBtn({
           className: 'm-bg-accent m-text-white',
           label: '自定义',
           fn: (value) => {
@@ -254,7 +250,7 @@ export const CustomActions = () => {
             return '一键输入自定义内容'
           },
         }),
-        new Btn({
+        new DKBtn({
           label: '确认',
           flex: 3,
           className: 'm-bg-primary m-text-white',
@@ -267,20 +263,18 @@ export const CustomActions = () => {
     }
   }
 
-  const { current: keyboard } = useRef(
-    new Keyboard({
-      rewriteMode: true,
-      fractionDigits: 2,
-      min: 0,
-      max: 9999.99,
-      // 也可以通过这里自定义keys
-      // digitalKeys: [],
-      // actionKeys: [],
-      form: {
-        input: '',
-      },
-    })
-  )
+  const keyboard = new Keyboard({
+    rewriteMode: true,
+    fractionDigits: 2,
+    min: 0,
+    max: 9999.99,
+    // 也可以通过这里自定义keys
+    // digitalKeys: [],
+    // actionKeys: [],
+    form: {
+      input: '',
+    },
+  })
   return (
     <View style={{ height: '300px' }}>
       <TextField

package/src/component/draggable/draggable.tsx

@@ -197,6 +197,7 @@ export const Draggable: FC<DraggableProps> = ({
     justifyContent: 'center',
     cursor: 'pointer',
     userSelect: 'none',
+    zIndex: 2,
   }
   const options: any = mp
     ? {