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

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
     ? {

package/src/component/error/error.tsx

@@ -0,0 +1,23 @@
+import React, { FC } from 'react'
+import classNames from 'classnames'
+import _ from 'lodash'
+import { View } from '../view'
+import { ErrorProps } from './types'
+import { Text } from '../text'
+
+export const Error: FC<ErrorProps> = ({ className, topLine, children }) => {
+  return children ? (
+    <View
+      className={classNames('error', className, {
+        'm-border-1px-top-before': topLine,
+        'has-error': !!children,
+      })}
+    >
+      <View className='error-message'>{children}</View>
+    </View>
+  ) : (
+    <></>
+  )
+}
+
+export default Error

package/src/component/error/index.ts

@@ -0,0 +1 @@
+export { default as Error } from './error'

package/src/component/error/style.less

@@ -0,0 +1,42 @@
+.error {
+  @red: fade(red, 50);
+  color: @red;
+  font-size: 10px;
+  width: 100%;
+  padding: 5px 0;
+  &.m-border-1px-top-before::before {
+    border-color: @red;
+  }
+  .error-message {
+    display: inline-block;
+    animation-name: headShake;
+    animation-timing-function: ease;
+    animation-duration: 0.75s;
+  }
+}
+
+@keyframes headShake {
+  0% {
+    transform: translateX(0);
+  }
+
+  6.5% {
+    transform: translateX(-6px) rotateY(-9deg);
+  }
+
+  18.5% {
+    transform: translateX(5px) rotateY(7deg);
+  }
+
+  31.5% {
+    transform: translateX(-3px) rotateY(-5deg);
+  }
+
+  43.5% {
+    transform: translateX(2px) rotateY(3deg);
+  }
+
+  50% {
+    transform: translateX(0);
+  }
+}

package/src/component/error/types.ts

@@ -0,0 +1,5 @@
+import { HTMLAttributes } from 'react'
+
+export interface ErrorProps extends HTMLAttributes<HTMLDivElement> {
+  topLine?: boolean
+}

package/src/component/layout_root/layout_root.tsx

@@ -1,4 +1,10 @@
-import React, { FC, useState, ReactNode, useEffect } from 'react'
+import React, {
+  FC,
+  useState,
+  ReactNode,
+  useEffect,
+  HTMLAttributes,
+} from 'react'
 import _ from 'lodash'
 import { is } from '@gm-mobile/c-tool'
 
@@ -13,7 +19,10 @@ import {
 
 const cbMap: CBMapType = {}
 
-const LayoutRoot: FC & LayoutRootStatic = () => {
+const LayoutRoot: FC<HTMLAttributes<HTMLDivElement>> & LayoutRootStatic = ({
+  style,
+  ...rest
+}) => {
   const [state, setState] = useState<LayoutRootState>({})
   const path: string = getPath()
 
@@ -24,7 +33,6 @@ const LayoutRoot: FC & LayoutRootStatic = () => {
         [type]: component,
       }))
     }
-
     return () => {
       delete cbMap[path]
     }
@@ -32,7 +40,15 @@ const LayoutRoot: FC & LayoutRootStatic = () => {
 
   // 有层级关系
   return (
-    <View>
+    <View
+      style={{
+        ...style,
+        display: Object.keys(state).find((k) => !!state[k as 'popup'])
+          ? 'block'
+          : 'none',
+      }}
+      {...rest}
+    >
       {state.innerLayer}
       {state.popup}
       {state.picker}

package/src/component/layout_root/layout_root_v1.tsx

@@ -1,4 +1,10 @@
-import React, { FC, useState, ReactNode, useEffect } from 'react'
+import React, {
+  FC,
+  useState,
+  ReactNode,
+  useEffect,
+  HTMLAttributes,
+} from 'react'
 import _ from 'lodash'
 import { is } from '@gm-mobile/c-tool'
 
@@ -16,7 +22,10 @@ const cbMap: CBMapV1Type = {}
 /**
  * @description: 目前仅用于Popup的多层弹窗
  */
-const LayoutRootV1: FC & LayoutV1RootStatic = () => {
+const LayoutRootV1: FC<HTMLAttributes<HTMLDivElement>> & LayoutV1RootStatic = ({
+  style,
+  ...rest
+}) => {
   const path = getPath()
   const [state, setState] = useState<LayoutRootState>({})
 
@@ -52,7 +61,13 @@ const LayoutRootV1: FC & LayoutV1RootStatic = () => {
 
   // 有层级关系
   return (
-    <View>
+    <View
+      style={{
+        ...style,
+        display: state.popup && state.popup.length > 0 ? 'block' : 'none',
+      }}
+      {...rest}
+    >
       {/* {state.innerLayer} */}
       {state.popup}
       {/* {state.modal}

package/src/component/page/style.less

@@ -7,6 +7,14 @@
   &.m-page-white {
     background: var(--m-color-bg-white);
   }
+  .m-page-wrapper {
+    overflow: auto;
+  }
+
+  .m-page-side {
+    overflow-x: hidden;
+    overflow: auto;
+  }
 
   .m-page-content {
     flex: 1;

package/src/component/popup/popup.tsx

@@ -38,6 +38,8 @@ const PopupBase: FC<PopupProps> = ({
   /** 动画有卡顿现象，先禁用 */
   disabledAnimate = true,
   children,
+  hasCustomTab = true,
+  disableBottomSafeArea,
   ...rest
 }) => {
   devWarnForHook(() => {
@@ -57,6 +59,7 @@ const PopupBase: FC<PopupProps> = ({
       'm-animated-slide-in-left': left,
       'm-animated-slide-in-right': right,
       'm-animated-slide-in-bottom': bottom,
+      'm-bottom-safe-area': !disableBottomSafeArea,
     },
     className
   )
@@ -90,7 +93,7 @@ const PopupBase: FC<PopupProps> = ({
           </Flex>
         )}
         <View className='m-popup-content'>{children}</View>
-        <CustomTabbar />
+        {hasCustomTab && <CustomTabbar />}
       </View>
     </View>
   )

package/src/component/popup/popup_v1.tsx

@@ -51,6 +51,7 @@ const PopupBase: FC<PopupV1Props> = ({
   titleClassName,
   titleCenter,
   clickMaskClose = true,
+  disableBottomSafeArea,
   ...rest
 }) => {
   devWarnForHook(() => {
@@ -128,7 +129,7 @@ const PopupBase: FC<PopupV1Props> = ({
           </Flex>
         )}
         <View className='m-popup-content'>{children}</View>
-        <CustomTabbar />
+        {!disableBottomSafeArea && <CustomTabbar />}
       </View>
     </View>
   )

package/src/component/popup/style.less

@@ -65,7 +65,7 @@
 
 @supports (bottom: constant(safe-area-inset-bottom)) or
   (bottom: env(safe-area-inset-bottom)) {
-  .m-popup {
+  .m-popup.m-bottom-safe-area {
     padding-bottom: constant(safe-area-inset-bottom); /* 兼容 iOS < 11.2 */
     padding-bottom: env(safe-area-inset-bottom); /* 兼容 iOS >= 11.2 */
   }

package/src/component/popup/types.ts

@@ -19,6 +19,10 @@ interface PopupProps extends HTMLAttributes<HTMLDivElement> {
   disabledAnimate?: boolean
   /** 内部用 */
   isPickPopup?: boolean
+  /** 禁用下方安全边距，默认为false */
+  disableBottomSafeArea?: boolean
+  /** 预留底部自定义导航高度,默认为true */
+  hasCustomTab?: boolean
 }
 
 interface PopupStaticsTypes {

package/src/component/text_field/TextField.tsx

@@ -17,6 +17,8 @@ const ios = mp && wx.getSystemInfoSync().platform === 'ios'
 interface TextFieldState {
   /** 是否输入状态 */
   active: boolean
+  /** 是否需要清空 */
+  needClear: boolean
 }
 
 const store = observable({ active: '' })
@@ -43,6 +45,7 @@ export class TextField extends Component<TextFieldProps, TextFieldState> {
 
   state = {
     active: false,
+    needClear: false,
   }
 
   id = uniqueId('textField-')
@@ -82,12 +85,17 @@ export class TextField extends Component<TextFieldProps, TextFieldState> {
       })
     }
     this.props.onClick && this.props.onClick(e)
+    this.setState({ ...this.state, needClear: !!this.props.rewriteMode })
   }
 
   onInput(e: any) {
     if (this.props.disabled) return
     if (!mp) e.persist()
     let value = mp ? e.detail.value : e.target.value
+    if (this.state.needClear) {
+      value = value.slice(-1)
+      this.setState({ ...this.state, needClear: false })
+    }
     const { min, max } = this.props
     if (
       value &&
@@ -97,6 +105,11 @@ export class TextField extends Component<TextFieldProps, TextFieldState> {
       const float = parseFloat(value.replace(/\D\./g, ''))
       if (isNaN(float)) {
         value = ''
+      } else if (value.endsWith('.0')) {
+        // 处理特殊情况
+        if (this.props.fractionDigits === 0) {
+          value = value.replace(/\.0$/, '')
+        }
       } else {
         value = clamp(
           float,
@@ -159,7 +172,7 @@ export class TextField extends Component<TextFieldProps, TextFieldState> {
       disabled,
       highlight,
       cursorSpacing = 30,
-      maxLength,
+      maxLength = -1,
       confirmType,
       adjustPosition,
       block,
@@ -170,6 +183,7 @@ export class TextField extends Component<TextFieldProps, TextFieldState> {
       onClick,
       onConfirm,
       fractionDigits,
+      alwaysEmbed = true,
       ...rest
       // 注意，不用传给input或area的props要在此列出来，不然rest会带过去
     } = this.props
@@ -179,7 +193,7 @@ export class TextField extends Component<TextFieldProps, TextFieldState> {
 
     const common = {
       disabled: disabled,
-      onInput: this.onInput.bind(this),
+      // onInput: this.onInput.bind(this),
       onChange: this.onInput.bind(this),
       onClick: this.onClick.bind(this),
       onBlur: () => {
@@ -207,6 +221,7 @@ export class TextField extends Component<TextFieldProps, TextFieldState> {
         focus,
         password,
         placeholderClass: 'text-field-placeholder',
+        alwaysEmbed: alwaysEmbed,
         onConfirm,
       })
     } else {
@@ -224,6 +239,7 @@ export class TextField extends Component<TextFieldProps, TextFieldState> {
           active: highlight || active,
           highlight,
           disabled,
+          block,
         })}
         width={width}
         style={style}
@@ -300,7 +316,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>
@@ -311,3 +329,7 @@ export class TextField extends Component<TextFieldProps, TextFieldState> {
 }
 
 export default TextField
+
+export function AutoPreview_TextField() {
+  return <TextField value='test' onChange={() => {}} />
+}

package/src/component/text_field/stories.tsx

@@ -68,7 +68,6 @@ WithButton.args = {
   right: (
     <Button
       mini
-      noRound
       onClick={() => new Promise((resolve) => setTimeout(resolve, 3000))}
     >
       获取验证码

package/src/component/text_field/style.less

@@ -41,6 +41,9 @@
       background-color: var(--m-color-bg-secondary);
     }
   }
+  &.block {
+    width: 100%;
+  }
   .text-field-placeholder {
     color: var(--m-color-placeholder);
   }

package/src/component/text_field/types.ts

@@ -7,7 +7,7 @@ interface TextFieldProps
     'style' | 'onBlur' | 'onFocus' | 'onClick' | 'onChange' | 'type'
   > {
   value: string
-  /** 输入事件, e在web中为ChangeEvent，在小程序中为onInputEventDetail */
+  /** 输入事件, e在web中为ChangeEvent(value为e.target.value)，在小程序中为onInputEventDetail(value为e.detail.value) */
   onChange?: (e: any) => void
   /** 输入框类型, web端和小程序端取值有差异 */
   type?: InputProps['type']
@@ -63,6 +63,8 @@ interface TextFieldProps
   errClassName?: string
   /** 键盘和输入框距离，小程序特有 */
   cursorSpacing?: number
+  /** 重新获得焦点后，输入前清空现有内容 */
+  rewriteMode?: boolean
   onBlur?: () => void
   onFocus?: () => void
   /**  e在web中和小程序中不一样 */

package/src/component/v_list/v_list.tsx

@@ -32,7 +32,7 @@ const Item: FC<VListItemProps> = memo(
       const doLazy = (event: CustomEvent<{ scrollTop: number }>): void => {
         const { scrollTop } = event.detail
         if (
-          (itemIndex + 1) * itemHeight < scrollTop - distance ||
+          (itemIndex + 2) * itemHeight < scrollTop - distance ||
           itemIndex * itemHeight > scrollTop + listHeight + distance
         ) {
           // unshow

package/src/index.less

@@ -37,11 +37,13 @@
 @import './component/picker/style.less';
 @import './component/nav/style.less';
 @import './component/date_selector/style.less';
-@import './component//text_field/style.less';
+@import './component/text_field/style.less';
+@import './component/error/style.less';
 
 // 公共
 @import './less/mixin';
 @import './less/base';
+@import './less/button';
 @import './less/distance';
 @import './less/bg';
 @import './less/display';
@@ -51,7 +53,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/index.ts

@@ -42,3 +42,4 @@ export * from './component/text_field'
 export * from './component/digital_keyboard'
 export * from './component/draggable'
 export * from './component/form'
+export * from './component/error'

package/src/less/animation.less

@@ -1,6 +1,7 @@
 .m-animated {
-  animation-duration: 0.2s;
-  animation-fill-mode: none;
+  // animation-duration: 0.2s;
+  // animation-fill-mode: none;
+  transition: all 0.2s;
 }
 
 .m-animated-fade-in {
@@ -153,10 +154,14 @@
 
 @keyframes slide-in-bottom {
   from {
-    transform: translate3d(0, 100%, 0);
+    // transform: translate3d(0, 100%, 0);
+    max-height: 0%;
+    overflow: hidden;
   }
 
   to {
-    transform: translate3d(0, 0, 0);
+    // transform: translate3d(0, 0, 0);
+    max-height: 100%;
+    overflow: hidden;
   }
 }

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/border.less

@@ -98,13 +98,22 @@
 }
 
 .m-border-radius-circle {
-  border-radius: 50%;
+  border-radius: 50% !important;
 }
 
 .m-border-radius-chip {
-  border-radius: 100px;
+  border-radius: 100px !important;
 }
 
 .m-border-radius-5 {
-  border-radius: 5px;
+  border-radius: 5px !important;
 }
+
+// 生成圆角, .m-border-radius-{1-10}
+.generate-size(@size) when (@size<=10) {
+  .m-border-radius-@{size} {
+    border-radius: @size * 1px !important;
+  }
+  .generate-size(@size + 1);
+}
+.generate-size(0);