@nutui/nutui-react-taro 3.0.0-beta.0 → 3.0.0-beta.10

package/dist/es/packages/cascader/cascader.js

@@ -6,13 +6,14 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import React, { isValidElement, useState, useEffect, useImperativeHandle } from "react";
 import classNames from "classnames";
-import { Loading, Checklist } from "@nutui/icons-react-taro";
-import { ScrollView } from "@tarojs/components";
+import { Loading, Check } from "@nutui/icons-react-taro";
+import { ScrollView, View } from "@tarojs/components";
 import { Popup } from "../popup/popup";
 import { Tabs } from "../tabs/tabs";
 import Tree, { convertListToOptions } from "./utils";
 import { ComponentDefaults } from "../../utils/typings";
 import { usePropsValue } from "../../utils/use-props-value";
+import { useConfig } from "../configprovider/configprovider";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     activeColor: '',
     activeIcon: 'checklist',
@@ -34,6 +35,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     onPathChange: function() {}
 });
 var InternalCascader = function(props, ref) {
+    var locale = useConfig().locale;
     var _$_object_spread = _object_spread({}, defaultProps, props), className = _$_object_spread.className, style = _$_object_spread.style, activeColor = _$_object_spread.activeColor, activeIcon = _$_object_spread.activeIcon, popup = _$_object_spread.popup, _object_spread_popupProps = _$_object_spread.popupProps, popupProps = _object_spread_popupProps === void 0 ? {} : _object_spread_popupProps, visible = _$_object_spread.visible, options = _$_object_spread.options, value = _$_object_spread.value, defaultValue = _$_object_spread.defaultValue, optionKey = _$_object_spread.optionKey, format = _$_object_spread.format, closeable = _$_object_spread.closeable, closeIconPosition = _$_object_spread.closeIconPosition, closeIcon = _$_object_spread.closeIcon, lazy = _$_object_spread.lazy, title = _$_object_spread.title, left = _$_object_spread.left, onLoad = _$_object_spread.onLoad, onClose = _$_object_spread.onClose, onChange = _$_object_spread.onChange, onPathChange = _$_object_spread.onPathChange;
     var _useState = _sliced_to_array(useState('c1'), 2), tabvalue = _useState[0], setTabvalue = _useState[1];
     var _useState1 = _sliced_to_array(useState([]), 2), optionsData = _useState1[0], setOptionsData = _useState1[1];
@@ -90,7 +92,12 @@ var InternalCascader = function(props, ref) {
         options,
         format
     ]);
-    var initData = function() {
+    useEffect(function() {
+        syncValue();
+    }, [
+        value
+    ]);
+    var initData = /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function() {
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
@@ -144,14 +151,17 @@ var InternalCascader = function(props, ref) {
         };
     }();
     // 处理有默认值时的数据
-    var syncValue = function() {
+    var syncValue = /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function() {
             var currentValue, needToSync, parent, last, pathNodes;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
                         currentValue = innerValue;
-                        if (currentValue === undefined || currentValue !== defaultValue || !state.tree.nodes.length) {
+                        if (currentValue === undefined || ![
+                            defaultValue,
+                            value
+                        ].includes(currentValue) || !state.tree.nodes.length) {
                             return [
                                 2
                             ];
@@ -181,7 +191,7 @@ var InternalCascader = function(props, ref) {
                         state.initLoading = true;
                         return [
                             4,
-                            currentValue.slice(1).reduce(function() {
+                            currentValue.slice(1).reduce(/*#__PURE__*/ function() {
                                 var _ref = _async_to_generator(function(p, value) {
                                     var _parent_children, parent, node;
                                     return _ts_generator(this, function(_state) {
@@ -228,7 +238,10 @@ var InternalCascader = function(props, ref) {
                         state.initLoading = false;
                         _state.label = 3;
                     case 3:
-                        if (needToSync.length && currentValue === defaultValue) {
+                        if (needToSync.length && [
+                            defaultValue,
+                            value
+                        ].includes(currentValue)) {
                             pathNodes = state.tree.getPathNodesByValue(needToSync);
                             pathNodes.forEach(function(node, index) {
                                 state.tabsCursor = index;
@@ -246,7 +259,7 @@ var InternalCascader = function(props, ref) {
             return _ref.apply(this, arguments);
         };
     }();
-    var invokeLazyLoad = function() {
+    var invokeLazyLoad = /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(node) {
             var parent, lazyLoadPromise, nodes;
             return _ts_generator(this, function(_state) {
@@ -311,7 +324,7 @@ var InternalCascader = function(props, ref) {
         close();
     };
     /* type: 是否是静默模式，是的话不触发事件
-  tabsCursor: tab的索引 */ var chooseItem = function() {
+  tabsCursor: tab的索引 */ var chooseItem = /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function(node, type) {
             var pathNodes, optionParams, level, pathNodes1, optionParams1;
             return _ts_generator(this, function(_state) {
@@ -411,13 +424,13 @@ var InternalCascader = function(props, ref) {
                 if (/*#__PURE__*/ isValidElement(activeIcon)) {
                     return activeIcon;
                 }
-                return /*#__PURE__*/ React.createElement(Checklist, {
+                return /*#__PURE__*/ React.createElement(Check, {
                     className: "".concat(checked ? "".concat(classPrefix, "-icon-check") : '')
                 });
             }
             return null;
         };
-        return /*#__PURE__*/ React.createElement("div", {
+        return /*#__PURE__*/ React.createElement(View, {
             style: {
                 color: checked ? activeColor : ''
             },
@@ -426,7 +439,7 @@ var InternalCascader = function(props, ref) {
             onClick: function() {
                 chooseItem(node, false);
             }
-        }, /*#__PURE__*/ React.createElement("div", {
+        }, /*#__PURE__*/ React.createElement(View, {
             className: classesTitle
         }, node.text), node.loading ? /*#__PURE__*/ React.createElement(Loading, {
             color: "#969799",
@@ -434,7 +447,7 @@ var InternalCascader = function(props, ref) {
         }) : renderIcon());
     };
     var renderTabs = function() {
-        return /*#__PURE__*/ React.createElement("div", {
+        return /*#__PURE__*/ React.createElement(View, {
             className: "".concat(classPrefix, " ").concat(className),
             style: style
         }, /*#__PURE__*/ React.createElement(Tabs, {
@@ -442,7 +455,7 @@ var InternalCascader = function(props, ref) {
             title: function() {
                 return optionsData.map(function(pane, index) {
                     var _pane_selectedNode, _pane_selectedNode1;
-                    return /*#__PURE__*/ React.createElement("div", {
+                    return /*#__PURE__*/ React.createElement(View, {
                         onClick: function() {
                             setTabvalue(pane.paneKey);
                             state.tabsCursor = index;
@@ -451,7 +464,7 @@ var InternalCascader = function(props, ref) {
                         key: pane.paneKey
                     }, /*#__PURE__*/ React.createElement("span", {
                         className: "nut-tabs-titles-item-text"
-                    }, !state.initLoading && state.panes.length && (pane === null || pane === void 0 ? void 0 : (_pane_selectedNode = pane.selectedNode) === null || _pane_selectedNode === void 0 ? void 0 : _pane_selectedNode.text), !state.initLoading && state.panes.length && !(pane === null || pane === void 0 ? void 0 : (_pane_selectedNode1 = pane.selectedNode) === null || _pane_selectedNode1 === void 0 ? void 0 : _pane_selectedNode1.text) && '请选择', !(!state.initLoading && state.panes.length) && 'Loading...'), /*#__PURE__*/ React.createElement("span", {
+                    }, !state.initLoading && state.panes.length && (pane === null || pane === void 0 ? void 0 : (_pane_selectedNode = pane.selectedNode) === null || _pane_selectedNode === void 0 ? void 0 : _pane_selectedNode.text), !state.initLoading && state.panes.length && !(pane === null || pane === void 0 ? void 0 : (_pane_selectedNode1 = pane.selectedNode) === null || _pane_selectedNode1 === void 0 ? void 0 : _pane_selectedNode1.text) && "".concat(locale.select), !(!state.initLoading && state.panes.length) && 'Loading...'), /*#__PURE__*/ React.createElement("span", {
                         className: "nut-tabs-titles-item-line"
                     }));
                 });
@@ -467,16 +480,13 @@ var InternalCascader = function(props, ref) {
             }, (_pane_nodes = pane.nodes) === null || _pane_nodes === void 0 ? void 0 : _pane_nodes.map(function(node, index) {
                 return renderItem(pane, node, index);
             })));
-        }) : /*#__PURE__*/ React.createElement(Tabs.TabPane, null, /*#__PURE__*/ React.createElement("div", {
+        }) : /*#__PURE__*/ React.createElement(Tabs.TabPane, null, /*#__PURE__*/ React.createElement(View, {
             className: classesPane
         }))));
     };
     return /*#__PURE__*/ React.createElement(React.Fragment, null, popup ? /*#__PURE__*/ React.createElement(Popup, _object_spread_props(_object_spread({}, popupProps), {
         visible: innerVisible,
         position: "bottom",
-        style: {
-            overflowY: 'hidden'
-        },
         round: true,
         closeIcon: closeIcon,
         closeable: closeable,