@gm-mobile/c-react 3.9.3-beta.3 → 3.9.3-beta.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gm-mobile/c-react",
-  "version": "3.9.3-beta.3",
+  "version": "3.9.3-beta.8",
   "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.3",
-    "@gm-mobile/c-tool": "^3.9.3-beta.3",
-    "@gm-mobile/locales": "^3.9.3-beta.3"
+    "@gm-mobile/c-font": "^3.9.3-beta.8",
+    "@gm-mobile/c-tool": "^3.9.3-beta.8",
+    "@gm-mobile/locales": "^3.9.3-beta.8"
   },
   "peerDependencies": {
     "@tarojs/components": "3.0.18",
@@ -33,5 +33,5 @@
     "prop-types": "^15.7.2",
     "react": "^16.13.1"
   },
-  "gitHead": "9f44aa37c49971d60bc29358ce64aaf0c0d15ed8"
+  "gitHead": "1a399bd891e2971777a509ddf1968d77dcd514a7"
 }

package/src/component/button/button.tsx

@@ -73,7 +73,9 @@ export const Button: FC<ButtonProps> = ({
       onClick={handleClick}
     >
       {loadFlag && <Loading className='m-btn-loading' />}
-      <Flex alignCenter>{children}</Flex>
+      <Flex alignCenter justifyCenter style={{ display: 'inline-flex' }}>
+        {children}
+      </Flex>
     </BaseButton>
   )
 }

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/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/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'
 
 /** 是否小程序端 */
@@ -49,7 +49,7 @@ export class DigitalKeyboard {
   }: 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 +125,7 @@ export class DigitalKeyboard {
         </View>
       )
     })
-    this.children = <Children />
+    this.node = <Node />
     makeObservable(this, {
       form: true,
       active: true,
@@ -135,6 +135,8 @@ export class DigitalKeyboard {
       int: true,
       setInt: true,
     })
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    return useRef(this).current
   }
 
   active: string
@@ -144,7 +146,7 @@ export class DigitalKeyboard {
   }
 
   /** 键盘组件 */
-  readonly children: ReactNode
+  readonly node: ReactNode
   /** 整数型键盘 */
   int = false
   /** 设置为整数型键盘 */
@@ -156,8 +158,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 +167,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 +213,7 @@ export class DigitalKeyboard {
       disabledHeader: true,
       disabledAnimate: false,
       bottom: true,
-      children: this.children,
+      children: this.node,
     })
     mp && wx.hideKeyboard()
   }
@@ -222,4 +224,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' }}>
@@ -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
     ? {

package/src/component/layout_root/layout_root.tsx

@@ -24,7 +24,6 @@ const LayoutRoot: FC & LayoutRootStatic = () => {
         [type]: component,
       }))
     }
-
     return () => {
       delete cbMap[path]
     }

package/src/component/text_field/TextField.tsx

@@ -170,6 +170,7 @@ export class TextField extends Component<TextFieldProps, TextFieldState> {
       onClick,
       onConfirm,
       fractionDigits,
+      alwaysEmbed = true,
       ...rest
       // 注意，不用传给input或area的props要在此列出来，不然rest会带过去
     } = this.props
@@ -207,6 +208,7 @@ export class TextField extends Component<TextFieldProps, TextFieldState> {
         focus,
         password,
         placeholderClass: 'text-field-placeholder',
+        alwaysEmbed: alwaysEmbed,
         onConfirm,
       })
     } else {
@@ -300,7 +302,9 @@ export class TextField extends Component<TextFieldProps, TextFieldState> {
             </Flex>
           )}
           <View
-            className={classNames('text-field-error-message', errClassName)}
+            className={classNames('text-field-error-message', errClassName, {
+              'has-error': err,
+            })}
           >
             {err}
           </View>

package/src/index.less

@@ -42,6 +42,7 @@
 // 公共
 @import './less/mixin';
 @import './less/base';
+@import './less/button';
 @import './less/distance';
 @import './less/bg';
 @import './less/display';
@@ -51,7 +52,6 @@
 @import './less/border';
 @import './less/animation';
 @import './less/shadow';
-@import './less/btn';
 @import './less/ellipsis';
 @import './less/lineheight';
-@import './less/opacity';
+@import './less/opacity';

package/src/less/bg.less

@@ -26,6 +26,10 @@
   background: var(--m-color-bg-accent-light) !important;
 }
 
+.m-bg-transparent {
+  background: transparent !important;
+}
+
 .m-bg-white-active-with {
   .mBgWhiteActiveWith();
 }
@@ -61,4 +65,7 @@ each(@colors,.(@color,@colorKey,@index){
     .generate-colors(@opacity+1);
   }
   .generate-colors(0);
+  .m-bg-@{colorKey}{
+    background-color: @color!important;
+  }
 });

package/src/less/{btn.less → button.less}

@@ -46,7 +46,7 @@
   padding: 0 10px;
   border-radius: 3px;
   box-sizing: border-box;
-  line-height: 1;
+  line-height: 2;
   min-height: @button-normal;
   cursor: pointer;
   user-select: none;
@@ -68,6 +68,7 @@
 }
 .m-button {
   .m-button-text();
+  line-height: 1;
   background-color: @button-with-white-text[default];
 }
 
@@ -112,6 +113,7 @@ each(@button-with-black-text,.(@value,@key,@index){
 
 .m-button-icon {
   .m-button-text();
+  line-height: 1;
   min-width: @button-normal;
   padding: 10px;
   border-radius: 50%;

package/src/less/text.less

@@ -1,27 +1,3 @@
-.m-text-20 {
-  font-size: var(--m-size-text-20) !important;
-}
-
-.m-text-18 {
-  font-size: var(--m-size-text-18) !important;
-}
-
-.m-text-16 {
-  font-size: var(--m-size-text-16) !important;
-}
-
-.m-text-14 {
-  font-size: var(--m-size-text-14) !important;
-}
-
-.m-text-12 {
-  font-size: var(--m-size-text-12) !important;
-}
-
-.m-text-10 {
-  font-size: var(--m-size-text-10) !important;
-}
-
 .m-text-center {
   text-align: center !important;
 }
@@ -123,4 +99,20 @@ each(@colors,.(@color,@colorKey,@index){
     .generate-colors(@opacity+1);
   }
   .generate-colors(0);
+  .m-text-@{colorKey}{
+    color: @color!important;
+  }
 });
+
+// 生成size, .m-text-{8-32}, --m-size-text-{8-32}
+.generate-size(@size) when (@size<=32) {
+  :root,
+  page {
+    --m-size-text-@{size}: ~'@{size}px';
+  }
+  .m-text-@{size} {
+    font-size: e(%('var(--m-size-text-%s)!important', @size));
+  }
+  .generate-size(@size + 2);
+}
+.generate-size(8);

package/src/less/variable.less

@@ -91,14 +91,6 @@ page {
 // 非颜色
 :root,
 page {
-  // 字体尺寸
-  --m-size-text-10: 10px;
-  --m-size-text-12: 12px;
-  --m-size-text-14: 14px;
-  --m-size-text-16: 16px;
-  --m-size-text-18: 18px;
-  --m-size-text-20: 20px;
-
   // line-height
   --m-size-line-height: 1.6;