Skip to content

Commit 0b74708

Browse files
author
uni
committed
chore(dev): update framework #0
1 parent 74ab2e7 commit 0b74708

File tree

2 files changed

+38
-88
lines changed

2 files changed

+38
-88
lines changed

‎packages/uni-h5/dist-x/uni-h5.es.js‎

Lines changed: 30 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -2179,7 +2179,7 @@ class UniElement extends HTMLElement {
21792179
const uniFormKey = PolySymbol(process.env.NODE_ENV !== "production" ? "uniForm" : "uf");
21802180
class UniFormElement extends UniElement {
21812181
}
2182-
const index$t = /* @__PURE__ */ defineBuiltInComponent({
2182+
const index$u = /* @__PURE__ */ defineBuiltInComponent({
21832183
name: "Form",
21842184
emits: ["submit", "reset"],
21852185
rootElement: {
@@ -2249,7 +2249,7 @@ function useProvideLabel() {
22492249
}
22502250
class UniLabelElement extends UniElement {
22512251
}
2252-
const index$s = /* @__PURE__ */ defineBuiltInComponent({
2252+
const index$t = /* @__PURE__ */ defineBuiltInComponent({
22532253
name: "Label",
22542254
props: labelProps,
22552255
rootElement: {
@@ -2392,7 +2392,7 @@ const buttonProps = {
23922392
};
23932393
class UniButtonElement extends UniElement {
23942394
}
2395-
const index$r = /* @__PURE__ */ defineBuiltInComponent({
2395+
const index$s = /* @__PURE__ */ defineBuiltInComponent({
23962396
name: "Button",
23972397
props: buttonProps,
23982398
rootElement: {
@@ -2524,7 +2524,7 @@ const props$u = {
25242524
};
25252525
class UniCheckboxGroupElement extends UniElement {
25262526
}
2527-
const index$q = /* @__PURE__ */ defineBuiltInComponent({
2527+
const index$r = /* @__PURE__ */ defineBuiltInComponent({
25282528
name: "CheckboxGroup",
25292529
props: props$u,
25302530
emits: ["change"],
@@ -2635,7 +2635,7 @@ const props$t = {
26352635
};
26362636
class UniCheckboxElement extends UniElement {
26372637
}
2638-
const index$p = /* @__PURE__ */ defineBuiltInComponent({
2638+
const index$q = /* @__PURE__ */ defineBuiltInComponent({
26392639
name: "Checkbox",
26402640
props: props$t,
26412641
rootElement: {
@@ -5189,13 +5189,13 @@ const createMediaQueryObserver = /* @__PURE__ */ defineSyncApi("createMediaQuery
51895189
}
51905190
return new ServiceMediaQueryObserver(getCurrentPageVm());
51915191
});
5192-
let index$o = 0;
5192+
let index$p = 0;
51935193
let optionsCache = {};
51945194
function operateEditor(componentId, pageId, type, options) {
51955195
const data = { options };
51965196
const needCallOptions = options && ("success" in options || "fail" in options || "complete" in options);
51975197
if (needCallOptions) {
5198-
const callbackId = String(index$o++);
5198+
const callbackId = String(index$p++);
51995199
data.callbackId = callbackId;
52005200
optionsCache[callbackId] = options;
52015201
}
@@ -11239,7 +11239,7 @@ const props$r = /* @__PURE__ */ extend({}, props$s, {
1123911239
});
1124011240
class UniEditorElement extends UniElement {
1124111241
}
11242-
const index$n = /* @__PURE__ */ defineBuiltInComponent({
11242+
const index$o = /* @__PURE__ */ defineBuiltInComponent({
1124311243
name: "Editor",
1124411244
props: props$r,
1124511245
emit: ["ready", "focus", "blur", "input", "statuschange", ...emit$1],
@@ -11311,7 +11311,7 @@ const ICONS = {
1131111311
};
1131211312
class UniIconElement extends UniElement {
1131311313
}
11314-
const index$m = /* @__PURE__ */ defineBuiltInComponent({
11314+
const index$n = /* @__PURE__ */ defineBuiltInComponent({
1131511315
name: "Icon",
1131611316
props: {
1131711317
type: {
@@ -11456,7 +11456,7 @@ const IMAGE_MODES = {
1145611456
};
1145711457
class UniImageElement extends UniElement {
1145811458
}
11459-
const __syscom_4 = /* @__PURE__ */ defineBuiltInComponent({
11459+
const index$m = /* @__PURE__ */ defineBuiltInComponent({
1146011460
name: "Image",
1146111461
props: props$q,
1146211462
rootElement: {
@@ -28032,7 +28032,6 @@ const showActionSheet = /* @__PURE__ */ defineAsyncApi(
2803228032
);
2803328033
}
2803428034
);
28035-
const loadingPathData = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAXdJREFUSEvdVtFthTAMdAKD0E3oABixwWOSvk5SNkCYAcomZRFIZfSoUl6IQ14l2uYXnMtd7uwoOGmpk3AhGpiI3gEgQ8SnmMM/AmwAYPwfwG3bZkmS5IjY7MlIRCLjruuu8zw3VVWN232cUnOBUurFJ6UEfPNADgC1i4AT+Mb4DQC40HmPPmALdEDEZ5dqu+aSwPk7b7iVMQSU67yutsGNMa9lWV590SGiCwCwUrtM13oxTqvRpmkaXCaxD8L/aq0v0gFFxjGNIbRGZBy60dH/zge23GgfflRK1UVRDEcY9X2fG2O4l2/XVzQXxpZ7l4jY6wFgbkB3+629/Xypj0j5E//+bsY8NLTWg2SykKkW3LkstzeIWPtkDplqQcAW6F2smF2appmtgjRYvqXFM+g5h8tYdEWKiD64dvv0CQV3mstqALsNxDePN+CHHwK5byJJLxDJaNFxkoClrP9JYDYfN31vxPaYRzPmO5ReJD65o4GlO5S+fwJ6r+Yfw6D/nQAAAABJRU5ErkJggg==";
2803628035
const _sfc_main$2 = /* @__PURE__ */ defineComponent({
2803728036
__name: "chooseLocation",
2803828037
setup(__props) {
@@ -28108,9 +28107,6 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
2810828107
const callUniMapCoErr = ref(false);
2810928108
const useUniCloud = ref(true);
2811028109
const mapHeight = ref(350);
28111-
const loadingPath = ref(loadingPathData);
28112-
const loadingRotate = ref(0);
28113-
const loadingTimer = ref(-1);
2811428110
const timeoutTimers = ref([]);
2811528111
const mapTargetRef = ref(null);
2811628112
const scrollRef = ref(null);
@@ -28436,12 +28432,6 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
2843628432
searchValueChangeTimer.value = -1;
2843728433
}
2843828434
};
28439-
const clearLoadingTimer = () => {
28440-
if (loadingTimer.value != -1) {
28441-
clearInterval(loadingTimer.value);
28442-
loadingTimer.value = -1;
28443-
}
28444-
};
2844528435
const clearAllTimeoutTimers = () => {
2844628436
timeoutTimers.value.forEach((timer) => {
2844728437
if (timer != -1) {
@@ -28565,17 +28555,6 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
2856528555
const locale = uni.getLocale();
2856628556
language.value = locale;
2856728557
};
28568-
watch(searchLoading, (val) => {
28569-
clearLoadingTimer();
28570-
if (val) {
28571-
loadingRotate.value += 100;
28572-
loadingTimer.value = setInterval(() => {
28573-
loadingRotate.value += 100;
28574-
}, 200);
28575-
} else {
28576-
loadingRotate.value = 0;
28577-
}
28578-
});
2857928558
const languageCom = computed(() => {
2858028559
const textInfo = languageData[language.value] != null ? languageData[language.value] : languageData["zh-Hans"];
2858128560
return textInfo;
@@ -28629,7 +28608,6 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
2862928608
uni.$off(successEventName.value, null);
2863028609
uni.$off(failEventName.value, null);
2863128610
clearSearchValueChangeTimer();
28632-
clearLoadingTimer();
2863328611
clearAllTimeoutTimers();
2863428612
});
2863528613
onResize(() => {
@@ -28640,7 +28618,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
2864028618
const _component_text = __syscom_1$1;
2864128619
const _component_view = __syscom_2;
2864228620
const _component_input = __syscom_3;
28643-
const _component_image = __syscom_4;
28621+
const _component_loading = _sfc_main$4;
2864428622
const _component_scroll_view = __syscom_2$1;
2864528623
return openBlock(), createBlock(_component_view, {
2864628624
class: normalizeClass(["uni-choose-location", darkClassCom.value])
@@ -28834,12 +28812,9 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
2883428812
class: "uni-choose-location-poi-search-loading"
2883528813
}, {
2883628814
default: withCtx(() => [
28837-
createVNode(_component_image, {
28838-
src: loadingPath.value,
28839-
class: "uni-choose-location-poi-search-loading-image",
28840-
mode: "widthFix",
28841-
style: normalizeStyle("transform: rotate(" + loadingRotate.value + "deg)")
28842-
}, null, 8, ["src", "style"])
28815+
createVNode(_component_loading, {
28816+
class: normalizeClass(["uni-choose-location-poi-search-loading-item", [darkClassCom.value]])
28817+
}, null, 8, ["class"])
2884328818
]),
2884428819
_: 1
2884528820
})) : (openBlock(true), createElementBlock(Fragment, { key: 3 }, renderList(pois.value, (item, index2) => {
@@ -28901,12 +28876,9 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
2890128876
class: "uni-choose-location-poi-search-loading"
2890228877
}, {
2890328878
default: withCtx(() => [
28904-
createVNode(_component_image, {
28905-
src: loadingPath.value,
28906-
class: "uni-choose-location-poi-search-loading-image",
28907-
mode: "widthFix",
28908-
style: normalizeStyle("transform: rotate(" + loadingRotate.value + "deg)")
28909-
}, null, 8, ["src", "style"])
28879+
createVNode(_component_loading, {
28880+
class: normalizeClass(["uni-choose-location-poi-search-loading-item", [darkClassCom.value]])
28881+
}, null, 8, ["class"])
2891028882
]),
2891128883
_: 1
2891228884
})) : createCommentVNode("", true)
@@ -29150,12 +29122,10 @@ const _style_0$2 = `
2915029122
color: #808080;
2915129123
padding-left: 5px;
2915229124
}
29153-
.uni-choose-location-poi-search-loading-image {
29125+
.uni-choose-location-poi-search-loading-item {
2915429126
width: 28px;
2915529127
height: 28px;
29156-
transition-property: transform;
29157-
transition-duration: 0.2s;
29158-
transition-timing-function: linear;
29128+
border-color: #D0D0D0;
2915929129
}
2916029130

2916129131
/* 横屏样式开始 */
@@ -29228,6 +29198,9 @@ const _style_0$2 = `
2922829198
}
2922929199
.uni-choose-location-dark.uni-choose-location-poi-search-error-text {
2923029200
color: #d1d1d1;
29201+
}
29202+
.uni-choose-location-dark.uni-choose-location-poi-search-loading-item {
29203+
border-color: #d1d1d1;
2923129204
}
2923229205
/* 暗黑模式样式结束 */
2923329206
uni-image {
@@ -30304,19 +30277,19 @@ export {
3030430277
index$3 as AdDraw,
3030530278
AsyncErrorComponent,
3030630279
AsyncLoadingComponent,
30307-
index$r as Button,
30280+
index$s as Button,
3030830281
index$2 as Camera,
3030930282
indexX$4 as Canvas,
30310-
index$p as Checkbox,
30311-
index$q as CheckboxGroup,
30283+
index$q as Checkbox,
30284+
index$r as CheckboxGroup,
3031230285
index$7 as CoverImage,
3031330286
index$8 as CoverView,
30314-
index$n as Editor,
30315-
index$t as Form,
30316-
index$m as Icon,
30317-
__syscom_4 as Image,
30287+
index$o as Editor,
30288+
index$u as Form,
30289+
index$n as Icon,
30290+
index$m as Image,
3031830291
__syscom_3 as Input,
30319-
index$s as Label,
30292+
index$t as Label,
3032030293
LayoutComponent,
3032130294
index$g as ListItem,
3032230295
index$h as ListView,

‎uni-ext-api/uni_modules/uni-chooseLocation/pages/chooseLocation/chooseLocation.vue‎

Lines changed: 8 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<view class="uni-choose-location-poi-search-loading" v-else-if="locationLoading"><text
3636
class="uni-choose-location-poi-search-loading-text" :class="[darkClassCom]">{{ languageCom['locationLoading'] }}</text></view>
3737
<view class="uni-choose-location-poi-search-loading" v-else-if="searchLoading && pageIndex == 1">
38-
<image :src="loadingPath" class="uni-choose-location-poi-search-loading-image" mode="widthFix" :style="'transform: rotate('+loadingRotate+'deg)'"></image>
38+
<loading class="uni-choose-location-poi-search-loading-item" :class="[darkClassCom]"></loading>
3939
</view>
4040
<template v-else>
4141
<view v-for="(item,index) in pois" :key="index" class="uni-choose-location-poi-item" :class="[landscapeClassCom]" @click="selectPoi(item, index)">
@@ -49,7 +49,7 @@
4949
</view>
5050
</template>
5151
<view class="uni-choose-location-poi-search-loading" v-if="searchLoading && pageIndex > 1">
52-
<image :src="loadingPath" class="uni-choose-location-poi-search-loading-image" mode="widthFix" :style="'transform: rotate('+loadingRotate+'deg)'"></image>
52+
<loading class="uni-choose-location-poi-search-loading-item" :class="[darkClassCom]"></loading>
5353
</view>
5454
</scroll-view>
5555
</view>
@@ -152,8 +152,6 @@
152152
}
153153
// #endif
154154
155-
const loadingPathData = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAXdJREFUSEvdVtFthTAMdAKD0E3oABixwWOSvk5SNkCYAcomZRFIZfSoUl6IQ14l2uYXnMtd7uwoOGmpk3AhGpiI3gEgQ8SnmMM/AmwAYPwfwG3bZkmS5IjY7MlIRCLjruuu8zw3VVWN232cUnOBUurFJ6UEfPNADgC1i4AT+Mb4DQC40HmPPmALdEDEZ5dqu+aSwPk7b7iVMQSU67yutsGNMa9lWV590SGiCwCwUrtM13oxTqvRpmkaXCaxD8L/aq0v0gFFxjGNIbRGZBy60dH/zge23GgfflRK1UVRDEcY9X2fG2O4l2/XVzQXxpZ7l4jY6wFgbkB3+629/Xypj0j5E//+bsY8NLTWg2SykKkW3LkstzeIWPtkDplqQcAW6F2smF2appmtgjRYvqXFM+g5h8tYdEWKiD64dvv0CQV3mstqALsNxDePN+CHHwK5byJJLxDJaNFxkoClrP9JYDYfN31vxPaYRzPmO5ReJD65o4GlO5S+fwJ6r+Yfw6D/nQAAAABJRU5ErkJggg=='
156-
157155
const currentInstance = getCurrentInstance()!.proxy!
158156
const uniPage = currentInstance.$page
159157
@@ -203,9 +201,6 @@
203201
const callUniMapCoErr = ref(false)
204202
const useUniCloud = ref(true)
205203
const mapHeight = ref(350)
206-
const loadingPath = ref(loadingPathData)
207-
const loadingRotate = ref(0)
208-
const loadingTimer = ref(-1)
209204
const timeoutTimers = ref([] as Array<number>)
210205
211206
const mapTargetRef = ref(null as UniElement | null)
@@ -581,13 +576,6 @@
581576
}
582577
}
583578
584-
const clearLoadingTimer = () => {
585-
if (loadingTimer.value != -1) {
586-
clearInterval(loadingTimer.value);
587-
loadingTimer.value = -1;
588-
}
589-
}
590-
591579
const clearAllTimeoutTimers = () => {
592580
timeoutTimers.value.forEach((timer : number) => {
593581
if (timer != -1) {
@@ -745,18 +733,6 @@
745733
// #endif
746734
}
747735
748-
watch(searchLoading, (val : boolean) => {
749-
clearLoadingTimer();
750-
if (val) {
751-
loadingRotate.value += 100;
752-
loadingTimer.value = setInterval(() => {
753-
loadingRotate.value += 100;
754-
}, 200);
755-
} else {
756-
loadingRotate.value = 0;
757-
}
758-
})
759-
760736
const languageCom = computed(() : UTSJSONObject => {
761737
const textInfo = languageData[language.value] != null ? languageData[language.value] as UTSJSONObject : languageData['zh-Hans'] as UTSJSONObject;
762738
return textInfo;
@@ -818,7 +794,6 @@
818794
uni.$off(successEventName.value, null);
819795
uni.$off(failEventName.value, null);
820796
clearSearchValueChangeTimer();
821-
clearLoadingTimer();
822797
clearAllTimeoutTimers();
823798
})
824799
@@ -1093,12 +1068,10 @@
10931068
padding-left: 5px;
10941069
}
10951070
1096-
.uni-choose-location-poi-search-loading-image {
1071+
.uni-choose-location-poi-search-loading-item {
10971072
width: 28px;
10981073
height: 28px;
1099-
transition-property: transform;
1100-
transition-duration: 0.2s;
1101-
transition-timing-function: linear;
1074+
border-color: #D0D0D0;
11021075
}
11031076
11041077
/* 横屏样式开始 */
@@ -1189,6 +1162,10 @@
11891162
.uni-choose-location-dark.uni-choose-location-poi-search-error-text {
11901163
color: #d1d1d1;
11911164
}
1165+
1166+
.uni-choose-location-dark.uni-choose-location-poi-search-loading-item {
1167+
border-color: #d1d1d1;
1168+
}
11921169
/* 暗黑模式样式结束 */
11931170
11941171
/* #ifdef WEB */

0 commit comments

Comments
 (0)