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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/picker-column/index.wxml +1 -1
  2. package/dist/picker-column/index.wxs +8 -1
  3. package/dist/wxs/style.wxs +12 -10
  4. package/lib/picker-column/index.wxml +1 -1
  5. package/lib/picker-column/index.wxs +8 -1
  6. package/lib/wxs/style.wxs +12 -10
  7. package/package.json +1 -1
package/dist/picker-column/index.wxml CHANGED
@@ -16,7 +16,7 @@
16
16
  wx:for-item="option"
17
17
  wx:key="index"
18
18
  data-index="{{ renderStart + index }}"
19
- style="height: {{ itemHeight }}px;{{fontStyle}}{{renderStart + index === currentIndex ? activeStyle : ''}}"
19
+ style="{{computed.wrapperItemStyle({ itemHeight, fontStyle, activeStyle: renderStart + index === currentIndex ? activeStyle : ''})}}"
20
20
  class="smart-ellipsis {{ utils.bem('picker-column__item', { disabled: option && option.disabled, selected: renderStart + index === currentIndex }) }} {{ renderStart + index === currentIndex ? 'active-class' : '' }}"
21
21
  >
22
22
  {{ computed.optionText(option, valueKey) }}
package/dist/picker-column/index.wxs CHANGED
@@ -44,6 +44,13 @@ function wrapperInterStyle(data) {
44
44
  });
45
45
  }
46
46
 
47
+ function wrapperItemStyle({ fontStyle, itemHeight, activeStyle }) {
48
+ const heightStyleStr = "height: " + itemHeight + 'px;'
49
+ const fontStyleStr = style(fontStyle);
50
+ const activeStyleStr = style(activeStyle);
51
+ return heightStyleStr + fontStyleStr + activeStyleStr
52
+ }
53
+
47
54
  // function wrapperItemStyle(data) {
48
55
  // const { index, animationIndex: currentIndex } = data;
49
56
  // const offsetIndex = currentIndex - index;
@@ -60,5 +67,5 @@ module.exports = {
60
67
  rootStyle: rootStyle,
61
68
  wrapperStyle: wrapperStyle,
62
69
  wrapperInterStyle: wrapperInterStyle,
63
- // wrapperItemStyle: wrapperItemStyle
70
+ wrapperItemStyle: wrapperItemStyle
64
71
  };
package/dist/wxs/style.wxs CHANGED
@@ -18,7 +18,7 @@ function style(styles) {
18
18
  }
19
19
 
20
20
  if (array.isArray(styles)) {
21
- return styles
21
+ const str = styles
22
22
  .filter(function (item) {
23
23
  return item != null && item !== '';
24
24
  })
@@ -26,18 +26,20 @@ function style(styles) {
26
26
  return style(item);
27
27
  })
28
28
  .join(';');
29
+ return str.endsWith(';') ? str : str + ';'
29
30
  }
30
31
 
31
32
  if (typeof styles === 'object' && 'Object' === styles.constructor) {
32
- return object
33
- .keys(styles)
34
- .filter(function (key) {
35
- return styles[key] != null && styles[key] !== '';
36
- })
37
- .map(function (key) {
38
- return [kebabCase(key), [styles[key]]].join(':');
39
- })
40
- .join(';');
33
+ const str = object
34
+ .keys(styles)
35
+ .filter(function (key) {
36
+ return styles[key] != null && styles[key] !== '';
37
+ })
38
+ .map(function (key) {
39
+ return [kebabCase(key), [styles[key]]].join(':');
40
+ })
41
+ .join(';');
42
+ return str.endsWith(';') ? str : str + ';'
41
43
  }
42
44
 
43
45
  return styles || '';
package/lib/picker-column/index.wxml CHANGED
@@ -16,7 +16,7 @@
16
16
  wx:for-item="option"
17
17
  wx:key="index"
18
18
  data-index="{{ renderStart + index }}"
19
- style="height: {{ itemHeight }}px;{{fontStyle}}{{renderStart + index === currentIndex ? activeStyle : ''}}"
19
+ style="{{computed.wrapperItemStyle({ itemHeight, fontStyle, activeStyle: renderStart + index === currentIndex ? activeStyle : ''})}}"
20
20
  class="smart-ellipsis {{ utils.bem('picker-column__item', { disabled: option && option.disabled, selected: renderStart + index === currentIndex }) }} {{ renderStart + index === currentIndex ? 'active-class' : '' }}"
21
21
  >
22
22
  {{ computed.optionText(option, valueKey) }}
package/lib/picker-column/index.wxs CHANGED
@@ -44,6 +44,13 @@ function wrapperInterStyle(data) {
44
44
  });
45
45
  }
46
46
 
47
+ function wrapperItemStyle({ fontStyle, itemHeight, activeStyle }) {
48
+ const heightStyleStr = "height: " + itemHeight + 'px;'
49
+ const fontStyleStr = style(fontStyle);
50
+ const activeStyleStr = style(activeStyle);
51
+ return heightStyleStr + fontStyleStr + activeStyleStr
52
+ }
53
+
47
54
  // function wrapperItemStyle(data) {
48
55
  // const { index, animationIndex: currentIndex } = data;
49
56
  // const offsetIndex = currentIndex - index;
@@ -60,5 +67,5 @@ module.exports = {
60
67
  rootStyle: rootStyle,
61
68
  wrapperStyle: wrapperStyle,
62
69
  wrapperInterStyle: wrapperInterStyle,
63
- // wrapperItemStyle: wrapperItemStyle
70
+ wrapperItemStyle: wrapperItemStyle
64
71
  };
package/lib/wxs/style.wxs CHANGED
@@ -18,7 +18,7 @@ function style(styles) {
18
18
  }
19
19
 
20
20
  if (array.isArray(styles)) {
21
- return styles
21
+ const str = styles
22
22
  .filter(function (item) {
23
23
  return item != null && item !== '';
24
24
  })
@@ -26,18 +26,20 @@ function style(styles) {
26
26
  return style(item);
27
27
  })
28
28
  .join(';');
29
+ return str.endsWith(';') ? str : str + ';'
29
30
  }
30
31
 
31
32
  if (typeof styles === 'object' && 'Object' === styles.constructor) {
32
- return object
33
- .keys(styles)
34
- .filter(function (key) {
35
- return styles[key] != null && styles[key] !== '';
36
- })
37
- .map(function (key) {
38
- return [kebabCase(key), [styles[key]]].join(':');
39
- })
40
- .join(';');
33
+ const str = object
34
+ .keys(styles)
35
+ .filter(function (key) {
36
+ return styles[key] != null && styles[key] !== '';
37
+ })
38
+ .map(function (key) {
39
+ return [kebabCase(key), [styles[key]]].join(':');
40
+ })
41
+ .join(';');
42
+ return str.endsWith(';') ? str : str + ';'
41
43
  }
42
44
 
43
45
  return styles || '';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tuya-miniapp/smart-ui",
3
- "version": "2.3.5-beta-2",
3
+ "version": "2.3.5-beta-3",
4
4
  "author": "MiniApp Team",
5
5
  "license": "MIT",
6
6
  "miniprogram": "lib",