@nutui/nutui 3.1.14 → 3.1.16-beta.1
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.
- package/CHANGELOG.md +36 -0
- package/README.md +3 -3
- package/dist/nutui.d.ts +8 -5
- package/dist/nutui.es.js +1016 -740
- package/dist/nutui.umd.js +1022 -743
- package/dist/packages/_es/ActionSheet.js +1 -1
- package/dist/packages/_es/Address.js +2 -4
- package/dist/packages/_es/Avatar.js +1 -1
- package/dist/packages/_es/BackTop.js +1 -1
- package/dist/packages/_es/Badge.js +1 -1
- package/dist/packages/_es/Barrage.js +1 -1
- package/dist/packages/_es/Button.js +1 -1
- package/dist/packages/_es/Calendar.js +1 -1
- package/dist/packages/_es/Card.js +1 -1
- package/dist/packages/_es/Cascader.js +1 -1
- package/dist/packages/_es/Cell.js +1 -1
- package/dist/packages/_es/CellGroup.js +1 -1
- package/dist/packages/_es/Checkbox.js +1 -1
- package/dist/packages/_es/CheckboxGroup.js +1 -1
- package/dist/packages/_es/CircleProgress.js +1 -1
- package/dist/packages/_es/Col.js +1 -1
- package/dist/packages/_es/Collapse.js +1 -1
- package/dist/packages/_es/CollapseItem.js +11 -3
- package/dist/packages/_es/CountDown.js +1 -1
- package/dist/packages/_es/CountUp.js +1 -1
- package/dist/packages/_es/DatePicker.js +2 -4
- package/dist/packages/_es/Dialog.js +1 -1
- package/dist/packages/_es/Divider.js +1 -1
- package/dist/packages/_es/Drag.js +1 -1
- package/dist/packages/_es/Elevator.js +1 -1
- package/dist/packages/_es/Empty.js +1 -1
- package/dist/packages/_es/FixedNav.js +1 -1
- package/dist/packages/_es/Form.js +10 -7
- package/dist/packages/_es/FormItem.js +1 -1
- package/dist/packages/_es/Grid.js +1 -1
- package/dist/packages/_es/GridItem.js +1 -1
- package/dist/packages/_es/Icon.js +1 -1
- package/dist/packages/_es/ImagePreview.js +104 -10
- package/dist/packages/_es/Indicator.js +1 -1
- package/dist/packages/_es/InfiniteLoading.js +1 -1
- package/dist/packages/_es/Input.js +15 -10
- package/dist/packages/_es/InputNumber.js +2 -2
- package/dist/packages/_es/Layout.js +1 -1
- package/dist/packages/_es/Menu.js +3 -3
- package/dist/packages/_es/MenuItem.js +1 -1
- package/dist/packages/_es/Navbar.js +6 -32
- package/dist/packages/_es/NoticeBar.js +2 -2
- package/dist/packages/_es/Notify.js +1 -1
- package/dist/packages/_es/NumberKeyboard.js +1 -1
- package/dist/packages/_es/OverLay.js +1 -1
- package/dist/packages/_es/Pagination.js +1 -1
- package/dist/packages/_es/Picker.js +170 -189
- package/dist/packages/_es/Popover.js +1 -1
- package/dist/packages/_es/Popup.js +8 -4
- package/dist/packages/_es/Price.js +1 -1
- package/dist/packages/_es/Progress.js +1 -1
- package/dist/packages/_es/Radio.js +1 -1
- package/dist/packages/_es/RadioGroup.js +1 -1
- package/dist/packages/_es/Range.js +2 -2
- package/dist/packages/_es/Rate.js +1 -1
- package/dist/packages/_es/Row.js +1 -1
- package/dist/packages/_es/SearchBar.js +1 -1
- package/dist/packages/_es/ShortPassword.js +1 -1
- package/dist/packages/_es/SideNavBar.js +104 -0
- package/dist/packages/_es/SideNavBarItem.js +50 -0
- package/dist/packages/_es/Signature.js +1 -1
- package/dist/packages/_es/Skeleton.js +1 -1
- package/dist/packages/_es/Sku.js +1 -2
- package/dist/packages/_es/Step.js +1 -1
- package/dist/packages/_es/Steps.js +1 -1
- package/dist/packages/_es/SubSideNavBar.js +104 -0
- package/dist/packages/_es/Swipe.js +1 -1
- package/dist/packages/_es/Swiper.js +1 -1
- package/dist/packages/_es/SwiperItem.js +1 -1
- package/dist/packages/_es/Switch.js +1 -1
- package/dist/packages/_es/TabPane.js +1 -1
- package/dist/packages/_es/Tabbar.js +6 -2
- package/dist/packages/_es/TabbarItem.js +1 -1
- package/dist/packages/_es/Table.js +9 -3
- package/dist/packages/_es/Tabs.js +1 -1
- package/dist/packages/_es/Tag.js +1 -1
- package/dist/packages/_es/TextArea.js +9 -4
- package/dist/packages/_es/TimeDetail.js +1 -1
- package/dist/packages/_es/TimePannel.js +1 -1
- package/dist/packages/_es/TimeSelect.js +1 -1
- package/dist/packages/_es/Toast.js +1 -1
- package/dist/packages/_es/Uploader.js +6 -4
- package/dist/packages/_es/Video.js +1 -1
- package/dist/packages/_es/common.js +1 -1
- package/dist/packages/_es/component.js +1 -1
- package/dist/packages/_es/index.js +1 -1
- package/dist/packages/_es/index2.js +1 -1
- package/dist/packages/_es/index3.js +1 -1
- package/dist/packages/_es/plugin-vue_export-helper.js +1 -1
- package/dist/packages/_es/pxCheck.js +1 -1
- package/dist/packages/_es/raf.js +1 -1
- package/dist/packages/_es/util.js +1 -1
- package/dist/packages/actionsheet/index.scss +2 -2
- package/dist/packages/address/index.scss +2 -0
- package/dist/packages/button/index.scss +3 -0
- package/dist/packages/cascader/index.scss +13 -13
- package/dist/packages/icon/index.scss +101 -11
- package/dist/packages/imagepreview/index.scss +1 -0
- package/dist/packages/input/index.scss +4 -1
- package/dist/packages/menu/index.scss +10 -6
- package/dist/packages/menuitem/index.scss +9 -8
- package/dist/packages/navbar/index.scss +8 -34
- package/dist/packages/noticebar/index.scss +11 -11
- package/dist/packages/picker/index.scss +74 -22
- package/dist/packages/progress/index.scss +2 -8
- package/dist/packages/shortpassword/index.scss +6 -6
- package/dist/packages/sidenavbar/index.scss +14 -0
- package/dist/packages/sidenavbaritem/index.scss +10 -0
- package/dist/packages/sku/index.scss +1 -1
- package/dist/packages/subsidenavbar/index.scss +39 -0
- package/dist/packages/tabbar/index.scss +5 -1
- package/dist/packages/textarea/index.scss +1 -1
- package/dist/style.css +1 -1
- package/dist/styles/animation/icon.scss +245 -0
- package/dist/styles/animation/index.scss +1 -0
- package/dist/styles/font/config.json +36 -0
- package/dist/styles/font/demo_index.html +26 -3
- package/dist/styles/font/iconfont.css +7 -3
- package/dist/styles/font/iconfont.js +1 -1
- package/dist/styles/font/iconfont.json +7 -0
- package/dist/styles/font/iconfont.ttf +0 -0
- package/dist/styles/font/iconfont.woff +0 -0
- package/dist/styles/font/iconfont.woff2 +0 -0
- package/dist/styles/themes/default.scss +37 -34
- package/dist/styles/themes/jdd.scss +2 -0
- package/dist/styles/variables.scss +72 -68
- package/package.json +7 -3
|
@@ -18,7 +18,7 @@ var __spreadValues = (a, b) => {
|
|
|
18
18
|
};
|
|
19
19
|
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
20
20
|
/*!
|
|
21
|
-
* @nutui/nutui v3.1.
|
|
21
|
+
* @nutui/nutui v3.1.16-beta.1 Thu Jan 27 2022 18:18:31 GMT+0800 (中国标准时间)
|
|
22
22
|
* (c) 2021 @jdf2e.
|
|
23
23
|
* Released under the MIT License.
|
|
24
24
|
*/
|
|
@@ -15,7 +15,7 @@ var __spreadValues = (a, b) => {
|
|
|
15
15
|
return a;
|
|
16
16
|
};
|
|
17
17
|
/*!
|
|
18
|
-
* @nutui/nutui v3.1.
|
|
18
|
+
* @nutui/nutui v3.1.16-beta.1 Thu Jan 27 2022 18:18:31 GMT+0800 (中国标准时间)
|
|
19
19
|
* (c) 2021 @jdf2e.
|
|
20
20
|
* Released under the MIT License.
|
|
21
21
|
*/
|
|
@@ -429,7 +429,6 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
429
429
|
class: "region-item-icon",
|
|
430
430
|
type: "self",
|
|
431
431
|
name: _ctx.selectedIcon,
|
|
432
|
-
color: "#FA2C19",
|
|
433
432
|
size: "13px"
|
|
434
433
|
}, null, 8, ["name"])) : createCommentVNode("", true),
|
|
435
434
|
createTextVNode(toDisplayString(item.name), 1)
|
|
@@ -474,9 +473,8 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
474
473
|
class: "exist-item-icon",
|
|
475
474
|
type: "self",
|
|
476
475
|
name: item.selectedAddress ? _ctx.selectedIcon : _ctx.defaultIcon,
|
|
477
|
-
color: item.selectedAddress ? "#FA2C19" : "",
|
|
478
476
|
size: "13px"
|
|
479
|
-
}, null, 8, ["name"
|
|
477
|
+
}, null, 8, ["name"]),
|
|
480
478
|
createElementVNode("div", _hoisted_18, [
|
|
481
479
|
item.name && item.phone ? (openBlock(), createElementBlock("div", _hoisted_19, [
|
|
482
480
|
createElementVNode("div", _hoisted_20, toDisplayString(item.name), 1),
|
|
@@ -15,7 +15,7 @@ var __spreadValues = (a, b) => {
|
|
|
15
15
|
return a;
|
|
16
16
|
};
|
|
17
17
|
/*!
|
|
18
|
-
* @nutui/nutui v3.1.
|
|
18
|
+
* @nutui/nutui v3.1.16-beta.1 Thu Jan 27 2022 18:18:31 GMT+0800 (中国标准时间)
|
|
19
19
|
* (c) 2021 @jdf2e.
|
|
20
20
|
* Released under the MIT License.
|
|
21
21
|
*/
|
|
@@ -35,7 +35,7 @@ var __publicField = (obj, key, value) => {
|
|
|
35
35
|
return value;
|
|
36
36
|
};
|
|
37
37
|
/*!
|
|
38
|
-
* @nutui/nutui v3.1.
|
|
38
|
+
* @nutui/nutui v3.1.16-beta.1 Thu Jan 27 2022 18:18:31 GMT+0800 (中国标准时间)
|
|
39
39
|
* (c) 2021 @jdf2e.
|
|
40
40
|
* Released under the MIT License.
|
|
41
41
|
*/
|
package/dist/packages/_es/Col.js
CHANGED
|
@@ -18,7 +18,7 @@ var __spreadValues = (a, b) => {
|
|
|
18
18
|
};
|
|
19
19
|
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
20
20
|
/*!
|
|
21
|
-
* @nutui/nutui v3.1.
|
|
21
|
+
* @nutui/nutui v3.1.16-beta.1 Thu Jan 27 2022 18:18:31 GMT+0800 (中国标准时间)
|
|
22
22
|
* (c) 2021 @jdf2e.
|
|
23
23
|
* Released under the MIT License.
|
|
24
24
|
*/
|
|
@@ -49,7 +49,7 @@ const _sfc_main = create({
|
|
|
49
49
|
type: Object
|
|
50
50
|
}
|
|
51
51
|
},
|
|
52
|
-
setup(props) {
|
|
52
|
+
setup(props, ctx) {
|
|
53
53
|
const collapse = inject("collapseParent");
|
|
54
54
|
const parent = reactive(collapse);
|
|
55
55
|
const classes = computed(() => {
|
|
@@ -93,7 +93,7 @@ const _sfc_main = create({
|
|
|
93
93
|
if (!wrapperRefEle || !contentRefEle) {
|
|
94
94
|
return;
|
|
95
95
|
}
|
|
96
|
-
const offsetHeight = contentRefEle.offsetHeight;
|
|
96
|
+
const offsetHeight = contentRefEle.offsetHeight || "auto";
|
|
97
97
|
if (offsetHeight) {
|
|
98
98
|
const contentHeight = `${offsetHeight}px`;
|
|
99
99
|
wrapperRefEle.style.willChange = "height";
|
|
@@ -152,6 +152,14 @@ const _sfc_main = create({
|
|
|
152
152
|
proxyData.openExpanded = true;
|
|
153
153
|
}
|
|
154
154
|
});
|
|
155
|
+
watch(() => {
|
|
156
|
+
var _a, _b;
|
|
157
|
+
return (_b = (_a = ctx == null ? void 0 : ctx.slots) == null ? void 0 : _a.default) == null ? void 0 : _b.call(_a);
|
|
158
|
+
}, () => {
|
|
159
|
+
setTimeout(() => {
|
|
160
|
+
animation();
|
|
161
|
+
}, 300);
|
|
162
|
+
});
|
|
155
163
|
onMounted(() => {
|
|
156
164
|
const { name } = props;
|
|
157
165
|
const active = parent && parent.props.active;
|
|
@@ -18,7 +18,7 @@ var __spreadValues = (a, b) => {
|
|
|
18
18
|
};
|
|
19
19
|
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
20
20
|
/*!
|
|
21
|
-
* @nutui/nutui v3.1.
|
|
21
|
+
* @nutui/nutui v3.1.16-beta.1 Thu Jan 27 2022 18:18:31 GMT+0800 (中国标准时间)
|
|
22
22
|
* (c) 2021 @jdf2e.
|
|
23
23
|
* Released under the MIT License.
|
|
24
24
|
*/
|
|
@@ -18,7 +18,7 @@ var __spreadValues = (a, b) => {
|
|
|
18
18
|
};
|
|
19
19
|
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
20
20
|
/*!
|
|
21
|
-
* @nutui/nutui v3.1.
|
|
21
|
+
* @nutui/nutui v3.1.16-beta.1 Thu Jan 27 2022 18:18:31 GMT+0800 (中国标准时间)
|
|
22
22
|
* (c) 2021 @jdf2e.
|
|
23
23
|
* Released under the MIT License.
|
|
24
24
|
*/
|
|
@@ -18,7 +18,7 @@ var __spreadValues = (a, b) => {
|
|
|
18
18
|
};
|
|
19
19
|
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
20
20
|
/*!
|
|
21
|
-
* @nutui/nutui v3.1.
|
|
21
|
+
* @nutui/nutui v3.1.16-beta.1 Thu Jan 27 2022 18:18:31 GMT+0800 (中国标准时间)
|
|
22
22
|
* (c) 2021 @jdf2e.
|
|
23
23
|
* Released under the MIT License.
|
|
24
24
|
*/
|
|
@@ -26,7 +26,6 @@ import { reactive, computed, onMounted, watch, toRefs, resolveComponent, openBlo
|
|
|
26
26
|
import picker from "./Picker.js";
|
|
27
27
|
import { c as createComponent } from "./component.js";
|
|
28
28
|
import { _ as _export_sfc } from "./plugin-vue_export-helper.js";
|
|
29
|
-
import "./index2.js";
|
|
30
29
|
import "./Popup.js";
|
|
31
30
|
import "./OverLay.js";
|
|
32
31
|
import "./Icon.js";
|
|
@@ -200,8 +199,6 @@ const _sfc_main = create({
|
|
|
200
199
|
}
|
|
201
200
|
};
|
|
202
201
|
const generateValue = (min, max, val, type) => {
|
|
203
|
-
if (!(max > min))
|
|
204
|
-
return;
|
|
205
202
|
const arr = [];
|
|
206
203
|
let index2 = 0;
|
|
207
204
|
while (min <= max) {
|
|
@@ -238,6 +235,7 @@ const _sfc_main = create({
|
|
|
238
235
|
return 0;
|
|
239
236
|
};
|
|
240
237
|
const columns = computed(() => {
|
|
238
|
+
console.log(ranges.value);
|
|
241
239
|
const val = ranges.value.map((res) => {
|
|
242
240
|
return generateValue(res.range[0], res.range[1], getDateIndex(res.type), res.type);
|
|
243
241
|
});
|
|
@@ -22,7 +22,7 @@ var __publicField = (obj, key, value) => {
|
|
|
22
22
|
return value;
|
|
23
23
|
};
|
|
24
24
|
/*!
|
|
25
|
-
* @nutui/nutui v3.1.
|
|
25
|
+
* @nutui/nutui v3.1.16-beta.1 Thu Jan 27 2022 18:18:31 GMT+0800 (中国标准时间)
|
|
26
26
|
* (c) 2021 @jdf2e.
|
|
27
27
|
* Released under the MIT License.
|
|
28
28
|
*/
|
|
@@ -18,7 +18,7 @@ var __spreadValues = (a, b) => {
|
|
|
18
18
|
};
|
|
19
19
|
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
20
20
|
/*!
|
|
21
|
-
* @nutui/nutui v3.1.
|
|
21
|
+
* @nutui/nutui v3.1.16-beta.1 Thu Jan 27 2022 18:18:31 GMT+0800 (中国标准时间)
|
|
22
22
|
* (c) 2021 @jdf2e.
|
|
23
23
|
* Released under the MIT License.
|
|
24
24
|
*/
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*!
|
|
2
|
-
* @nutui/nutui v3.1.
|
|
2
|
+
* @nutui/nutui v3.1.16-beta.1 Thu Jan 27 2022 18:18:31 GMT+0800 (中国标准时间)
|
|
3
3
|
* (c) 2021 @jdf2e.
|
|
4
4
|
* Released under the MIT License.
|
|
5
5
|
*/
|
|
@@ -19,16 +19,16 @@ const component = {
|
|
|
19
19
|
setup(props, { emit, slots }) {
|
|
20
20
|
const formErrorTip = computed(() => reactive({}));
|
|
21
21
|
provide("formErrorTip", formErrorTip);
|
|
22
|
-
const
|
|
23
|
-
Object.keys(value).forEach((item) => {
|
|
22
|
+
const clearErrorTips = (value = props.modelValue) => {
|
|
23
|
+
Object.keys(formErrorTip.value).forEach((item) => {
|
|
24
24
|
formErrorTip.value[item] = "";
|
|
25
25
|
});
|
|
26
26
|
};
|
|
27
27
|
const reset = () => {
|
|
28
|
-
|
|
28
|
+
clearErrorTips();
|
|
29
29
|
};
|
|
30
30
|
watch(() => props.modelValue, (value) => {
|
|
31
|
-
|
|
31
|
+
clearErrorTips(value);
|
|
32
32
|
}, { immediate: true });
|
|
33
33
|
const findFormItem = (vnodes) => {
|
|
34
34
|
let task = [];
|
|
@@ -41,7 +41,7 @@ const component = {
|
|
|
41
41
|
prop: (_a = vnode.props) == null ? void 0 : _a["prop"],
|
|
42
42
|
rules: ((_b = vnode.props) == null ? void 0 : _b["rules"]) || []
|
|
43
43
|
});
|
|
44
|
-
} else if ((_c = vnode.children) == null ? void 0 : _c.length) {
|
|
44
|
+
} else if (Array.isArray(vnode.children) && ((_c = vnode.children) == null ? void 0 : _c.length)) {
|
|
45
45
|
task = task.concat(findFormItem(vnode.children));
|
|
46
46
|
}
|
|
47
47
|
});
|
|
@@ -64,7 +64,10 @@ const component = {
|
|
|
64
64
|
const getPropByPath = (obj, keyPath) => {
|
|
65
65
|
return keyPath.split(".").reduce((prev, curr) => prev[curr], obj);
|
|
66
66
|
};
|
|
67
|
-
|
|
67
|
+
if (!prop) {
|
|
68
|
+
console.warn("[NutUI] <FormItem> \u4F7F\u7528 rules \u6821\u9A8C\u89C4\u5219\u65F6 , \u5FC5\u987B\u8BBE\u7F6E prop \u53C2\u6570");
|
|
69
|
+
}
|
|
70
|
+
let value = getPropByPath(props.modelValue, prop || "");
|
|
68
71
|
tipMessage({ prop, message: "" });
|
|
69
72
|
while (rules.length) {
|
|
70
73
|
const { required, validator, regex, message } = rules.shift();
|
|
@@ -22,7 +22,7 @@ var __publicField = (obj, key, value) => {
|
|
|
22
22
|
return value;
|
|
23
23
|
};
|
|
24
24
|
/*!
|
|
25
|
-
* @nutui/nutui v3.1.
|
|
25
|
+
* @nutui/nutui v3.1.16-beta.1 Thu Jan 27 2022 18:18:31 GMT+0800 (中国标准时间)
|
|
26
26
|
* (c) 2021 @jdf2e.
|
|
27
27
|
* Released under the MIT License.
|
|
28
28
|
*/
|
|
@@ -67,6 +67,10 @@ const _sfc_main = create({
|
|
|
67
67
|
paginationColor: {
|
|
68
68
|
type: String,
|
|
69
69
|
default: "#fff"
|
|
70
|
+
},
|
|
71
|
+
autoplay: {
|
|
72
|
+
type: [Number, String],
|
|
73
|
+
default: 3e3
|
|
70
74
|
}
|
|
71
75
|
},
|
|
72
76
|
emits: ["close"],
|
|
@@ -89,7 +93,13 @@ const _sfc_main = create({
|
|
|
89
93
|
options: {
|
|
90
94
|
muted: true,
|
|
91
95
|
controls: true
|
|
92
|
-
}
|
|
96
|
+
},
|
|
97
|
+
eleImg: null,
|
|
98
|
+
store: {
|
|
99
|
+
scale: 1,
|
|
100
|
+
moveable: false
|
|
101
|
+
},
|
|
102
|
+
lastTouchEndTime: 0
|
|
93
103
|
});
|
|
94
104
|
const slideChangeEnd = function(page) {
|
|
95
105
|
state.active = page + 1;
|
|
@@ -101,11 +111,88 @@ const _sfc_main = create({
|
|
|
101
111
|
};
|
|
102
112
|
const onClose = () => {
|
|
103
113
|
state.showPop = false;
|
|
114
|
+
state.store.scale = 1;
|
|
115
|
+
scaleNow();
|
|
104
116
|
state.active = 1;
|
|
105
117
|
emit("close");
|
|
106
118
|
};
|
|
119
|
+
const getDistance = (first, second) => {
|
|
120
|
+
return Math.hypot(Math.abs(second.x - first.x), Math.abs(second.y - first.y));
|
|
121
|
+
};
|
|
122
|
+
const scaleNow = () => {
|
|
123
|
+
state.eleImg.style.transform = "scale(" + state.store.scale + ")";
|
|
124
|
+
};
|
|
125
|
+
const onTouchStart = (event) => {
|
|
126
|
+
console.log("start");
|
|
127
|
+
const curTouchTime = new Date().getTime();
|
|
128
|
+
if (curTouchTime - state.lastTouchEndTime < 300) {
|
|
129
|
+
const store2 = state.store;
|
|
130
|
+
if (store2.scale > 1) {
|
|
131
|
+
store2.scale = 1;
|
|
132
|
+
} else if (store2.scale == 1) {
|
|
133
|
+
store2.scale = 2;
|
|
134
|
+
}
|
|
135
|
+
scaleNow();
|
|
136
|
+
}
|
|
137
|
+
var touches = event.touches;
|
|
138
|
+
var events = touches[0];
|
|
139
|
+
var events2 = touches[1];
|
|
140
|
+
const store = state.store;
|
|
141
|
+
store.moveable = true;
|
|
142
|
+
if (events2) {
|
|
143
|
+
store.oriDistance = getDistance({
|
|
144
|
+
x: events.pageX,
|
|
145
|
+
y: events.pageY
|
|
146
|
+
}, {
|
|
147
|
+
x: events2.pageX,
|
|
148
|
+
y: events2.pageY
|
|
149
|
+
});
|
|
150
|
+
}
|
|
151
|
+
store.originScale = store.scale || 1;
|
|
152
|
+
};
|
|
153
|
+
const onTouchMove = (event) => {
|
|
154
|
+
if (!state.store.moveable) {
|
|
155
|
+
return;
|
|
156
|
+
}
|
|
157
|
+
const store = state.store;
|
|
158
|
+
var touches = event.touches;
|
|
159
|
+
var events = touches[0];
|
|
160
|
+
var events2 = touches[1];
|
|
161
|
+
if (events2) {
|
|
162
|
+
const curDistance = getDistance({
|
|
163
|
+
x: events.pageX,
|
|
164
|
+
y: events.pageY
|
|
165
|
+
}, {
|
|
166
|
+
x: events2.pageX,
|
|
167
|
+
y: events2.pageY
|
|
168
|
+
});
|
|
169
|
+
const curScale = curDistance / store.oriDistance;
|
|
170
|
+
store.scale = store.originScale * curScale;
|
|
171
|
+
if (store.scale > 3) {
|
|
172
|
+
store.scale = 3;
|
|
173
|
+
}
|
|
174
|
+
scaleNow();
|
|
175
|
+
}
|
|
176
|
+
};
|
|
177
|
+
const onTouchEnd = () => {
|
|
178
|
+
console.log("end");
|
|
179
|
+
state.lastTouchEndTime = new Date().getTime();
|
|
180
|
+
const store = state.store;
|
|
181
|
+
store.moveable = false;
|
|
182
|
+
if (store.scale < 1.1 && store.scale > 1 || store.scale < 1) {
|
|
183
|
+
store.scale = 1;
|
|
184
|
+
scaleNow();
|
|
185
|
+
}
|
|
186
|
+
};
|
|
187
|
+
const init = () => {
|
|
188
|
+
state.eleImg = document.querySelector(".nut-imagepreview");
|
|
189
|
+
document.addEventListener("touchmove", onTouchMove);
|
|
190
|
+
document.addEventListener("touchend", onTouchEnd);
|
|
191
|
+
document.addEventListener("touchcancel", onTouchEnd);
|
|
192
|
+
};
|
|
107
193
|
watch(() => props.show, (val) => {
|
|
108
194
|
state.showPop = val;
|
|
195
|
+
init();
|
|
109
196
|
});
|
|
110
197
|
onMounted(() => {
|
|
111
198
|
state.active = props.initNo;
|
|
@@ -115,7 +202,12 @@ const _sfc_main = create({
|
|
|
115
202
|
return __spreadProps(__spreadValues({}, toRefs(state)), {
|
|
116
203
|
slideChangeEnd,
|
|
117
204
|
onClose,
|
|
118
|
-
closeOnImg
|
|
205
|
+
closeOnImg,
|
|
206
|
+
onTouchStart,
|
|
207
|
+
onTouchMove,
|
|
208
|
+
onTouchEnd,
|
|
209
|
+
getDistance,
|
|
210
|
+
scaleNow
|
|
119
211
|
});
|
|
120
212
|
}
|
|
121
213
|
});
|
|
@@ -129,17 +221,19 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
129
221
|
return openBlock(), createBlock(_component_nut_popup, {
|
|
130
222
|
"pop-class": "custom-pop",
|
|
131
223
|
visible: _ctx.showPop,
|
|
132
|
-
"onUpdate:visible": _cache[
|
|
133
|
-
onClick: _ctx.onClose
|
|
224
|
+
"onUpdate:visible": _cache[2] || (_cache[2] = ($event) => _ctx.showPop = $event),
|
|
225
|
+
onClick: _ctx.onClose,
|
|
226
|
+
style: { "width": "100%" }
|
|
134
227
|
}, {
|
|
135
228
|
default: withCtx(() => [
|
|
136
229
|
createElementVNode("view", {
|
|
137
230
|
class: "nut-imagepreview",
|
|
138
|
-
onClick: _cache[0] || (_cache[0] = withModifiers((...args) => _ctx.closeOnImg && _ctx.closeOnImg(...args), ["stop"]))
|
|
231
|
+
onClick: _cache[0] || (_cache[0] = withModifiers((...args) => _ctx.closeOnImg && _ctx.closeOnImg(...args), ["stop"])),
|
|
232
|
+
onTouchstartCapture: _cache[1] || (_cache[1] = (...args) => _ctx.onTouchStart && _ctx.onTouchStart(...args))
|
|
139
233
|
}, [
|
|
140
234
|
_ctx.showPop ? (openBlock(), createBlock(_component_nut_swiper, {
|
|
141
235
|
key: 0,
|
|
142
|
-
"auto-play":
|
|
236
|
+
"auto-play": _ctx.autoplay,
|
|
143
237
|
class: "nut-imagepreview-swiper",
|
|
144
238
|
loop: true,
|
|
145
239
|
"is-preventDefault": false,
|
|
@@ -174,9 +268,9 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
174
268
|
}), 128))
|
|
175
269
|
]),
|
|
176
270
|
_: 1
|
|
177
|
-
}, 8, ["onChange", "init-page", "pagination-visible", "pagination-color"])) : createCommentVNode("", true)
|
|
178
|
-
|
|
179
|
-
|
|
271
|
+
}, 8, ["auto-play", "onChange", "init-page", "pagination-visible", "pagination-color"])) : createCommentVNode("", true)
|
|
272
|
+
], 32),
|
|
273
|
+
createElementVNode("view", _hoisted_2, toDisplayString(_ctx.active) + " / " + toDisplayString(_ctx.images.length + _ctx.videos.length), 1)
|
|
180
274
|
]),
|
|
181
275
|
_: 1
|
|
182
276
|
}, 8, ["visible", "onClick"]);
|
|
@@ -18,7 +18,7 @@ var __spreadValues = (a, b) => {
|
|
|
18
18
|
};
|
|
19
19
|
var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
|
|
20
20
|
/*!
|
|
21
|
-
* @nutui/nutui v3.1.
|
|
21
|
+
* @nutui/nutui v3.1.16-beta.1 Thu Jan 27 2022 18:18:31 GMT+0800 (中国标准时间)
|
|
22
22
|
* (c) 2021 @jdf2e.
|
|
23
23
|
* Released under the MIT License.
|
|
24
24
|
*/
|