@nutui/nutui 4.0.0-beta.26 → 4.0.0-beta.28

package/dist/packages/_es/Rate.js

@@ -53,7 +53,7 @@ const _sfc_main = create({
     },
     spacing: {
       type: [String, Number],
-      default: 14
+      default: void 0
     }
   },
   components: { StarFillN },
@@ -153,7 +153,7 @@ function render(_ctx, _cache, $props, $setup, $data, $options) {
         ref_for: true,
         ref: "rateRefs",
         id: "rateRefs-" + _ctx.refRandomId + n,
-        style: normalizeStyle({ marginRight: _ctx.pxCheck(_ctx.spacing) })
+        style: normalizeStyle(n < Number(_ctx.count) ? { marginRight: _ctx.pxCheck(_ctx.spacing) } : {})
       }, [
         createElementVNode("view", null, [
           (openBlock(), createBlock(resolveDynamicComponent(_ctx.renderIcon(_ctx.customIcon, { width: _ctx.size, height: _ctx.size, size: _ctx.size, color: n <= _ctx.modelValue ? _ctx.activeColor : _ctx.voidColor })), {

package/dist/packages/_es/Searchbar.js

@@ -1,4 +1,4 @@
-import { reactive, computed, ref, onMounted, toRefs, openBlock, createElementBlock, normalizeStyle, toDisplayString, createCommentVNode, renderSlot, createElementVNode, withModifiers, normalizeClass, withDirectives, createBlock, resolveDynamicComponent, vShow } from "vue";
+import { reactive, computed, ref, onMounted, toRefs, openBlock, createElementBlock, normalizeStyle, toDisplayString, createCommentVNode, renderSlot, createElementVNode, normalizeClass, withModifiers, withDirectives, createBlock, resolveDynamicComponent, vShow } from "vue";
 import { c as createComponent } from "./component-81a4c1d0.js";
 import { r as renderIcon } from "./renderIcon-3d0fd47c.js";
 import { CircleClose } from "@nutui/icons-vue";
@@ -81,7 +81,6 @@ const _sfc_main = create({
     const state = reactive({
       active: false
     });
-    console.log(slots);
     const searchbarStyle = computed(() => {
       return {
         background: props.background
@@ -178,8 +177,11 @@ const _hoisted_2 = {
   key: 1,
   class: "nut-searchbar__search-icon nut-searchbar__left-search-icon"
 };
-const _hoisted_3 = { class: "nut-searchbar__input-inner" };
-const _hoisted_4 = ["type", "maxlength", "placeholder", "value", "disabled", "readonly"];
+const _hoisted_3 = ["type", "maxlength", "placeholder", "value", "disabled", "readonly"];
+const _hoisted_4 = {
+  key: 1,
+  class: "nut-searchbar__search-icon nut-searchbar__iptright-search-icon"
+};
 const _hoisted_5 = {
   key: 2,
   class: "nut-searchbar__search-icon nut-searchbar__right-search-icon"
@@ -204,8 +206,11 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
       }, [
         renderSlot(_ctx.$slots, "leftin")
       ])) : createCommentVNode("", true),
-      createElementVNode("view", _hoisted_3, [
+      createElementVNode("view", {
+        class: normalizeClass(["nut-searchbar__input-inner", _ctx.$slots.rightin && "nut-searchbar__input-inner-absolute"])
+      }, [
         createElementVNode("form", {
+          class: "nut-searchbar__input-form",
           action: "#",
           onSubmit: _cache[5] || (_cache[5] = withModifiers((...args) => _ctx.handleSubmit && _ctx.handleSubmit(...args), ["prevent"]))
         }, [
@@ -223,25 +228,25 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
             onFocus: _cache[3] || (_cache[3] = (...args) => _ctx.valueFocus && _ctx.valueFocus(...args)),
             onBlur: _cache[4] || (_cache[4] = (...args) => _ctx.valueBlur && _ctx.valueBlur(...args)),
             style: normalizeStyle(_ctx.styleSearchbar)
-          }, null, 46, _hoisted_4)
-        ], 32),
+          }, null, 46, _hoisted_3)
+        ], 32)
+      ], 2),
+      createElementVNode("view", {
+        class: normalizeClass(["nut-searchbar__input-inner-icon", _ctx.$slots.rightin && "nut-searchbar__input-inner-icon-absolute"])
+      }, [
         _ctx.clearable ? withDirectives((openBlock(), createElementBlock("view", {
           key: 0,
           onClick: _cache[6] || (_cache[6] = (...args) => _ctx.handleClear && _ctx.handleClear(...args)),
-          class: "nut-searchbar__input-clear"
+          class: "nut-searchbar__search-icon nut-searchbar__input-clear"
         }, [
           _ctx.$slots["clear-icon"] ? renderSlot(_ctx.$slots, "clear-icon", { key: 0 }) : (openBlock(), createBlock(resolveDynamicComponent(_ctx.renderIcon(_ctx.clearIcon)), { key: 1 }))
         ], 512)), [
           [vShow, String(_ctx.modelValue).length > 0]
-        ]) : createCommentVNode("", true)
-      ]),
-      _ctx.$slots.rightin ? (openBlock(), createElementBlock("view", {
-        key: 1,
-        class: "nut-searchbar__search-icon nut-searchbar__iptright-sarch-icon",
-        onClick: _cache[7] || (_cache[7] = (...args) => _ctx.rightIconClick && _ctx.rightIconClick(...args))
-      }, [
-        renderSlot(_ctx.$slots, "rightin")
-      ])) : createCommentVNode("", true)
+        ]) : createCommentVNode("", true),
+        _ctx.$slots.rightin ? (openBlock(), createElementBlock("view", _hoisted_4, [
+          renderSlot(_ctx.$slots, "rightin")
+        ])) : createCommentVNode("", true)
+      ], 2)
     ], 4),
     _ctx.$slots.rightout ? (openBlock(), createElementBlock("view", _hoisted_5, [
       renderSlot(_ctx.$slots, "rightout")

package/dist/packages/rate/index.scss

@@ -4,6 +4,7 @@
     display: flex;
     flex-shrink: 0;
     position: relative;
+    margin-right: 14px;
     &:last-child {
       margin-right: 0;
     }

package/dist/packages/searchbar/index.scss

@@ -51,14 +51,19 @@
     .nut-searchbar__input-inner {
       display: flex;
       position: relative;
-      width: 100%;
+      // width: 100%;
+      flex: 1;
+      align-items: center;
+      overflow: hidden;
       > taro-form-core {
         width: 100%;
       }
-      form {
-        display: flex;
-        align-items: center;
-        width: 100%;
+      .nut-searchbar__input-form {
+        // display: flex;
+        // align-items: center;
+        // width: 100%;
+        flex: 1;
+        overflow: hidden;
       }
       input {
         width: 100%;
@@ -66,21 +71,32 @@
         min-width: 214px;
         padding-left: 4px;
       }
-      .nut-searchbar__input-clear {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        margin-right: 13px;
-        & .nut-searchbar__nut-icon-mask-close {
-          color: rgb(204, 204, 204);
-          &:hover {
-            cursor: pointer;
-            color: rgb(104, 104, 104);
-          }
+    }
+
+    .nut-searchbar__input-inner-icon {
+      display: flex;
+      align-items: center;
+      position: relative;
+      // overflow: hidden;
+      padding: 0 7px;
+    }
+    .nut-searchbar__input-clear {
+      position: relative;
+      z-index: 10;
+      padding: 0 5px;
+      & .nut-searchbar__nut-icon-mask-close {
+        color: rgb(204, 204, 204);
+        &:hover {
+          cursor: pointer;
+          color: rgb(104, 104, 104);
         }
       }
-      .nut-searchbar__input-bar_clear {
-        padding-right: 10px;
+    }
+    .nut-searchbar__input-inner-icon-absolute {
+      .nut-searchbar__input-clear {
+        position: absolute;
+        z-index: 10;
+        left: -20px;
       }
     }
 
@@ -90,8 +106,8 @@
       height: 14px;
     }
 
-    .nut-searchbar__iptright-sarch-icon {
-      margin-right: 12px;
+    .nut-searchbar__iptright-search-icon {
+      margin-left: 5px;
     }
 
     .nut-searchbar__input-bar {
@@ -106,6 +122,13 @@
       outline: none;
       font-size: 14px;
     }
+
+    .nut-searchbar__input-inner-absolute {
+      .nut-searchbar__input-bar {
+        box-sizing: border-box;
+        padding-right: 20px;
+      }
+    }
   }
 
   &__left-search-icon {

package/dist/smartips/web-types.json

@@ -2,7 +2,7 @@
   "$schema": "https://raw.githubusercontent.com/JetBrains/web-types/master/schema/web-types.json",
   "framework": "vue",
   "name": "NutUI",
-  "version": "4.0.0-beta.26",
+  "version": "4.0.0-beta.28",
   "contributions": {
     "html": {
       "tags": [