@kaiyinchem/ky-uniui 1.1.17 → 1.1.18

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.
@@ -56,11 +56,7 @@
56
56
  <slot v-else name="content"></slot>
57
57
  </view>
58
58
  <!--位置占位-->
59
- <view
60
- v-if="fixed"
61
- :class="{ iphoneX: safeBottom > 0, noPadding }"
62
- class="btn-space">
63
- </view>
59
+ <view v-if="fixed" class="btn-space"></view>
64
60
  </view>
65
61
  </template>
66
62
 
@@ -156,9 +152,6 @@
156
152
  hasSlots() {
157
153
  return Object.keys(this.$slots).length
158
154
  },
159
- safeBottom() {
160
- return uni.getSystemInfoSync().safeAreaInsets.bottom
161
- }
162
155
  },
163
156
  methods: {
164
157
  onClick(e) {
@@ -414,15 +407,9 @@
414
407
  }
415
408
  }
416
409
  .btn-space {
417
- height: 120rpx;
418
- &.iphoneX {
419
- height: 150rpx;
420
- }
410
+ height: calc(120rpx + var(--window-bottom));
421
411
  &.noPadding {
422
- height: 90rpx;
423
- &.iphoneX {
424
- height: 120rpx;
425
- }
412
+ height: calc(90rpx + var(--window-bottom));
426
413
  }
427
414
  }
428
415
 
@@ -10,7 +10,7 @@
10
10
  </view>
11
11
  </view>
12
12
 
13
- <view v-if="loadState === 0 || !loadState" :class="{ isRelative }" class="ky-fetch-loading">
13
+ <view v-if="loadState === 0 || !loadState" :class="{ isRelative, hasLoadingSlots: !!$slots.loading }" class="ky-fetch-loading">
14
14
  <ky-loading v-if="!$slots.loading" :type="loadingType" :isRelative="isRelative"></ky-loading>
15
15
  <slot name="loading"></slot>
16
16
  </view>
@@ -320,6 +320,10 @@
320
320
  position: relative;
321
321
  min-height: 100rpx;
322
322
  }
323
+ &.hasLoadingSlots {
324
+ padding: 0;
325
+ min-height: inherit;
326
+ }
323
327
  }
324
328
  .ky-fetch-error {
325
329
  position: absolute;
@@ -53,10 +53,10 @@
53
53
  </view>
54
54
  <view v-if="$slots.footer" :class="{'white-bg': !noFooterBg}" class="pop-footer">
55
55
  <slot name="footer"></slot>
56
- <view :style="{height: $safeBottom - 15 + 'px'}"></view>
56
+ <view style="{height: var(--window-bottom)}"></view>
57
57
  </view>
58
58
  <!--iPhoneX等机型手势条底部高度-->
59
- <view v-if="!$slots.footer" :style="{height: $safeBottom - 15 + 'px'}"></view>
59
+ <view v-if="!$slots.footer" style="{height: var(--window-bottom)}"></view>
60
60
  </view>
61
61
  <!--############## end 底部弹出层 ##############-->
62
62
 
@@ -283,9 +283,6 @@
283
283
  hasSlots() {
284
284
  return Object.keys(this.$slots).length
285
285
  },
286
- $safeBottom() {
287
- return uni.getSystemInfoSync().safeAreaInsets.bottom
288
- }
289
286
  },
290
287
  watch: {
291
288
  value(v) {
@@ -9,7 +9,7 @@
9
9
  </template>
10
10
 
11
11
  <script>
12
- const isDark = uni.getSystemInfoSync().theme === 'dark'
12
+ const isDark = uni.getAppBaseInfo().theme !== 'light'
13
13
 
14
14
  export default {
15
15
  emits: ['update:value', 'change'],
@@ -4,7 +4,6 @@
4
4
  :class="{
5
5
  fixed: position === 'fixed',
6
6
  sticky: position === 'sticky',
7
- iphonex: $safeBottom > 0 && position === 'fixed',
8
7
  icon: hasIcon,
9
8
  scroll: scrollX,
10
9
  card: type === 'card',
@@ -121,9 +120,6 @@
121
120
  hasIcon() {
122
121
  return this.menu.find(e => e.icon)
123
122
  },
124
- $safeBottom() {
125
- return uni.getSystemInfoSync().safeAreaInsets.bottom
126
- }
127
123
  },
128
124
  mounted() {
129
125
  this.onTabClick(typeof this.value !== 'undefined' ? this.value : this.index)
@@ -213,7 +209,7 @@
213
209
  right: 0;
214
210
  bottom: 0;
215
211
  &.iphonex {
216
- padding-bottom: 50rpx;
212
+ padding-bottom: var(--window-bottom);
217
213
  }
218
214
  }
219
215
  &.sticky {
package/package.json CHANGED
@@ -9,7 +9,7 @@
9
9
  "locale"
10
10
  ],
11
11
  "description": "an uniapp ui",
12
- "version": "1.1.17",
12
+ "version": "1.1.18",
13
13
  "repository": {
14
14
  "type": "git",
15
15
  "url": "git+https://github.com/yezipi/ky-uniui.git"
@@ -27,7 +27,7 @@
27
27
  "scripts": {},
28
28
  "license": "ISC",
29
29
  "dependencies": {
30
- "@dcloudio/uni-ui": "^1.4.28",
31
- "vue-i18n": "^9.13.1"
30
+ "@dcloudio/uni-ui": "^1.5.1",
31
+ "vue-i18n": "^11.2.8"
32
32
  }
33
33
  }