@tuya-miniapp/smart-ui 2.1.11-beta-2 → 2.1.11-beta-3

package/dist/datetime-picker/index.js

@@ -112,22 +112,22 @@ SmartComponent({
             }
             return this.picker;
         },
-        formatterFunc(type, value) {
-            var _a;
-            const { formatterMap, formatter = defaultFormatter } = this.data;
+        formatterFunc(type, value, data) {
+            var _a, _b;
+            const { formatterMap, formatter = defaultFormatter } = (_a = this === null || this === void 0 ? void 0 : this.data) !== null && _a !== void 0 ? _a : data;
             const mapDetail = formatterMap === null || formatterMap === void 0 ? void 0 : formatterMap[type];
             if (typeof mapDetail === 'string') {
                 return replacePlaceholders(mapDetail, { [type]: value });
             }
             if (typeof mapDetail === 'object') {
-                return (_a = mapDetail[value]) !== null && _a !== void 0 ? _a : formatter(type, value);
+                return (_b = mapDetail[value]) !== null && _b !== void 0 ? _b : formatter(type, value);
             }
             return formatter(type, value);
         },
         updateColumns() {
             const { locale } = this.data;
             const results = this.getOriginColumns().map(column => ({
-                values: column.values.map(value => this.formatterFunc(column.type, value)),
+                values: column.values.map(value => this.formatterFunc(column.type, value, this.data)),
                 order: column.order,
                 unit: locale === null || locale === void 0 ? void 0 : locale[column.type],
             }));
@@ -340,25 +340,25 @@ SmartComponent({
                 });
                 values = [
                     part,
-                    formatter('hour', part ? (!hour ? 12 : hour - 12) : hour),
-                    formatter('minute', minute),
+                    formatter('hour', part ? (!hour ? 12 : hour - 12) : hour, this.data),
+                    formatter('minute', minute, this.data),
                 ];
             }
             else if (type === 'time') {
                 const pair = value.split(':');
-                values = [formatter('hour', pair[0]), formatter('minute', pair[1])];
+                values = [formatter('hour', pair[0], this.data), formatter('minute', pair[1], this.data)];
             }
             else {
                 const date = new Date(value);
                 values = [
-                    formatter('year', `${date.getFullYear()}`),
-                    formatter('month', padZero(date.getMonth() + 1)),
+                    formatter('year', `${date.getFullYear()}`, this.data),
+                    formatter('month', padZero(date.getMonth() + 1), this.data),
                 ];
                 if (type === 'date') {
-                    values.push(formatter('day', padZero(date.getDate())));
+                    values.push(formatter('day', padZero(date.getDate()), this.data));
                 }
                 if (type === 'datetime') {
-                    values.push(formatter('day', padZero(date.getDate())), formatter('hour', padZero(date.getHours())), formatter('minute', padZero(date.getMinutes())));
+                    values.push(formatter('day', padZero(date.getDate()), this.data), formatter('hour', padZero(date.getHours()), this.data), formatter('minute', padZero(date.getMinutes()), this.data));
                 }
             }
             return this.set({ innerValue: value })

package/dist/picker/index.wxml

@@ -19,7 +19,7 @@
       data-index="{{ index }}"
       custom-class="column-class"
       value-key="{{ valueKey }}"
-      style="order: {{ item.order }}; {{ item.style }}"
+      style="order: {{ item.order }}; {{ computed.style(item.style) }}"
       active-style="{{ activeStyle }}"
       options="{{ item.values }}"
       unit="{{ item.unit || unit }}"

package/dist/picker/index.wxs

@@ -39,4 +39,5 @@ module.exports = {
   frameStyle: frameStyle,
   maskStyle: maskStyle,
   columns: columns,
+  style: style
 };

package/dist/wxs/style.wxs

@@ -13,6 +13,10 @@ function kebabCase(word) {
 }
 
 function style(styles) {
+  if (typeof styles === 'string') {
+    return styles
+  }
+
   if (array.isArray(styles)) {
     return styles
       .filter(function (item) {
@@ -24,7 +28,7 @@ function style(styles) {
       .join(';');
   }
 
-  if ('Object' === styles.constructor) {
+  if (typeof styles === 'object' && 'Object' === styles.constructor) {
     return object
       .keys(styles)
       .filter(function (key) {
@@ -35,9 +39,6 @@ function style(styles) {
       })
       .join(';');
   }
-  if (typeof styles === 'string') {
-    return styles
-  }
 
   return styles || '';
 }

package/lib/datetime-picker/index.js

@@ -143,16 +143,16 @@ var defaultFormatter = function (type, value) {
             }
             return this.picker;
         },
-        formatterFunc: function (type, value) {
+        formatterFunc: function (type, value, data) {
             var _a;
-            var _b;
-            var _c = this.data, formatterMap = _c.formatterMap, _d = _c.formatter, formatter = _d === void 0 ? defaultFormatter : _d;
+            var _b, _c;
+            var _d = (_b = this === null || this === void 0 ? void 0 : this.data) !== null && _b !== void 0 ? _b : data, formatterMap = _d.formatterMap, _e = _d.formatter, formatter = _e === void 0 ? defaultFormatter : _e;
             var mapDetail = formatterMap === null || formatterMap === void 0 ? void 0 : formatterMap[type];
             if (typeof mapDetail === 'string') {
                 return (0, utils_1.replacePlaceholders)(mapDetail, (_a = {}, _a[type] = value, _a));
             }
             if (typeof mapDetail === 'object') {
-                return (_b = mapDetail[value]) !== null && _b !== void 0 ? _b : formatter(type, value);
+                return (_c = mapDetail[value]) !== null && _c !== void 0 ? _c : formatter(type, value);
             }
             return formatter(type, value);
         },
@@ -160,7 +160,7 @@ var defaultFormatter = function (type, value) {
             var _this = this;
             var locale = this.data.locale;
             var results = this.getOriginColumns().map(function (column) { return ({
-                values: column.values.map(function (value) { return _this.formatterFunc(column.type, value); }),
+                values: column.values.map(function (value) { return _this.formatterFunc(column.type, value, _this.data); }),
                 order: column.order,
                 unit: locale === null || locale === void 0 ? void 0 : locale[column.type],
             }); });
@@ -376,25 +376,25 @@ var defaultFormatter = function (type, value) {
                 });
                 values = [
                     part,
-                    formatter('hour', part ? (!hour ? 12 : hour - 12) : hour),
-                    formatter('minute', minute),
+                    formatter('hour', part ? (!hour ? 12 : hour - 12) : hour, this.data),
+                    formatter('minute', minute, this.data),
                 ];
             }
             else if (type === 'time') {
                 var pair = value.split(':');
-                values = [formatter('hour', pair[0]), formatter('minute', pair[1])];
+                values = [formatter('hour', pair[0], this.data), formatter('minute', pair[1], this.data)];
             }
             else {
                 var date = new Date(value);
                 values = [
-                    formatter('year', "".concat(date.getFullYear())),
-                    formatter('month', padZero(date.getMonth() + 1)),
+                    formatter('year', "".concat(date.getFullYear()), this.data),
+                    formatter('month', padZero(date.getMonth() + 1), this.data),
                 ];
                 if (type === 'date') {
-                    values.push(formatter('day', padZero(date.getDate())));
+                    values.push(formatter('day', padZero(date.getDate()), this.data));
                 }
                 if (type === 'datetime') {
-                    values.push(formatter('day', padZero(date.getDate())), formatter('hour', padZero(date.getHours())), formatter('minute', padZero(date.getMinutes())));
+                    values.push(formatter('day', padZero(date.getDate()), this.data), formatter('hour', padZero(date.getHours()), this.data), formatter('minute', padZero(date.getMinutes()), this.data));
                 }
             }
             return this.set({ innerValue: value })

package/lib/picker/index.wxml

@@ -19,7 +19,7 @@
       data-index="{{ index }}"
       custom-class="column-class"
       value-key="{{ valueKey }}"
-      style="order: {{ item.order }}; {{ item.style }}"
+      style="order: {{ item.order }}; {{ computed.style(item.style) }}"
       active-style="{{ activeStyle }}"
       options="{{ item.values }}"
       unit="{{ item.unit || unit }}"

package/lib/picker/index.wxs

@@ -39,4 +39,5 @@ module.exports = {
   frameStyle: frameStyle,
   maskStyle: maskStyle,
   columns: columns,
+  style: style
 };

package/lib/wxs/style.wxs

@@ -13,6 +13,10 @@ function kebabCase(word) {
 }
 
 function style(styles) {
+  if (typeof styles === 'string') {
+    return styles
+  }
+
   if (array.isArray(styles)) {
     return styles
       .filter(function (item) {
@@ -24,7 +28,7 @@ function style(styles) {
       .join(';');
   }
 
-  if ('Object' === styles.constructor) {
+  if (typeof styles === 'object' && 'Object' === styles.constructor) {
     return object
       .keys(styles)
       .filter(function (key) {
@@ -35,9 +39,6 @@ function style(styles) {
       })
       .join(';');
   }
-  if (typeof styles === 'string') {
-    return styles
-  }
 
   return styles || '';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuya-miniapp/smart-ui",
-  "version": "2.1.11-beta-2",
+  "version": "2.1.11-beta-3",
   "author": "MiniApp Team",
   "license": "MIT",
   "miniprogram": "lib",