@nutui/nutui-react-taro 3.0.1 → 3.0.2

package/dist/es/packages/fixednav/fixednav.js

@@ -7,6 +7,7 @@ import { View } from "@tarojs/components";
 import Overlay from "../overlay/index";
 import { useConfig } from "../configprovider/index";
 import { defaultOverlayProps } from "../overlay/overlay";
+import Badge from "../badge/index";
 var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps), {
     activeText: '',
     inactiveText: '',
@@ -28,6 +29,20 @@ export var FixedNav = function(props) {
     var classes = classNames(classPrefix, {
         active: visible
     }, type, className);
+    var renderListItem = function(item, index) {
+        return /*#__PURE__*/ React.createElement(View, {
+            className: "".concat(classPrefix, "-list-item"),
+            onClick: function(event) {
+                return onSelect(item, event);
+            },
+            key: item.id || index
+        }, /*#__PURE__*/ React.isValidElement(item.icon) ? item.icon : /*#__PURE__*/ React.createElement("img", {
+            src: item.icon,
+            alt: ""
+        }), /*#__PURE__*/ React.createElement(View, {
+            className: "".concat(classPrefix, "-list-text")
+        }, item.text));
+    };
     return /*#__PURE__*/ React.createElement(View, {
         className: classes,
         style: _object_spread({}, position, style)
@@ -42,20 +57,11 @@ export var FixedNav = function(props) {
     }, children || /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-list")
     }, list.map(function(item, index) {
-        return /*#__PURE__*/ React.createElement(View, {
-            className: "".concat(classPrefix, "-list-item"),
-            onClick: function(event) {
-                return onSelect(item, event);
-            },
-            key: item.id || index
-        }, /*#__PURE__*/ React.isValidElement(item.icon) ? item.icon : /*#__PURE__*/ React.createElement("img", {
-            src: item.icon,
-            alt: ""
-        }), /*#__PURE__*/ React.createElement(View, {
-            className: "".concat(classPrefix, "-list-text")
-        }, item.text), item.num && /*#__PURE__*/ React.createElement(View, {
-            className: "b"
-        }, item.num));
+        return /*#__PURE__*/ React.createElement(React.Fragment, null, item.num ? /*#__PURE__*/ React.createElement(Badge, {
+            value: item.num,
+            top: 8,
+            right: 6
+        }, renderListItem(item, index)) : /*#__PURE__*/ React.createElement(React.Fragment, null, renderListItem(item, index)));
     }))), /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-btn"),
         onClick: function() {

package/dist/es/packages/fixednav/style/fixednav.scss

@@ -95,21 +95,6 @@
       .nut-fixednav-list-text {
         font-size: 10px;
       }
-
-      .b {
-        position: absolute;
-        right: 0;
-        top: 1px;
-        height: 14px;
-        line-height: 14px;
-        font-size: 10px;
-        padding: 0 3px;
-        color: white;
-        background: $color-primary;
-        border-radius: 7px;
-        text-align: center;
-        min-width: 12px;
-      }
     }
   }
 

package/dist/es/packages/fixednav/style/style.css

@@ -136,20 +136,6 @@
 .nut-fixednav-list-item .nut-fixednav-list-text {
   font-size: 10px;
 }
-.nut-fixednav-list-item .b {
-  position: absolute;
-  right: 0;
-  top: 1px;
-  height: 14px;
-  line-height: 14px;
-  font-size: 10px;
-  padding: 0 3px;
-  color: white;
-  background: var(--nutui-color-primary, #ff0f23);
-  border-radius: 7px;
-  text-align: center;
-  min-width: 12px;
-}
 .nut-fixednav.left {
   right: auto;
   left: 0;

package/dist/es/packages/fixednav/style/style.harmony.css

@@ -81,20 +81,6 @@
 .nut-fixednav-list-item .nut-fixednav-list-text {
   font-size: 10px;
 }
-.nut-fixednav-list-item .b {
-  position: absolute;
-  right: 0;
-  top: 1px;
-  height: 14px;
-  line-height: 14px;
-  font-size: 10px;
-  padding: 0 3px;
-  color: white;
-  background: #ff0f23;
-  border-radius: 7px;
-  text-align: center;
-  min-width: 12px;
-}
 .nut-fixednav.left {
   right: auto;
   left: 0;

package/dist/es/packages/form/form.d.ts

@@ -22,8 +22,18 @@ export interface FormProps extends TFormProps {
     * @default -
     */
     form: any
+    /**
+    * 是否禁用
+    * @default false
+    */
+    disabled: boolean
     divider: boolean;
     /**
+    * 统一设置字段触发验证的时机
+    * @default onChange
+    */
+    validateTrigger: string | string[] | false
+    /**
     * 表单项 label 的位置
     * @default 'left'\
     */

package/dist/es/packages/form/form.js

@@ -12,7 +12,9 @@ import Cell from "../cell/index";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     labelPosition: 'right',
     starPosition: 'left',
+    disabled: false,
     divider: false,
+    validateTrigger: 'onChange',
     onFinish: function(values) {},
     onFinishFailed: function(values, errorFields) {}
 });
@@ -23,15 +25,17 @@ var PositionInfo = {
 };
 export var Form = /*#__PURE__*/ React.forwardRef(function(props, ref) {
     var classPrefix = 'nut-form';
-    var _ref = _object_spread({}, defaultProps, props), className = _ref.className, style = _ref.style, footer = _ref.footer, children = _ref.children, initialValues = _ref.initialValues, divider = _ref.divider, onFinish = _ref.onFinish, onFinishFailed = _ref.onFinishFailed, labelPosition = _ref.labelPosition, starPosition = _ref.starPosition, form = _ref.form, rest = _object_without_properties(_ref, [
+    var _ref = _object_spread({}, defaultProps, props), className = _ref.className, style = _ref.style, footer = _ref.footer, children = _ref.children, initialValues = _ref.initialValues, divider = _ref.divider, disabled = _ref.disabled, onFinish = _ref.onFinish, onFinishFailed = _ref.onFinishFailed, validateTrigger = _ref.validateTrigger, labelPosition = _ref.labelPosition, starPosition = _ref.starPosition, form = _ref.form, rest = _object_without_properties(_ref, [
         "className",
         "style",
         "footer",
         "children",
         "initialValues",
         "divider",
+        "disabled",
         "onFinish",
         "onFinishFailed",
+        "validateTrigger",
         "labelPosition",
         "starPosition",
         "form"
@@ -78,7 +82,12 @@ export var Form = /*#__PURE__*/ React.forwardRef(function(props, ref) {
     }), /*#__PURE__*/ React.createElement(Cell.Group, {
         divider: divider
     }, /*#__PURE__*/ React.createElement(Context.Provider, {
-        value: formInstance
+        value: {
+            formInstance: formInstance,
+            labelPosition: labelPosition,
+            disabled: disabled,
+            validateTrigger: validateTrigger
+        }
     }, children), footer ? /*#__PURE__*/ React.createElement(Cell, {
         className: "".concat(classPrefix, "-footer")
     }, footer) : null));

package/dist/es/packages/form/index.d.ts

@@ -2,11 +2,12 @@ import React from 'react';
 import { FormProps } from "./form";
 import { FormItem } from "../formitem/formitem";
 import { FormInstance } from './types';
-import { useForm } from "./useform";
+import { useForm, useWatch } from "./useform";
 export type { FormItemRuleWithoutValidator, FormInstance, FormFieldEntity, } from './types';
 type CompoundedComponent = React.ForwardRefExoticComponent<Partial<FormProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'onChange'> & React.RefAttributes<FormInstance>> & {
     Item: typeof FormItem;
     useForm: typeof useForm;
+    useWatch: typeof useWatch;
 };
 declare const InnerForm: CompoundedComponent;
 export default InnerForm;

package/dist/es/packages/form/index.js

@@ -1,8 +1,9 @@
 import React from "react";
 import { Form } from "./form";
 import { FormItem } from "../formitem/formitem";
-import { useForm } from "./useform";
+import { useForm, useWatch } from "./useform";
 var InnerForm = Form;
 InnerForm.Item = FormItem;
 InnerForm.useForm = useForm;
+InnerForm.useWatch = useWatch;
 export default InnerForm;

package/dist/es/packages/form/style/form.scss

@@ -1,67 +1 @@
-.form-layout-right .nut-form-item-label {
-  text-align: right;
-  padding-right: 24px;
-  white-space: nowrap;
-}
 
-.form-layout-left .nut-form-item-label {
-  position: relative;
-  text-align: left;
-  padding-left: 12px;
-  white-space: nowrap;
-
-  .required {
-    display: block;
-    line-height: 1.5;
-    position: absolute;
-    left: 0.1em;
-  }
-}
-
-.form-layout-top .nut-form-item {
-  flex-direction: column;
-  align-items: flex-start;
-  white-space: nowrap;
-}
-
-.form-layout-top .nut-form-item-label {
-  padding-bottom: 4px;
-  display: block;
-  padding-right: 24px;
-}
-
-.form-layout-top .nut-form-item-body {
-  margin-left: 0;
-  width: 100%;
-}
-
-[dir='rtl'] .form-layout-right .nut-form-item-label,
-.nut-rtl .form-layout-right .nut-form-item-label {
-  text-align: left;
-  padding-right: 0;
-  padding-left: 24px;
-}
-
-[dir='rtl'] .form-layout-left .nut-form-item-label,
-.nut-rtl .form-layout-left .nut-form-item-label {
-  text-align: right;
-  padding-left: 0;
-  padding-right: 12px;
-
-  .required {
-    left: auto;
-    right: 0.1em;
-  }
-}
-
-[dir='rtl'] .form-layout-top .nut-form-item-label,
-.nut-rtl .form-layout-top .nut-form-item-label {
-  padding-right: 0;
-  padding-left: 24px;
-}
-
-[dir='rtl'] .form-layout-top .nut-form-item-body,
-.nut-rtl .form-layout-top .nut-form-item-body {
-  margin-left: 0;
-  margin-right: 0;
-}

package/dist/es/packages/form/style/style.css

@@ -142,32 +142,38 @@
 
 .nut-form-item {
   display: flex;
-  align-items: center;
-  padding: 4px 12px;
+  line-height: unset;
 }
-.nut-form-item.error.line::before {
-  border-bottom: 1px solid var(--nutui-form-item-error-line-color, var(--nutui-color-primary, #ff0f23));
-  transform: scaleX(1);
-  transition: transform 200ms cubic-bezier(0, 0, 0.2, 1) 0ms;
+.nut-form-item-disabled {
+  opacity: 0.4;
+  pointer-events: none;
 }
 .nut-form-item-label {
+  display: flex;
+  flex-direction: row;
   font-size: var(--nutui-form-item-label-font-size, var(--nutui-font-size-base, 14px));
   font-weight: normal;
   width: var(--nutui-form-item-label-width, 90px);
   margin-right: var(--nutui-form-item-label-margin-right, 10px);
-  flex: none !important;
-  display: inline-block !important;
+  flex: 0 0 auto;
   word-wrap: break-word;
   text-align: var(--nutui-form-item-label-text-align, left);
+  line-height: unset;
 }
-.nut-form-item-label .required::before {
-  content: "*";
+.nut-form-item-label-required {
   color: var(--nutui-form-item-required-color, var(--nutui-color-primary, #ff0f23));
   margin-right: var(--nutui-form-item-required-margin-right, 4px);
+  display: block;
+  position: absolute;
+  left: -10px;
+}
+.nut-form-item .nut-form-item-labeltxt {
+  position: relative;
+  font-size: 12px;
 }
 .nut-form-item-body {
   flex: 1;
-  display: flex !important;
+  display: flex;
   flex-direction: column;
 }
 .nut-form-item-body-slots {
@@ -177,6 +183,9 @@
   padding: 0;
   border: 0;
 }
+.nut-form-item-body-slots .nut-input-container {
+  height: auto;
+}
 .nut-form-item-body-slots .nut-input-text {
   font-size: var(--nutui-form-item-body-font-size, var(--nutui-font-size-base, 14px));
   text-align: var(--nutui-form-item-body-input-text-align, left);
@@ -191,7 +200,7 @@
   min-height: 24px;
 }
 .nut-form-item-body-slots .nut-textarea {
-  padding: 0 !important;
+  padding: 0;
 }
 .nut-form-item-body-slots .nut-textarea .nut-textarea-textarea {
   font: inherit;
@@ -237,38 +246,39 @@
   text-align: right;
 }
 
-.form-layout-right .nut-form-item-label {
-  text-align: right;
+/* position */
+.nut-form-item-label-right {
+  justify-content: flex-end;
   padding-right: 24px;
   white-space: nowrap;
 }
 
-.form-layout-left .nut-form-item-label {
+.nut-form-item-label-left {
   position: relative;
-  text-align: left;
   padding-left: 12px;
   white-space: nowrap;
 }
-.form-layout-left .nut-form-item-label .required {
+
+.nut-form-item-label-left-required {
   display: block;
   line-height: 1.5;
   position: absolute;
   left: 0.1em;
 }
 
-.form-layout-top .nut-form-item {
+.nut-form-item-top {
   flex-direction: column;
   align-items: flex-start;
   white-space: nowrap;
 }
 
-.form-layout-top .nut-form-item-label {
-  padding-bottom: 4px;
+.nut-form-item-label-top {
   display: block;
+  padding-bottom: 4px;
   padding-right: 24px;
 }
 
-.form-layout-top .nut-form-item-body {
+.nut-form-item-body-top {
   margin-left: 0;
   width: 100%;
 }

package/dist/es/packages/form/style/style.harmony.css

@@ -1,70 +1,4 @@
 /* #ifdef harmony */
 /* #endif */
 /* #ifndef harmony */
-/* #endif */
-.form-layout-right .nut-form-item-label {
-  text-align: right;
-  padding-right: 24px;
-  white-space: nowrap;
-}
-
-.form-layout-left .nut-form-item-label {
-  position: relative;
-  text-align: left;
-  padding-left: 12px;
-  white-space: nowrap;
-}
-.form-layout-left .nut-form-item-label .required {
-  display: block;
-  line-height: 1.5;
-  position: absolute;
-  left: 0.1em;
-}
-
-.form-layout-top .nut-form-item {
-  flex-direction: column;
-  align-items: flex-start;
-  white-space: nowrap;
-}
-
-.form-layout-top .nut-form-item-label {
-  padding-bottom: 4px;
-  display: block;
-  padding-right: 24px;
-}
-
-.form-layout-top .nut-form-item-body {
-  margin-left: 0;
-  width: 100%;
-}
-
-[dir=rtl] .form-layout-right .nut-form-item-label,
-.nut-rtl .form-layout-right .nut-form-item-label {
-  text-align: left;
-  padding-right: 0;
-  padding-left: 24px;
-}
-
-[dir=rtl] .form-layout-left .nut-form-item-label,
-.nut-rtl .form-layout-left .nut-form-item-label {
-  text-align: right;
-  padding-left: 0;
-  padding-right: 12px;
-}
-[dir=rtl] .form-layout-left .nut-form-item-label .required,
-.nut-rtl .form-layout-left .nut-form-item-label .required {
-  left: auto;
-  right: 0.1em;
-}
-
-[dir=rtl] .form-layout-top .nut-form-item-label,
-.nut-rtl .form-layout-top .nut-form-item-label {
-  padding-right: 0;
-  padding-left: 24px;
-}
-
-[dir=rtl] .form-layout-top .nut-form-item-body,
-.nut-rtl .form-layout-top .nut-form-item-body {
-  margin-left: 0;
-  margin-right: 0;
-}
+/* #endif */

package/dist/es/packages/form/types.d.ts

@@ -16,10 +16,11 @@ export interface Store {
 }
 export interface FormInstance<Values = any> {
     getFieldValue: (name: NamePath) => StoreValue;
+    setFieldValue: <T = any>(name: NamePath, value: T) => void;
     getFieldsValue: (nameList: NamePath[] | true) => {
         [key: NamePath]: any;
     };
-    setFieldsValue: (value: any) => void;
+    setFieldsValue: (value: Store) => void;
     resetFields: (fields?: NamePath[]) => void;
     submit: () => void;
     getInternal: (secret: string) => any;

package/dist/es/packages/form/useform.d.ts

@@ -1,3 +1,4 @@
-import { FormInstance } from './types';
+import { FormInstance, NamePath } from './types';
 export declare const SECRET = "NUT_FORM_INTERNAL";
 export declare const useForm: (form?: FormInstance) => [FormInstance];
+export declare const useWatch: (path: NamePath, form: FormInstance) => any;