@nutui/nutui-react 3.0.10 → 3.0.11-patch.0

package/dist/es/packages/address/style-jmapp/style.css

@@ -2,10 +2,6 @@
 /* #endif */
 /* #ifndef harmony */
 /* #endif */
-.nut-address-elevator {
-  display: flex;
-  margin-top: 20px;
-}
 .nut-address-exist {
   display: block;
   padding: 15px 20px 0;
@@ -45,6 +41,109 @@
   color: var(--nutui-color-text-dark);
 }
 
+.nut-address-title {
+  font-size: 14px;
+  font-weight: 500;
+  padding: 16px 16px 12px 16px;
+}
+.nut-address-hotlist {
+  padding: 0 16px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: flex-start;
+}
+.nut-address-hotlist-item {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 63px;
+  height: 28px;
+  font-size: 12px;
+  border-radius: 4px;
+  margin-bottom: 7px;
+  /* #ifdef harmony*/
+  margin-right: 6px;
+  /* #endif */
+  /* #ifndef harmony*/
+  margin-right: 7px;
+  /* #endif */
+  background-color: var(--nutui-gray-2, #f8f8f8);
+  color: var(--nutui-color-title);
+}
+.nut-address-hotlist-item:nth-child(5n) {
+  margin-right: 0;
+}
+.nut-address-hotlist.hotlist-more .nut-address-hotlist-item {
+  width: auto;
+  padding: 0 16px;
+  margin-right: 7px;
+}
+.nut-address-selected {
+  width: 100%;
+  height: 60px;
+  padding: 0 16px;
+  display: flex;
+  align-items: center;
+  border-bottom: 1px solid var(--nutui-color-border);
+}
+.nut-address-selected-item {
+  font-size: 12px;
+  display: inline-block;
+  height: 28px;
+  line-height: 28px;
+  padding: 0 12px;
+  border-radius: 4px;
+  background-color: var(--nutui-gray-2, #f8f8f8);
+}
+.nut-address-selected-item.active {
+  border: 1px solid var(--nutui-color-primary);
+  background-color: var(--nutui-color-primary-light-pressed);
+  color: var(--nutui-color-primary);
+}
+.nut-address-selected-border {
+  margin: 0 2px;
+  color: var(--nutui-color-text-disabled);
+}
+.nut-address-elevator {
+  margin-top: 0;
+}
+.nut-address-elevator .nut-elevator-list-item {
+  position: relative;
+  padding-left: 20px;
+}
+.nut-address-elevator .nut-elevator-list-item-code {
+  display: inline;
+  position: absolute;
+  left: 0;
+  top: 0;
+  height: 30px;
+  line-height: 30px;
+  border-bottom: 0;
+  color: var(--nutui-color-text-help);
+  font-weight: 500;
+}
+.nut-address-elevator .nut-elevator-bars {
+  top: 40%;
+  padding: 0;
+  background: none;
+}
+.nut-address-elevator .nut-elevator-bars-inner-item {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 16px;
+  height: 16px;
+  font-size: 10px;
+  border-radius: 16px;
+  margin-bottom: 2px;
+  color: var(--nutui-color-text-help);
+}
+.nut-address-elevator .nut-elevator-bars-inner-item-active {
+  background-color: var(--nutui-color-primary);
+  color: var(--nutui-color-surface-2);
+  font-weight: 400;
+}
+
 [dir=rtl] .nut-address-exist-item-info,
 .nut-rtl .nut-address-exist-item-info {
   margin-left: 0;

package/dist/es/packages/address/style-jrkf/address.scss

@@ -1,9 +1,4 @@
 .nut-address {
-  &-elevator {
-    display: flex;
-    margin-top: 20px;
-  }
-
   &-exist {
     display: block;
     padding: 15px 20px 0;
@@ -49,6 +44,120 @@
   }
 }
 
+.nut-address {
+  &-title {
+    font-size: 14px;
+    font-weight: 500;
+    padding: 16px 16px 12px 16px;
+  }
+  &-hotlist {
+    padding: 0 16px;
+    display: flex;
+    flex-wrap: wrap;
+    align-items: flex-start;
+    &-item {
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      width: 63px;
+      height: 28px;
+      font-size: 12px;
+      border-radius: 4px;
+      margin-bottom: 7px;
+      /* #ifdef harmony*/
+      margin-right: 6px;
+      /* #endif */
+      /* #ifndef harmony*/
+      margin-right: 7px;
+      /* #endif */
+      background-color: $color-background-sunken;
+      color: $color-title;
+      &:nth-child(5n) {
+        margin-right: 0;
+      }
+    }
+
+    &.hotlist-more {
+      .nut-address-hotlist-item {
+        width: auto;
+        padding: 0 16px;
+        margin-right: 7px;
+      }
+    }
+  }
+
+  &-selected {
+    width: 100%;
+    height: 60px;
+    padding: 0 16px;
+    display: flex;
+    align-items: center;
+    border-bottom: 1px solid $color-border;
+    &-item {
+      font-size: 12px;
+      display: inline-block;
+      height: 28px;
+      line-height: 28px;
+      padding: 0 12px;
+      border-radius: 4px;
+      background-color: $color-background-sunken;
+
+      &.active {
+        border: 1px solid $color-primary;
+        background-color: $color-primary-light-pressed;
+        color: $color-primary;
+      }
+    }
+    &-border {
+      margin: 0 2px;
+      color: $color-text-disabled;
+    }
+  }
+
+  &-elevator {
+    margin-top: 0;
+    .nut-elevator-list {
+      &-item {
+        position: relative;
+        padding-left: 20px;
+      }
+      &-item-code {
+        display: inline;
+        position: absolute;
+        left: 0;
+        top: 0;
+        height: 30px;
+        line-height: 30px;
+        border-bottom: 0;
+        color: $color-text-help;
+        font-weight: 500;
+      }
+    }
+    .nut-elevator-bars {
+      top: 40%;
+      padding: 0;
+      background: none;
+
+      &-inner-item {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        width: 16px;
+        height: 16px;
+        font-size: 10px;
+        border-radius: 16px;
+        margin-bottom: 2px;
+        color: $color-text-help;
+        &-active {
+          background-color: $color-primary;
+          color: $color-background-overlay;
+          font-weight: 400;
+        }
+      }
+    }
+  }
+}
+
 [dir='rtl'] .nut-address,
 .nut-rtl .nut-address {
   &-exist {

package/dist/es/packages/address/style-jrkf/style.css

@@ -2,10 +2,6 @@
 /* #endif */
 /* #ifndef harmony */
 /* #endif */
-.nut-address-elevator {
-  display: flex;
-  margin-top: 20px;
-}
 .nut-address-exist {
   display: block;
   padding: 15px 20px 0;
@@ -45,6 +41,109 @@
   color: var(--nutui-color-text-dark);
 }
 
+.nut-address-title {
+  font-size: 14px;
+  font-weight: 500;
+  padding: 16px 16px 12px 16px;
+}
+.nut-address-hotlist {
+  padding: 0 16px;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: flex-start;
+}
+.nut-address-hotlist-item {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 63px;
+  height: 28px;
+  font-size: 12px;
+  border-radius: 4px;
+  margin-bottom: 7px;
+  /* #ifdef harmony*/
+  margin-right: 6px;
+  /* #endif */
+  /* #ifndef harmony*/
+  margin-right: 7px;
+  /* #endif */
+  background-color: var(--nutui-gray-2, #f0f0f0);
+  color: var(--nutui-color-title);
+}
+.nut-address-hotlist-item:nth-child(5n) {
+  margin-right: 0;
+}
+.nut-address-hotlist.hotlist-more .nut-address-hotlist-item {
+  width: auto;
+  padding: 0 16px;
+  margin-right: 7px;
+}
+.nut-address-selected {
+  width: 100%;
+  height: 60px;
+  padding: 0 16px;
+  display: flex;
+  align-items: center;
+  border-bottom: 1px solid var(--nutui-color-border);
+}
+.nut-address-selected-item {
+  font-size: 12px;
+  display: inline-block;
+  height: 28px;
+  line-height: 28px;
+  padding: 0 12px;
+  border-radius: 4px;
+  background-color: var(--nutui-gray-2, #f0f0f0);
+}
+.nut-address-selected-item.active {
+  border: 1px solid var(--nutui-color-primary, #ff6666);
+  background-color: var(--nutui-color-primary-light-pressed, #ffcccc);
+  color: var(--nutui-color-primary, #ff6666);
+}
+.nut-address-selected-border {
+  margin: 0 2px;
+  color: var(--nutui-color-text-disabled);
+}
+.nut-address-elevator {
+  margin-top: 0;
+}
+.nut-address-elevator .nut-elevator-list-item {
+  position: relative;
+  padding-left: 20px;
+}
+.nut-address-elevator .nut-elevator-list-item-code {
+  display: inline;
+  position: absolute;
+  left: 0;
+  top: 0;
+  height: 30px;
+  line-height: 30px;
+  border-bottom: 0;
+  color: var(--nutui-color-text-help);
+  font-weight: 500;
+}
+.nut-address-elevator .nut-elevator-bars {
+  top: 40%;
+  padding: 0;
+  background: none;
+}
+.nut-address-elevator .nut-elevator-bars-inner-item {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 16px;
+  height: 16px;
+  font-size: 10px;
+  border-radius: 16px;
+  margin-bottom: 2px;
+  color: var(--nutui-color-text-help);
+}
+.nut-address-elevator .nut-elevator-bars-inner-item-active {
+  background-color: var(--nutui-color-primary, #ff6666);
+  color: var(--nutui-color-surface-2);
+  font-weight: 400;
+}
+
 [dir=rtl] .nut-address-exist-item-info,
 .nut-rtl .nut-address-exist-item-info {
   margin-left: 0;

package/dist/es/packages/address/utils.d.ts

@@ -0,0 +1,5 @@
+export declare const transformData: (data: any) => {
+    title: string;
+    list: any;
+}[];
+export declare const findDataByName: any;

package/dist/es/packages/address/utils.js

@@ -0,0 +1,75 @@
+var generateId = function(name) {
+    return name.split('').reduce(function(sum, char) {
+        return sum + char.charCodeAt(0);
+    }, 0) // 使用字符的 Unicode 值作为 ID
+    ;
+};
+export var transformData = function(data) {
+    var groupByWordCode = function(data, parentId, parentName) {
+        return data === null || data === void 0 ? void 0 : data.reduce(function(acc, item) {
+            var wordCode = item.wordCode;
+            if (!acc[wordCode]) {
+                acc[wordCode] = [];
+            }
+            var currentId = generateId(item.value);
+            acc[wordCode].push({
+                name: item.value,
+                wordCode: item.wordCode,
+                id: currentId,
+                pId: parentId,
+                pName: parentName,
+                children: item.children && groupByWordCode(item.children, currentId, item.text) || null
+            });
+            return acc;
+        }, {});
+    };
+    var extractTitles = function(obj) {
+        return Object.keys(obj).map(function(key) {
+            return {
+                title: key,
+                list: obj[key].map(function(item) {
+                    if (item.children) {
+                        item.children = extractTitles(item.children);
+                    }
+                    return item;
+                })
+            };
+        });
+    };
+    var middleData = groupByWordCode(data, '', '');
+    var resultData = extractTitles(middleData);
+    return resultData;
+};
+export var findDataByName = function(data, name) {
+    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+    try {
+        for(var _iterator = data[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+            var item = _step.value;
+            var _item_name;
+            if (((_item_name = item.name) === null || _item_name === void 0 ? void 0 : _item_name.indexOf(name)) === 0) return item;
+            if (item.children) {
+                var found = findDataByName(item.children, name);
+                if (found) return found;
+            }
+            if (item.list) {
+                var found1 = findDataByName(item.list, name);
+                if (found1) return found1;
+            }
+        }
+    } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+    } finally{
+        try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                _iterator.return();
+            }
+        } finally{
+            if (_didIteratorError) {
+                throw _iteratorError;
+            }
+        }
+    }
+    return null // 如果没有找到，返回 null
+    ;
+};

package/dist/es/packages/elevator/elevator.js

@@ -204,9 +204,10 @@ export var Elevator = function(props) {
             touchAction: 'pan-y'
         }
     }), list.map(function(item, index) {
+        var _list_currentIndex;
         var _obj;
         return /*#__PURE__*/ React.createElement("div", {
-            className: classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix, "-bars-inner-item"), true), _define_property(_obj, "".concat(classPrefix, "-bars-inner-item-active"), item[floorKey] === list[currentIndex][floorKey]), _obj)),
+            className: classNames((_obj = {}, _define_property(_obj, "".concat(classPrefix, "-bars-inner-item"), true), _define_property(_obj, "".concat(classPrefix, "-bars-inner-item-active"), item[floorKey] === ((_list_currentIndex = list[currentIndex]) === null || _list_currentIndex === void 0 ? void 0 : _list_currentIndex[floorKey])), _obj)),
             "data-index": index,
             key: index,
             onClick: function() {

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

@@ -1,5 +1,4 @@
 .nut-picker {
-  background-color: $color-background-overlay;
   width: 100%;
 
   &-control {

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

@@ -3,7 +3,6 @@
 /* #ifndef harmony */
 /* #endif */
 .nut-picker {
-  background-color: var(--nutui-color-background-overlay, #ffffff);
   width: 100%;
 }
 .nut-picker-control {

package/dist/es/packages/picker/style-jmapp/picker.scss

@@ -1,5 +1,4 @@
 .nut-picker {
-  background-color: $color-background-overlay;
   width: 100%;
 
   &-control {

package/dist/es/packages/picker/style-jmapp/style.css

@@ -3,7 +3,6 @@
 /* #ifndef harmony */
 /* #endif */
 .nut-picker {
-  background-color: var(--nutui-color-surface-2);
   width: 100%;
 }
 .nut-picker-control {

package/dist/es/packages/picker/style-jrkf/picker.scss

@@ -1,5 +1,4 @@
 .nut-picker {
-  background-color: $color-background-overlay;
   width: 100%;
 
   &-control {

package/dist/es/packages/picker/style-jrkf/style.css

@@ -3,7 +3,6 @@
 /* #ifndef harmony */
 /* #endif */
 .nut-picker {
-  background-color: var(--nutui-color-surface-2);
   width: 100%;
 }
 .nut-picker-control {

package/dist/es/types/spec/address/base.d.ts

@@ -4,11 +4,6 @@ export interface RegionData {
     name?: string;
     [key: string]: any;
 }
-export interface ChangeData {
-    next: string;
-    value: string | RegionData;
-    custom: string;
-}
 export interface CloseCallBackData extends Regions {
     addressIdStr: string;
     addressStr: string;
@@ -32,18 +27,13 @@ export interface AddressList {
     name?: string;
     phone?: string;
 }
-export interface CurrentData {
-    next: string;
-    value: string | RegionData;
-    custom: string;
-    selectedRegion?: Regions;
-}
 export interface Regions {
     province: RegionData;
     city: RegionData;
     county: RegionData;
     town: RegionData;
 }
+export type AddressModeType = 'exist' | 'cascader' | 'elevator';
 export interface BaseAddress {
     /**
     * 是否打开地址选择
@@ -56,9 +46,9 @@ export interface BaseAddress {
     value?: CascaderValue;
     defaultValue?: CascaderValue;
     /**
-    * 地址选择类型 exist/custom
+    * 地址选择类型 exist/cascader/elevator
     */
-    type: string
+    type: AddressModeType
     options: CascaderOption[];
     optionKey: CascaderOptionKey;
     format: Record<string, string | number | null>;
@@ -84,6 +74,10 @@ export interface BaseAddress {
     */
     backIcon: React.ReactNode
     /**
+    * 是否展示热门城市，目前只在电梯模式下有效
+    */
+    hotList: RegionData[]
+    /**
     * 点击'选择其他地址'或自定义地址选择左上角返回按钮触发
     */
     onSwitch?: (data: {

package/dist/es/types/spec/cascader/base.d.ts

@@ -8,6 +8,7 @@ export interface CascaderPane {
 export interface CascaderOption {
     text?: string;
     value?: number | string;
+    wordCode?: string;
     paneKey?: string;
     disabled?: boolean;
     children?: CascaderOption[];