@tuya-miniapp/smart-ui 2.1.7-beta-1 → 2.1.7

package/dist/circle/index.js

@@ -3,10 +3,10 @@ import { SmartComponent } from '../common/component';
 SmartComponent({
     props: {
         className: String,
-        style: String,
+        customStyle: String,
         size: {
-            type: Number,
-            value: 100,
+            type: String,
+            value: '100px',
         },
         trackWidth: {
             type: Number,

package/dist/circle/index.wxml

@@ -1,4 +1,4 @@
-<view class="smart-progress-circle" style="width:{{size}}px;height:{{size}}px;padding:{{trackWidth}}px;background:{{fillColor}};{{style}}">
+<view class="smart-progress-circle" style="width:{{size}};height:{{size}};padding:{{trackWidth}}px;background:{{fillColor}};{{customStyle}}">
   <view class="smart-progress-circle-box smart-progress-circle-box-left">
     <view class="smart-progress-circle-bar smart-progress-circle-bar-left" style="transform:{{transformLeft}};background:{{trackColor}};">
     </view>

package/dist/dialog/dialog.js

@@ -35,8 +35,14 @@ function getContext() {
 const Dialog = (options) => {
     options = Object.assign(Object.assign({}, currentOptions), options);
     return new Promise((resolve, reject) => {
+        var _a;
         const context = (typeof options.context === 'function' ? options.context() : options.context) || getContext();
+        const selector = options.selector;
         const dialog = context.selectComponent(options.selector);
+        if ((queue === null || queue === void 0 ? void 0 : queue.length) > 0 && ((_a = queue === null || queue === void 0 ? void 0 : queue[0]) === null || _a === void 0 ? void 0 : _a.id) === (dialog === null || dialog === void 0 ? void 0 : dialog.id)) {
+            console.warn(`相同选择器的 Dialog 调用过于频繁，${dialog.id} 已忽略重复调用`);
+            return;
+        }
         delete options.context;
         delete options.selector;
         if (dialog) {
@@ -45,6 +51,10 @@ const Dialog = (options) => {
                 optionsWithInputValue.inputValue = options.value;
             }
             dialog.setData(Object.assign({ callback: (action, instance) => {
+                    /**
+                     * 在声明式调用的情况下，在 close 后需要手动清空队列
+                     */
+                    queue = [];
                     action === 'confirm' ? resolve(instance) : reject(instance);
                 } }, optionsWithInputValue));
             wx.nextTick(() => {
@@ -53,7 +63,7 @@ const Dialog = (options) => {
             queue.push(dialog);
         }
         else {
-            console.warn('未找到 smart-dialog 节点，请确认 selector 及 context 是否正确');
+            console.warn(`未找到 ${(selector !== null && selector !== void 0 ? selector : '#smart-dialog').replace('#', '')} 节点，请确认 selector 及 context 是否正确`);
         }
     });
 };

package/dist/dialog/index.wxml

@@ -91,7 +91,7 @@
         loading="{{ loading.cancel }}"
         class="smart-dialog__button smart-hairline--right"
         custom-class="smart-dialog__cancel cancle-button-class"
-        custom-style="color: {{ cancelButtonColor || 'var(--app-B4-N3, rgba(0, 0, 0, 0.5))' }}"
+        custom-style="color: {{ cancelButtonColor || 'var(--dialog-cancel-color, var(--app-B4-N3, rgba(0, 0, 0, 0.5)))' }}"
         bind:click="onCancel"
       >
         {{ cancelButtonText }}
@@ -107,7 +107,7 @@
         class="smart-dialog__button"
         loading="{{ loading.confirm }}"
         custom-class="smart-dialog__confirm confirm-button-class"
-        custom-style="color: {{ confirmButtonColor || 'var(--app-B4-N1, rgba(0, 0, 0, 1))' }}"
+        custom-style="color: {{ confirmButtonColor || 'var(--dialog-confirm-color, var(--app-B4-N1, rgba(0, 0, 0, 1)))' }}"
         button-id="{{ confirmButtonId }}"
         open-type="{{ confirmButtonOpenType }}"
         lang="{{ lang }}"

package/dist/index-bar/index.js

@@ -16,6 +16,10 @@ SmartComponent({
         this.updateData();
     }),
     props: {
+        scrollable: {
+            type: Boolean,
+            value: false,
+        },
         sticky: {
             type: Boolean,
             value: true,
@@ -209,6 +213,8 @@ SmartComponent({
             this.scrollToAnchor(event.target.dataset.index);
         },
         onTouchMove(event) {
+            if (!this.data.scrollable)
+                return;
             const sidebarLength = this.children.length;
             const touch = event.touches[0];
             const itemHeight = this.sidebar.height / sidebarLength;
@@ -222,6 +228,8 @@ SmartComponent({
             this.scrollToAnchor(index);
         },
         onTouchStop() {
+            if (!this.data.scrollable)
+                return;
             this.scrollToAnchorIndex = null;
         },
         scrollToAnchor(index) {

package/lib/circle/index.js

@@ -5,10 +5,10 @@ var component_1 = require("../common/component");
 (0, component_1.SmartComponent)({
     props: {
         className: String,
-        style: String,
+        customStyle: String,
         size: {
-            type: Number,
-            value: 100,
+            type: String,
+            value: '100px',
         },
         trackWidth: {
             type: Number,

package/lib/circle/index.wxml

@@ -1,4 +1,4 @@
-<view class="smart-progress-circle" style="width:{{size}}px;height:{{size}}px;padding:{{trackWidth}}px;background:{{fillColor}};{{style}}">
+<view class="smart-progress-circle" style="width:{{size}};height:{{size}};padding:{{trackWidth}}px;background:{{fillColor}};{{customStyle}}">
   <view class="smart-progress-circle-box smart-progress-circle-box-left">
     <view class="smart-progress-circle-bar smart-progress-circle-bar-left" style="transform:{{transformLeft}};background:{{trackColor}};">
     </view>

package/lib/dialog/dialog.js

@@ -48,8 +48,14 @@ function getContext() {
 var Dialog = function (options) {
     options = __assign(__assign({}, currentOptions), options);
     return new Promise(function (resolve, reject) {
+        var _a;
         var context = (typeof options.context === 'function' ? options.context() : options.context) || getContext();
+        var selector = options.selector;
         var dialog = context.selectComponent(options.selector);
+        if ((queue === null || queue === void 0 ? void 0 : queue.length) > 0 && ((_a = queue === null || queue === void 0 ? void 0 : queue[0]) === null || _a === void 0 ? void 0 : _a.id) === (dialog === null || dialog === void 0 ? void 0 : dialog.id)) {
+            console.warn("\u76F8\u540C\u9009\u62E9\u5668\u7684 Dialog \u8C03\u7528\u8FC7\u4E8E\u9891\u7E41\uFF0C".concat(dialog.id, " \u5DF2\u5FFD\u7565\u91CD\u590D\u8C03\u7528"));
+            return;
+        }
         delete options.context;
         delete options.selector;
         if (dialog) {
@@ -58,6 +64,10 @@ var Dialog = function (options) {
                 optionsWithInputValue.inputValue = options.value;
             }
             dialog.setData(__assign({ callback: function (action, instance) {
+                    /**
+                     * 在声明式调用的情况下，在 close 后需要手动清空队列
+                     */
+                    queue = [];
                     action === 'confirm' ? resolve(instance) : reject(instance);
                 } }, optionsWithInputValue));
             wx.nextTick(function () {
@@ -66,7 +76,7 @@ var Dialog = function (options) {
             queue.push(dialog);
         }
         else {
-            console.warn('未找到 smart-dialog 节点，请确认 selector 及 context 是否正确');
+            console.warn("\u672A\u627E\u5230 ".concat((selector !== null && selector !== void 0 ? selector : '#smart-dialog').replace('#', ''), " \u8282\u70B9\uFF0C\u8BF7\u786E\u8BA4 selector \u53CA context \u662F\u5426\u6B63\u786E"));
         }
     });
 };

package/lib/dialog/index.wxml

@@ -91,7 +91,7 @@
         loading="{{ loading.cancel }}"
         class="smart-dialog__button smart-hairline--right"
         custom-class="smart-dialog__cancel cancle-button-class"
-        custom-style="color: {{ cancelButtonColor || 'var(--app-B4-N3, rgba(0, 0, 0, 0.5))' }}"
+        custom-style="color: {{ cancelButtonColor || 'var(--dialog-cancel-color, var(--app-B4-N3, rgba(0, 0, 0, 0.5)))' }}"
         bind:click="onCancel"
       >
         {{ cancelButtonText }}
@@ -107,7 +107,7 @@
         class="smart-dialog__button"
         loading="{{ loading.confirm }}"
         custom-class="smart-dialog__confirm confirm-button-class"
-        custom-style="color: {{ confirmButtonColor || 'var(--app-B4-N1, rgba(0, 0, 0, 1))' }}"
+        custom-style="color: {{ confirmButtonColor || 'var(--dialog-confirm-color, var(--app-B4-N1, rgba(0, 0, 0, 1)))' }}"
         button-id="{{ confirmButtonId }}"
         open-type="{{ confirmButtonOpenType }}"
         lang="{{ lang }}"

package/lib/index-bar/index.js

@@ -18,6 +18,10 @@ var indexList = function () {
         this.updateData();
     }),
     props: {
+        scrollable: {
+            type: Boolean,
+            value: false,
+        },
         sticky: {
             type: Boolean,
             value: true,
@@ -205,6 +209,8 @@ var indexList = function () {
             this.scrollToAnchor(event.target.dataset.index);
         },
         onTouchMove: function (event) {
+            if (!this.data.scrollable)
+                return;
             var sidebarLength = this.children.length;
             var touch = event.touches[0];
             var itemHeight = this.sidebar.height / sidebarLength;
@@ -218,6 +224,8 @@ var indexList = function () {
             this.scrollToAnchor(index);
         },
         onTouchStop: function () {
+            if (!this.data.scrollable)
+                return;
             this.scrollToAnchorIndex = null;
         },
         scrollToAnchor: function (index) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-miniapp/smart-ui",
-  "version": "2.1.7-beta-1",
+  "version": "2.1.7",
   "author": "MiniApp Team",
   "license": "MIT",
   "miniprogram": "lib",
@@ -78,7 +78,7 @@
   ],
   "dependencies": {
     "@ray-js/components-ty-slider": "^0.2.52",
-    "@tuya-miniapp/icons": "2.1.7-beta-1"
+    "@tuya-miniapp/icons": "^2.1.7"
   },
   "maintainers": [
     {