@trionesdev/antd-taro-react 0.0.2-beta.15 → 0.0.2-beta.17

package/dist/FloatButton/style.scss

@@ -1,126 +1,126 @@
-@use "../style/variable" as variable;
-
-$floatButtonCls: "triones-antm-float-button";
-$floatButtonGroupCls: "triones-antm-float-button-group";
-
-$floatButtonSize: 48Px;
-$floatButtonShadow: 0 6Px 16Px 0 rgba(0, 0, 0, 0.08),
-  0 3Px 6Px -4Px rgba(0, 0, 0, 0.12), 0 9Px 28Px 8Px rgba(0, 0, 0, 0.05);
-
-.#{$floatButtonCls} {
-  position: fixed;
-  display: inline-flex;
-  flex-shrink: 0;
-  box-sizing: border-box;
-
-  &--embedded {
-    position: relative;
-    right: auto;
-    bottom: auto;
-    z-index: auto;
-  }
-
-  &-body {
-    box-sizing: border-box;
-    margin: 0;
-    padding: 0;
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    gap: 8Px;
-    min-width: $floatButtonSize;
-    min-height: $floatButtonSize;
-    border: none;
-    border-radius: 50%;
-    cursor: pointer;
-    font-size: 20Px;
-    line-height: 1;
-    color: rgba(0, 0, 0, 0.88);
-    background: #fff;
-    box-shadow: $floatButtonShadow;
-    transition: color 0.2s, background 0.2s, box-shadow 0.2s;
-    -webkit-tap-highlight-color: transparent;
-    text-decoration: none;
-
-    &:active {
-      filter: brightness(0.95);
-    }
-  }
-
-  &--shape-square &-body {
-    border-radius: variable.$trionesBorderRadius;
-  }
-
-  &--has-content &-body {
-    min-height: $floatButtonSize;
-    display: inline-flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-  }
-
-  &--type-primary &-body {
-    color: #fff;
-    background: variable.$trionesColorPrimary;
-  }
-
-  &-icon {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-  }
-
-  &-content {
-    font-size: variable.$trionesFontSizeSm;
-    font-weight: 500;
-    white-space: nowrap;
-  }
-}
-
-.#{$floatButtonGroupCls} {
-  position: fixed;
-  display: flex;
-  gap: 12Px;
-  align-items: flex-end;
-  box-sizing: border-box;
-
-  &--placement {
-    &-top {
-      flex-direction: column;
-    }
-    &-bottom {
-      flex-direction: column;
-    }
-    &-left {
-      flex-direction: row;
-    }
-    &-right {
-      flex-direction: row;
-    }
-  }
-
-  &--menu {
-    align-items: center;
-  }
-
-  &-list {
-    display: flex;
-    flex-direction: column;
-    gap: 12Px;
-    align-items: flex-end;
-
-    &--hidden {
-      display: none;
-    }
-  }
-
-  &--placement-left &-list,
-  &--placement-right &-list {
-    flex-direction: column;
-  }
-
-  /** 小程序点击外部关闭：全屏遮罩；极淡背景避免部分机型不响应 tap */
-  &-weapp-outside-mask {
-    background: rgba(0, 0, 0, 0.001);
-  }
-}
+@use "../style/variable" as variable;
+
+$floatButtonCls: "triones-antm-float-button";
+$floatButtonGroupCls: "triones-antm-float-button-group";
+
+$floatButtonSize: 48Px;
+$floatButtonShadow: 0 6Px 16Px 0 rgba(0, 0, 0, 0.08),
+  0 3Px 6Px -4Px rgba(0, 0, 0, 0.12), 0 9Px 28Px 8Px rgba(0, 0, 0, 0.05);
+
+.#{$floatButtonCls} {
+  position: fixed;
+  display: inline-flex;
+  flex-shrink: 0;
+  box-sizing: border-box;
+
+  &--embedded {
+    position: relative;
+    right: auto;
+    bottom: auto;
+    z-index: auto;
+  }
+
+  &-body {
+    box-sizing: border-box;
+    margin: 0;
+    padding: 0;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8Px;
+    min-width: $floatButtonSize;
+    min-height: $floatButtonSize;
+    border: none;
+    border-radius: 50%;
+    cursor: pointer;
+    font-size: 20Px;
+    line-height: 1;
+    color: rgba(0, 0, 0, 0.88);
+    background: #fff;
+    box-shadow: $floatButtonShadow;
+    transition: color 0.2s, background 0.2s, box-shadow 0.2s;
+    -webkit-tap-highlight-color: transparent;
+    text-decoration: none;
+
+    &:active {
+      filter: brightness(0.95);
+    }
+  }
+
+  &--shape-square &-body {
+    border-radius: variable.$trionesBorderRadius;
+  }
+
+  &--has-content &-body {
+    min-height: $floatButtonSize;
+    display: inline-flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+  }
+
+  &--type-primary &-body {
+    color: #fff;
+    background: variable.$trionesColorPrimary;
+  }
+
+  &-icon {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  &-content {
+    font-size: variable.$trionesFontSizeSm;
+    font-weight: 500;
+    white-space: nowrap;
+  }
+}
+
+.#{$floatButtonGroupCls} {
+  position: fixed;
+  display: flex;
+  gap: 12Px;
+  align-items: flex-end;
+  box-sizing: border-box;
+
+  &--placement {
+    &-top {
+      flex-direction: column;
+    }
+    &-bottom {
+      flex-direction: column;
+    }
+    &-left {
+      flex-direction: row;
+    }
+    &-right {
+      flex-direction: row;
+    }
+  }
+
+  &--menu {
+    align-items: center;
+  }
+
+  &-list {
+    display: flex;
+    flex-direction: column;
+    gap: 12Px;
+    align-items: flex-end;
+
+    &--hidden {
+      display: none;
+    }
+  }
+
+  &--placement-left &-list,
+  &--placement-right &-list {
+    flex-direction: column;
+  }
+
+  /** 小程序点击外部关闭：全屏遮罩；极淡背景避免部分机型不响应 tap */
+  &-weapp-outside-mask {
+    background: rgba(0, 0, 0, 0.001);
+  }
+}

package/dist/Form/FormItem/{form-item-input.d.ts → form-item-content.d.ts}

@@ -1,15 +1,17 @@
 import { Rule } from 'rc-field-form/lib/interface';
 import React, { FC } from 'react';
+import { FormHorizontalAlign } from "@trionesdev/antd-mobile-base-react";
 type FormItemInputProps = {
     children?: React.ReactElement;
     className?: string;
     name?: string;
     rules?: Rule[];
     initialValue?: any;
+    wrapperAlign?: FormHorizontalAlign;
     valuePropName?: string;
     errors?: React.ReactNode[];
     errorRender?: (errors?: any[]) => React.ReactNode;
     hiddenError?: boolean;
 };
-export declare const FormItemInput: FC<FormItemInputProps>;
+export declare const FormItemContent: FC<FormItemInputProps>;
 export {};

package/dist/Form/FormItem/{form-item-input.js → form-item-content.js}

@@ -6,9 +6,9 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import classNames from 'classnames';
 import { isEmpty } from 'lodash-es';
-import { Field } from 'rc-field-form';
 import React, { useState } from 'react';
-export var FormItemInput = function FormItemInput(_ref) {
+import { Field } from "@trionesdev/antd-mobile-base-react";
+export var FormItemContent = function FormItemContent(_ref) {
   var children = _ref.children,
     className = _ref.className,
     name = _ref.name,

package/dist/Form/FormItem/form-item-label.js

@@ -6,27 +6,21 @@ import React from "react";
 import classNames from "classnames";
 import { isFunction } from "lodash-es";
 import { useFormContext } from "@trionesdev/antd-mobile-base-react";
-import { useTaro } from "../../hooks";
 export var FormItemLabel = function FormItemLabel(_ref) {
   var className = _ref.className,
     style = _ref.style,
     label = _ref.label,
     layout = _ref.layout,
     required = _ref.required;
-  var _useTaro = useTaro(),
-    isTaroWeApp = _useTaro.isTaroWeApp,
-    isTaroWeb = _useTaro.isTaroWeb;
   var _useFormContext = useFormContext(),
     requiredMark = _useFormContext.requiredMark,
     colon = _useFormContext.colon;
   var clsPrefix = "triones-antm-form-item-label";
   return /*#__PURE__*/React.createElement("div", {
-    className: classNames(className, {
-      required: "".concat(clsPrefix, "-required")
-    }),
+    className: classNames(className, _defineProperty({}, "".concat(clsPrefix, "-required"), required)),
     style: style
   }, /*#__PURE__*/React.createElement("div", {
-    className: classNames("".concat(clsPrefix, "-wrapper"), _defineProperty(_defineProperty({}, "h5", isTaroWeb), "wx", isTaroWeApp))
+    className: classNames("".concat(clsPrefix, "-wrapper"))
   }, required && /*#__PURE__*/React.createElement("div", {
     className: "".concat(clsPrefix, "-required-mark")
   }, isFunction(requiredMark) ? requiredMark(label, {

package/dist/Form/FormItem/form-item.d.ts

@@ -1,14 +1,15 @@
 import React, { CSSProperties, FC, ReactElement, ReactNode } from "react";
 import { NamePath, Rule } from "rc-field-form/lib/interface";
-import { FormItemLayout, FormLayoutAlign } from "@trionesdev/antd-mobile-base-react";
+import { FormItemLayout, FormHorizontalAlign } from "@trionesdev/antd-mobile-base-react";
 export type FormItemProps = {
     className?: string;
     style?: CSSProperties;
     children?: ReactElement;
     layout?: FormItemLayout;
     label?: ReactNode;
-    labelAlign?: FormLayoutAlign;
+    labelAlign?: FormHorizontalAlign;
     labelWidth?: number;
+    contentAlign?: FormHorizontalAlign;
     name?: NamePath;
     required?: boolean;
     hidden?: boolean;

package/dist/Form/FormItem/form-item.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["className", "style", "children", "layout", "label", "labelAlign", "labelWidth", "name", "required", "hidden", "noStyle", "rules", "initialValue", "valuePropName", "errorRender", "extra"];
+var _excluded = ["className", "style", "children", "layout", "label", "labelAlign", "labelWidth", "contentAlign", "name", "required", "hidden", "noStyle", "rules", "initialValue", "valuePropName", "errorRender", "extra"];
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
@@ -8,10 +8,10 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React from "react";
 import { FormItemLabel } from "./form-item-label";
-import { FormItemInput } from "./form-item-input";
+import { FormItemContent } from "./form-item-content";
 import classNames from "classnames";
-import { Field } from "rc-field-form";
-import { useFormContext } from "@trionesdev/antd-mobile-base-react";
+import { Field, useFormContext } from "@trionesdev/antd-mobile-base-react";
+import { useTaro } from "../../hooks";
 export var FormItem = function FormItem(_ref) {
   var className = _ref.className,
     style = _ref.style,
@@ -20,6 +20,7 @@ export var FormItem = function FormItem(_ref) {
     label = _ref.label,
     labelAlign = _ref.labelAlign,
     labelWidth = _ref.labelWidth,
+    contentAlign = _ref.contentAlign,
     name = _ref.name,
     required = _ref.required,
     _ref$hidden = _ref.hidden,
@@ -32,42 +33,45 @@ export var FormItem = function FormItem(_ref) {
     errorRender = _ref.errorRender,
     extra = _ref.extra,
     props = _objectWithoutProperties(_ref, _excluded);
-  var _useFormContext = useFormContext(),
-    formLayout = _useFormContext.layout,
-    formLayoutAlign = _useFormContext.labelAlign,
-    formLabelWidth = _useFormContext.labelWidth,
-    hiddenError = _useFormContext.hiddenError,
-    formExtra = _useFormContext.extra;
-  var formItemLayout = layout ? layout : formLayout === 'inline' ? 'horizontal' : formLayout;
-  var formItemAlign = labelAlign ? labelAlign : formLayoutAlign || 'left';
-  var formItemLabelWidth = labelWidth ? labelWidth : formLabelWidth;
-  var itemExtra = extra !== undefined ? extra : formExtra;
+  var _useTaro = useTaro(),
+    isTaroWeApp = _useTaro.isTaroWeApp,
+    isTaroWeb = _useTaro.isTaroWeb;
+  // const { layout: formLayout, labelAlign: formLayoutAlign, labelWidth: formLabelWidth, hiddenError, extra: formExtra } = useFormContext()
+  var ctx = useFormContext();
+  var formItemLayout = layout ? layout : ctx.layout === 'inline' ? 'horizontal' : ctx.layout;
+  var formItemAlign = labelAlign ? labelAlign : ctx.labelAlign || 'left';
+  var formItemLabelWidth = labelWidth ? labelWidth : ctx.labelWidth;
+  var formItemExtra = extra !== undefined ? extra : ctx.extra;
+  var formItemWrapperAlign = contentAlign ? contentAlign : ctx.contentAlign;
   var clsPrefix = "triones-antm-form-item";
   if (noStyle) {
     return /*#__PURE__*/React.createElement(Field, {
       name: name,
       rules: rules,
+      valuePropName: valuePropName,
       trigger: 'onChange',
       initialValue: initialValue
     }, children);
   }
   return /*#__PURE__*/React.createElement("div", {
-    className: classNames(clsPrefix, "".concat(clsPrefix, "-").concat(formItemLayout), className, _defineProperty({}, "".concat(clsPrefix, "-hidden"), hidden)),
+    className: classNames(clsPrefix, "".concat(clsPrefix, "-").concat(formItemLayout), className, _defineProperty(_defineProperty(_defineProperty({}, "".concat(clsPrefix, "-hidden"), hidden), "h5", isTaroWeb), "wx", isTaroWeApp)),
     style: style
   }, label && /*#__PURE__*/React.createElement(FormItemLabel, {
     className: classNames("".concat(clsPrefix, "-label"), "".concat(clsPrefix, "-label-").concat(formItemAlign)),
     style: {
       width: formItemLabelWidth
     },
+    layout: formItemLayout,
     label: label,
     required: required
-  }), /*#__PURE__*/React.createElement(FormItemInput, _extends({
-    className: "".concat(clsPrefix, "-input")
+  }), /*#__PURE__*/React.createElement(FormItemContent, _extends({
+    className: classNames("".concat(clsPrefix, "-content"), "".concat(clsPrefix, "-content-").concat(formItemWrapperAlign))
   }, props, {
     name: name,
     rules: rules,
     errorRender: errorRender,
     initialValue: initialValue,
-    hiddenError: hiddenError
-  }), children), formExtra);
+    valuePropName: valuePropName,
+    hiddenError: ctx.hiddenError
+  }), children), formItemExtra);
 };

package/dist/Form/index.d.ts

@@ -1,4 +1,4 @@
-import { Form as InternalForm, FormProps } from "@trionesdev/antd-mobile-base-react";
+import { Form as InternalForm, FormProps, FormInstance } from "@trionesdev/antd-mobile-base-react";
 import FormItem, { FormItemProps } from "./FormItem";
 import "./style.scss";
 type InternalFormType = typeof InternalForm;
@@ -6,5 +6,5 @@ type CompoundedComponent = InternalFormType & {
     Item: typeof FormItem;
 };
 declare const Form: CompoundedComponent;
-export type { FormProps, FormItemProps };
+export type { FormProps, FormItemProps, FormInstance };
 export default Form;

package/dist/Form/style.scss

@@ -1,78 +1,100 @@
-@use "../style/variable" as variable;
-
-$cls-prefix-form: 'triones-antm-form';
-$cls-prefix-form-item: 'triones-antm-form-item';
-
-.#{$cls-prefix-form} {
-}
-
-.#{$cls-prefix-form-item} {
-
-  &-label {
-    font-size: variable.$trionesFontSize;
-    padding-block: 4Px;
-    color: #6F6F6F;
-
-
-    &-wrapper {
-      display: flex;
-      align-items: center;
-
-      &.h5 {
-        @include variable.h5-input-size;
-      }
-
-      &.wx {
-        @include variable.h5-input-size;
-      }
-    }
-
-    &-left {
-    }
-
-    &-right {
-      text-align: right;
-    }
-
-    &-required-mark {
-      display: inline-block;
-      color: red;
-      margin-right: 4Px;
-    }
-
-  }
-
-  &-input {
-
-    .#{$cls-prefix-form-item} {
-      &-error {
-        font-size: variable.$trionesFontSizeSm;
-        color: red;
-      }
-    }
-  }
-
-  &-horizontal {
-    display: flex;
-
-    .#{$cls-prefix-form-item} {
-      &-label {
-        flex-shrink: 1;
-        min-width: 0;
-      }
-
-      &-input {
-        flex: 1;
-        flex-shrink: 1;
-        min-width: 0;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-      }
-    }
-  }
-
-  &-hidden {
-    display: none;
-  }
-}
+@use "../style/variable" as variable;
+
+
+$cls-prefix-form-item: 'triones-antm-form-item';
+
+
+.#{$cls-prefix-form-item} {
+  &.h5 {
+    @include variable.h5-line-height;
+  }
+
+  &.wx {
+    @include variable.wx-input-size;
+  }
+
+  &-label {
+    font-size: variable.$trionesFontSize;
+    color: #6F6F6F;
+
+
+    &-wrapper {
+      //display: flex;
+      //align-items: center;
+      height: 100%;
+    }
+
+    &-required-mark {
+      display: inline-block;
+      color: variable.$trionesColorError;
+      width: 8Px;
+      margin-left: -8Px;
+    }
+
+  }
+
+  &-content {
+
+    &-end {
+      text-align: end;
+    }
+
+    .#{$cls-prefix-form-item} {
+      &-error {
+        font-size: variable.$trionesFontSizeSm;
+        color: variable.$trionesColorError;
+        line-height: normal;
+      }
+    }
+  }
+
+  &-horizontal {
+    display: flex;
+
+    .#{$cls-prefix-form-item} {
+      &-label {
+        padding-block: 12Px;
+        flex-shrink: 1;
+        min-width: 0;
+      }
+
+      &-content {
+        padding-block: 12Px;
+        flex: 1;
+        flex-shrink: 1;
+        min-width: 0;
+
+        &-end {
+          text-align: end;
+        }
+      }
+    }
+
+    &.#{$cls-prefix-form-item} {
+      &-start {
+        align-items: flex-start;
+      }
+
+      &-center {
+        //align-items: center;
+      }
+    }
+  }
+
+  &-vertical {
+    .#{$cls-prefix-form-item} {
+      &-label {
+        margin-bottom: 4Px;
+      }
+
+      &-content {
+        padding-block-end: 8Px;
+      }
+    }
+
+  }
+
+  &-hidden {
+    display: none;
+  }
+}

package/dist/FormCell/index.d.ts

@@ -0,0 +1,3 @@
+import { FormCell, FormCellProps } from '@trionesdev/antd-mobile-base-react';
+export type { FormCellProps };
+export default FormCell;

package/dist/FormCell/index.js

@@ -0,0 +1,2 @@
+import { FormCell } from '@trionesdev/antd-mobile-base-react';
+export default FormCell;