@tdesign/uniapp 0.9.0 → 0.9.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 +17 -0
- package/dist/action-sheet/README.en-US.md +4 -3
- package/dist/action-sheet/README.md +4 -3
- package/dist/action-sheet/action-sheet.vue +16 -12
- package/dist/action-sheet/computed.js +1 -1
- package/dist/action-sheet/props.ts +5 -0
- package/dist/action-sheet/type.ts +6 -1
- package/dist/avatar/README.en-US.md +1 -1
- package/dist/avatar/README.md +1 -1
- package/dist/avatar/avatar.vue +10 -9
- package/dist/avatar-group/avatar-group.vue +4 -4
- package/dist/back-top/README.en-US.md +1 -1
- package/dist/back-top/README.md +1 -1
- package/dist/back-top/back-top.vue +5 -4
- package/dist/badge/README.en-US.md +1 -1
- package/dist/badge/README.md +1 -1
- package/dist/badge/badge.vue +4 -2
- package/dist/button/README.en-US.md +1 -1
- package/dist/button/README.md +1 -1
- package/dist/button/button.vue +12 -11
- package/dist/calendar/README.en-US.md +1 -1
- package/dist/calendar/README.md +1 -1
- package/dist/calendar/calendar-header.vue +2 -1
- package/dist/calendar/calendar.vue +9 -7
- package/dist/calendar/template.vue +12 -9
- package/dist/cascader/README.en-US.md +1 -1
- package/dist/cascader/README.md +1 -1
- package/dist/cascader/cascader.vue +8 -8
- package/dist/cell/README.en-US.md +1 -1
- package/dist/cell/README.md +1 -1
- package/dist/cell/cell.vue +34 -36
- package/dist/cell-group/cell-group.vue +5 -3
- package/dist/check-tag/check-tag.vue +6 -3
- package/dist/checkbox/README.en-US.md +1 -1
- package/dist/checkbox/README.md +1 -1
- package/dist/checkbox/checkbox.vue +5 -4
- package/dist/checkbox-group/checkbox-group.vue +5 -3
- package/dist/col/col.vue +7 -3
- package/dist/collapse/README.en-US.md +1 -1
- package/dist/collapse/README.md +1 -1
- package/dist/collapse/collapse.vue +6 -4
- package/dist/collapse-panel/collapse-panel.vue +15 -6
- package/dist/color-picker/README.en-US.md +1 -1
- package/dist/color-picker/README.md +1 -1
- package/dist/color-picker/color-picker.vue +9 -7
- package/dist/color-picker/template.vue +2 -1
- package/dist/common/canvas/index.js +1 -1
- package/dist/common/shared/color-picker/color.js +1 -0
- package/dist/common/src/instantiationDecorator.js +1 -1
- package/dist/common/version.js +1 -1
- package/dist/config-provider/config-provider.vue +3 -1
- package/dist/count-down/README.en-US.md +1 -1
- package/dist/count-down/README.md +1 -1
- package/dist/count-down/count-down.vue +5 -3
- package/dist/date-time-picker/README.en-US.md +1 -1
- package/dist/date-time-picker/README.md +1 -1
- package/dist/date-time-picker/date-time-picker.vue +8 -6
- package/dist/date-time-picker/locale/dayjs.js +6 -6
- package/dist/demo-navbar/demo-navbar.vue +1 -1
- package/dist/dialog/README.en-US.md +1 -1
- package/dist/dialog/README.md +1 -1
- package/dist/dialog/dialog.vue +10 -7
- package/dist/dialog/index.js +2 -1
- package/dist/divider/README.en-US.md +1 -1
- package/dist/divider/README.md +1 -1
- package/dist/divider/divider.vue +4 -2
- package/dist/draggable/draggable.vue +5 -2
- package/dist/drawer/README.en-US.md +1 -1
- package/dist/drawer/README.md +1 -1
- package/dist/drawer/drawer.vue +7 -5
- package/dist/dropdown-item/dropdown-item.vue +14 -11
- package/dist/dropdown-menu/README.en-US.md +1 -1
- package/dist/dropdown-menu/README.md +1 -1
- package/dist/dropdown-menu/dropdown-menu.vue +10 -8
- package/dist/empty/README.en-US.md +1 -1
- package/dist/empty/README.md +1 -1
- package/dist/empty/empty.vue +5 -4
- package/dist/fab/README.en-US.md +1 -1
- package/dist/fab/README.md +1 -1
- package/dist/fab/fab.vue +7 -4
- package/dist/footer/README.en-US.md +1 -1
- package/dist/footer/README.md +1 -1
- package/dist/footer/footer.vue +8 -7
- package/dist/form/README.en-US.md +3 -1
- package/dist/form/README.md +3 -1
- package/dist/form/form.vue +4 -2
- package/dist/form/props.ts +9 -0
- package/dist/form/type.ts +5 -0
- package/dist/form-item/README.en-US.md +2 -1
- package/dist/form-item/README.md +2 -1
- package/dist/form-item/form-item.vue +8 -6
- package/dist/form-item/props.ts +8 -0
- package/dist/form-item/type.ts +4 -0
- package/dist/grid/README.en-US.md +1 -1
- package/dist/grid/README.md +1 -1
- package/dist/grid/grid.vue +4 -3
- package/dist/grid-item/README.en-US.md +1 -1
- package/dist/grid-item/README.md +1 -1
- package/dist/grid-item/grid-item.vue +8 -6
- package/dist/guide/README.en-US.md +1 -1
- package/dist/guide/README.md +1 -1
- package/dist/guide/guide.vue +8 -7
- package/dist/icon/icon.vue +5 -2
- package/dist/image/README.en-US.md +1 -1
- package/dist/image/README.md +1 -1
- package/dist/image/image.vue +6 -5
- package/dist/image-viewer/README.en-US.md +4 -3
- package/dist/image-viewer/README.md +4 -3
- package/dist/image-viewer/image-viewer.css +12 -0
- package/dist/image-viewer/image-viewer.vue +84 -21
- package/dist/image-viewer/props.ts +5 -0
- package/dist/image-viewer/type.ts +6 -1
- package/dist/indexes/README.en-US.md +1 -1
- package/dist/indexes/README.md +1 -1
- package/dist/indexes/indexes.vue +7 -4
- package/dist/indexes-anchor/README.en-US.md +1 -1
- package/dist/indexes-anchor/README.md +1 -1
- package/dist/indexes-anchor/indexes-anchor.vue +5 -3
- package/dist/input/README.en-US.md +1 -1
- package/dist/input/README.md +1 -1
- package/dist/input/input.vue +1 -1
- package/dist/link/README.en-US.md +1 -1
- package/dist/link/README.md +1 -1
- package/dist/link/link.vue +6 -3
- package/dist/loading/README.en-US.md +1 -1
- package/dist/loading/README.md +1 -1
- package/dist/loading/loading.vue +4 -2
- package/dist/message/index.js +2 -1
- package/dist/message/message.vue +4 -3
- package/dist/message-item/index.js +1 -1
- package/dist/message-item/message-item.vue +7 -5
- package/dist/mixins/page-scroll.js +1 -1
- package/dist/mixins/using-config.js +1 -1
- package/dist/mixins/using-custom-navbar.js +1 -1
- package/dist/navbar/README.en-US.md +1 -1
- package/dist/navbar/README.md +2 -2
- package/dist/navbar/navbar.vue +5 -4
- package/dist/notice-bar/README.en-US.md +1 -1
- package/dist/notice-bar/README.md +1 -1
- package/dist/notice-bar/notice-bar.vue +4 -3
- package/dist/overlay/README.en-US.md +1 -1
- package/dist/overlay/README.md +1 -1
- package/dist/overlay/overlay.vue +6 -3
- package/dist/picker/README.en-US.md +1 -1
- package/dist/picker/README.md +1 -1
- package/dist/picker/picker.vue +11 -9
- package/dist/picker-item/README.en-US.md +1 -1
- package/dist/picker-item/README.md +1 -1
- package/dist/picker-item/picker-item.vue +6 -5
- package/dist/popover/README.en-US.md +1 -1
- package/dist/popover/README.md +1 -1
- package/dist/popover/popover.vue +8 -5
- package/dist/popup/README.en-US.md +1 -1
- package/dist/popup/README.md +1 -1
- package/dist/popup/popup.vue +8 -5
- package/dist/progress/README.en-US.md +1 -1
- package/dist/progress/README.md +1 -1
- package/dist/progress/progress.vue +5 -4
- package/dist/pull-down-refresh/README.en-US.md +1 -1
- package/dist/pull-down-refresh/README.md +1 -1
- package/dist/pull-down-refresh/pull-down-refresh.vue +7 -5
- package/dist/qrcode/components/qrcode-canvas/qrcode-canvas.vue +8 -7
- package/dist/qrcode/components/qrcode-status/qrcode-status.vue +2 -1
- package/dist/qrcode/qrcode.vue +5 -3
- package/dist/radio/README.en-US.md +1 -1
- package/dist/radio/README.md +1 -1
- package/dist/radio/radio.vue +5 -4
- package/dist/radio-group/radio-group.vue +5 -4
- package/dist/rate/README.en-US.md +1 -1
- package/dist/rate/README.md +1 -1
- package/dist/rate/rate.vue +8 -5
- package/dist/result/README.en-US.md +1 -1
- package/dist/result/README.md +1 -1
- package/dist/result/result.vue +5 -4
- package/dist/row/row.vue +7 -3
- package/dist/scroll-view/scroll-view.vue +1 -1
- package/dist/search/README.en-US.md +1 -1
- package/dist/search/README.md +1 -1
- package/dist/search/search.vue +14 -9
- package/dist/segmented/README.en-US.md +1 -1
- package/dist/segmented/README.md +1 -1
- package/dist/segmented/segmented.vue +6 -3
- package/dist/side-bar/README.en-US.md +1 -1
- package/dist/side-bar/README.md +1 -1
- package/dist/side-bar/side-bar.vue +5 -3
- package/dist/side-bar-item/side-bar-item.vue +7 -6
- package/dist/skeleton/README.en-US.md +1 -1
- package/dist/skeleton/README.md +1 -1
- package/dist/skeleton/skeleton.vue +6 -3
- package/dist/slider/README.en-US.md +1 -1
- package/dist/slider/README.md +1 -1
- package/dist/slider/slider.vue +7 -5
- package/dist/step-item/step-item.vue +5 -4
- package/dist/stepper/README.en-US.md +1 -1
- package/dist/stepper/README.md +1 -1
- package/dist/stepper/stepper.vue +5 -3
- package/dist/steps/README.en-US.md +1 -1
- package/dist/steps/README.md +1 -1
- package/dist/steps/steps.vue +5 -3
- package/dist/sticky/sticky.vue +4 -3
- package/dist/swipe-cell/swipe-cell.vue +7 -5
- package/dist/swiper/README.en-US.md +1 -1
- package/dist/swiper/README.md +1 -1
- package/dist/swiper/swiper.vue +7 -5
- package/dist/swiper-nav/swiper-nav.vue +6 -3
- package/dist/switch/README.en-US.md +1 -1
- package/dist/switch/README.md +1 -1
- package/dist/switch/switch.vue +5 -4
- package/dist/tab-bar/README.en-US.md +1 -1
- package/dist/tab-bar/README.md +1 -1
- package/dist/tab-bar/tab-bar.vue +5 -3
- package/dist/tab-bar-item/tab-bar-item.vue +6 -4
- package/dist/tab-panel/tab-panel.vue +5 -3
- package/dist/table/README.en-US.md +4 -4
- package/dist/table/README.md +4 -4
- package/dist/table/table.css +2 -2
- package/dist/table/table.vue +38 -7
- package/dist/tabs/README.en-US.md +1 -1
- package/dist/tabs/README.md +1 -1
- package/dist/tabs/tabs.vue +11 -9
- package/dist/tag/README.en-US.md +1 -1
- package/dist/tag/README.md +1 -1
- package/dist/tag/tag.vue +6 -3
- package/dist/textarea/README.en-US.md +1 -1
- package/dist/textarea/README.md +1 -1
- package/dist/textarea/textarea.vue +6 -3
- package/dist/toast/README.en-US.md +1 -1
- package/dist/toast/README.md +1 -1
- package/dist/toast/toast.vue +8 -7
- package/dist/transition/transition.vue +2 -2
- package/dist/tree-select/README.en-US.md +1 -1
- package/dist/tree-select/README.md +1 -1
- package/dist/tree-select/tree-select.vue +14 -9
- package/dist/types/action-sheet.d.ts +1 -1
- package/dist/types/avatar-group.d.ts +1 -1
- package/dist/types/avatar.d.ts +1 -1
- package/dist/types/back-top.d.ts +1 -1
- package/dist/types/badge.d.ts +1 -1
- package/dist/types/button.d.ts +1 -1
- package/dist/types/calendar.d.ts +1 -1
- package/dist/types/cascader.d.ts +1 -1
- package/dist/types/cell-group.d.ts +1 -1
- package/dist/types/cell.d.ts +1 -1
- package/dist/types/check-tag.d.ts +1 -1
- package/dist/types/checkbox-group.d.ts +1 -1
- package/dist/types/checkbox.d.ts +1 -1
- package/dist/types/col.d.ts +1 -1
- package/dist/types/collapse-panel.d.ts +1 -1
- package/dist/types/collapse.d.ts +1 -1
- package/dist/types/color-picker.d.ts +1 -1
- package/dist/upload/README.en-US.md +1 -1
- package/dist/upload/README.md +1 -1
- package/dist/upload/upload.vue +32 -32
- package/dist/watermark/README.en-US.md +1 -1
- package/dist/watermark/README.md +1 -1
- package/dist/watermark/utils/generateBase64Url.js +6 -6
- package/dist/watermark/watermark.vue +4 -3
- package/package.json +1 -1
package/dist/upload/upload.vue
CHANGED
|
@@ -49,14 +49,14 @@
|
|
|
49
49
|
:autoplay="false"
|
|
50
50
|
objectFit="contain"
|
|
51
51
|
:data-file="file"
|
|
52
|
-
@click.stop="onFileClick"
|
|
52
|
+
@click.stop="(e) => onFileClick(e, {file, index})"
|
|
53
53
|
/>
|
|
54
54
|
<view
|
|
55
55
|
v-if="file.status && file.status != 'done'"
|
|
56
56
|
:class="classPrefix + '__progress-mask'"
|
|
57
57
|
:data-index="index"
|
|
58
58
|
:data-file="file"
|
|
59
|
-
@click.stop="onFileClick"
|
|
59
|
+
@click.stop="(e) => onFileClick(e, {file, index})"
|
|
60
60
|
>
|
|
61
61
|
<block v-if="file.status == 'loading'">
|
|
62
62
|
<t-icon
|
|
@@ -88,7 +88,7 @@
|
|
|
88
88
|
:data-index="index"
|
|
89
89
|
aria-role="button"
|
|
90
90
|
aria-label="删除"
|
|
91
|
-
@click.stop="onDelete"
|
|
91
|
+
@click.stop="(e) => onDelete(e, {index})"
|
|
92
92
|
>
|
|
93
93
|
<t-icon
|
|
94
94
|
name="close"
|
|
@@ -177,14 +177,14 @@
|
|
|
177
177
|
:autoplay="false"
|
|
178
178
|
objectFit="contain"
|
|
179
179
|
:data-file="file"
|
|
180
|
-
@click.stop="onFileClick"
|
|
180
|
+
@click.stop="(e) => onFileClick(e, {file, index})"
|
|
181
181
|
/>
|
|
182
182
|
<view
|
|
183
183
|
v-if="file.status && file.status != 'done'"
|
|
184
184
|
:class="classPrefix + '__progress-mask'"
|
|
185
185
|
:data-index="index"
|
|
186
186
|
:data-file="file"
|
|
187
|
-
@click.stop="onFileClick"
|
|
187
|
+
@click.stop="(e) => onFileClick(e, {file, index})"
|
|
188
188
|
>
|
|
189
189
|
<block v-if="file.status == 'loading'">
|
|
190
190
|
<t-icon
|
|
@@ -217,7 +217,7 @@
|
|
|
217
217
|
:data-url="file.url"
|
|
218
218
|
aria-role="button"
|
|
219
219
|
aria-label="删除"
|
|
220
|
-
@click.stop="onDelete"
|
|
220
|
+
@click.stop="(e) => onDelete(e, {index})"
|
|
221
221
|
>
|
|
222
222
|
<t-icon
|
|
223
223
|
name="close"
|
|
@@ -264,20 +264,19 @@
|
|
|
264
264
|
</view>
|
|
265
265
|
</template>
|
|
266
266
|
<script>
|
|
267
|
+
import { prefix } from '../common/config';
|
|
268
|
+
import { parseEventDynamicCode } from '../common/event/dynamic';
|
|
269
|
+
import { uniComponent } from '../common/src/index';
|
|
270
|
+
import { isOverSize, coalesce, isWxWork, isPC } from '../common/utils';
|
|
271
|
+
import tools from '../common/utils.wxs';
|
|
272
|
+
import { isObject } from '../common/validator';
|
|
267
273
|
import TGrid from '../grid/grid';
|
|
268
274
|
import TGridItem from '../grid-item/grid-item';
|
|
269
275
|
import TIcon from '../icon/icon';
|
|
270
276
|
import TImage from '../image/image';
|
|
271
|
-
|
|
272
|
-
import
|
|
273
|
-
|
|
274
|
-
import { isOverSize, coalesce, isWxWork, isPC } from '../common/utils';
|
|
275
|
-
import { isObject } from '../common/validator';
|
|
276
|
-
import tools from '../common/utils.wxs';
|
|
277
|
-
import {
|
|
278
|
-
getWrapperAriaRole,
|
|
279
|
-
getWrapperAriaLabel,
|
|
280
|
-
} from './upload.computed.js';
|
|
277
|
+
|
|
278
|
+
import usingConfig from '../mixins/using-config';
|
|
279
|
+
|
|
281
280
|
import {
|
|
282
281
|
longPress,
|
|
283
282
|
touchMove,
|
|
@@ -285,10 +284,15 @@ import {
|
|
|
285
284
|
baseDataObserver,
|
|
286
285
|
listObserver,
|
|
287
286
|
} from './drag.computed.js';
|
|
288
|
-
import
|
|
287
|
+
import props from './props';
|
|
288
|
+
|
|
289
|
+
|
|
290
|
+
import {
|
|
291
|
+
getWrapperAriaRole,
|
|
292
|
+
getWrapperAriaLabel,
|
|
293
|
+
} from './upload.computed.js';
|
|
289
294
|
|
|
290
295
|
|
|
291
|
-
import usingConfig from '../mixins/using-config';
|
|
292
296
|
const componentName = 'upload';
|
|
293
297
|
const name = `${prefix}-${componentName}`;
|
|
294
298
|
|
|
@@ -424,8 +428,7 @@ export default {
|
|
|
424
428
|
this.$emit('fail', err);
|
|
425
429
|
},
|
|
426
430
|
|
|
427
|
-
onFileClick(e) {
|
|
428
|
-
const { file, index } = e.currentTarget.dataset;
|
|
431
|
+
onFileClick(e, { file, index }) {
|
|
429
432
|
this.$emit('click', { index, file });
|
|
430
433
|
},
|
|
431
434
|
|
|
@@ -473,8 +476,7 @@ export default {
|
|
|
473
476
|
return false;
|
|
474
477
|
},
|
|
475
478
|
|
|
476
|
-
onDelete(e) {
|
|
477
|
-
const { index } = e.currentTarget.dataset;
|
|
479
|
+
onDelete(e, { index }) {
|
|
478
480
|
this.deleteHandle(index);
|
|
479
481
|
},
|
|
480
482
|
|
|
@@ -545,7 +547,7 @@ export default {
|
|
|
545
547
|
const { classPrefix, rows, column } = this;
|
|
546
548
|
|
|
547
549
|
let query;
|
|
548
|
-
// #ifdef H5 || APP
|
|
550
|
+
// #ifdef H5 || APP
|
|
549
551
|
query = uni.createSelectorQuery().in(this);
|
|
550
552
|
// #endif
|
|
551
553
|
if (!query) {
|
|
@@ -555,7 +557,7 @@ export default {
|
|
|
555
557
|
|
|
556
558
|
let selectorGridItem;
|
|
557
559
|
let selectorGrid;
|
|
558
|
-
// #ifdef H5 || APP
|
|
560
|
+
// #ifdef H5 || APP
|
|
559
561
|
selectorGridItem = '.t-grid-item';
|
|
560
562
|
selectorGrid = '.t-grid';
|
|
561
563
|
// #endif
|
|
@@ -608,22 +610,21 @@ export default {
|
|
|
608
610
|
return previewMediaSources;
|
|
609
611
|
},
|
|
610
612
|
|
|
611
|
-
onPreview(e) {
|
|
612
|
-
this.onFileClick(e);
|
|
613
|
+
onPreview(e, { file, index }) {
|
|
614
|
+
this.onFileClick(e, { file, index });
|
|
613
615
|
const { preview } = this;
|
|
614
616
|
|
|
615
617
|
if (!preview) return;
|
|
616
618
|
|
|
617
619
|
const usePreviewMedia = this.customFiles.some(file => file.type === 'video');
|
|
618
620
|
if (usePreviewMedia) {
|
|
619
|
-
this.onPreviewMedia(
|
|
621
|
+
this.onPreviewMedia({ index });
|
|
620
622
|
} else {
|
|
621
|
-
this.onPreviewImage(
|
|
623
|
+
this.onPreviewImage({ index });
|
|
622
624
|
}
|
|
623
625
|
},
|
|
624
626
|
|
|
625
|
-
onPreviewImage(
|
|
626
|
-
const { index } = e.currentTarget.dataset;
|
|
627
|
+
onPreviewImage({ index }) {
|
|
627
628
|
const urls = this.customFiles.filter(file => file.percent !== -1).map(file => file.url);
|
|
628
629
|
const current = this.customFiles[index]?.url;
|
|
629
630
|
uni.previewImage({
|
|
@@ -635,8 +636,7 @@ export default {
|
|
|
635
636
|
});
|
|
636
637
|
},
|
|
637
638
|
|
|
638
|
-
onPreviewMedia(
|
|
639
|
-
const { index: current } = e.currentTarget.dataset;
|
|
639
|
+
onPreviewMedia({ index: current }) {
|
|
640
640
|
const sources = this.getPreviewMediaSources();
|
|
641
641
|
uni.previewMedia({
|
|
642
642
|
sources,
|
|
@@ -51,7 +51,7 @@ url | String | - | \- | N
|
|
|
51
51
|
### CSS Variables
|
|
52
52
|
|
|
53
53
|
The component provides the following CSS variables, which can be used to customize styles.
|
|
54
|
-
Name | Default Value | Description
|
|
54
|
+
Name | Default Value | Description
|
|
55
55
|
-- | -- | --
|
|
56
56
|
--watermark-left-0 | --watermark-left-0 | -
|
|
57
57
|
--watermark-left-25 | --watermark-left-25 | -
|
package/dist/watermark/README.md
CHANGED
|
@@ -106,7 +106,7 @@ export default async function generateBase64Url(
|
|
|
106
106
|
ctx.globalAlpha = alpha;
|
|
107
107
|
|
|
108
108
|
// h5需要全局缩放
|
|
109
|
-
// #ifdef H5 || APP
|
|
109
|
+
// #ifdef H5 || APP
|
|
110
110
|
ctx.scale(1 / ratio, 1 / ratio);
|
|
111
111
|
// #endif
|
|
112
112
|
|
|
@@ -152,7 +152,7 @@ export default async function generateBase64Url(
|
|
|
152
152
|
|
|
153
153
|
// TODO:其他技术栈修复了「灰度效果只影响图片,不影响文字」的bug,因为小程序不能创建临时canvas,暂时没有想到比较优雅的解决方案
|
|
154
154
|
if (isGrayscale) {
|
|
155
|
-
// #ifdef APP
|
|
155
|
+
// #ifdef APP
|
|
156
156
|
ctx.drawImage(
|
|
157
157
|
img,
|
|
158
158
|
offsetX,
|
|
@@ -162,7 +162,7 @@ export default async function generateBase64Url(
|
|
|
162
162
|
);
|
|
163
163
|
// #endif
|
|
164
164
|
|
|
165
|
-
// #ifndef APP
|
|
165
|
+
// #ifndef APP
|
|
166
166
|
ctx.drawImage(
|
|
167
167
|
img,
|
|
168
168
|
offsetX,
|
|
@@ -189,7 +189,7 @@ export default async function generateBase64Url(
|
|
|
189
189
|
y: 0,
|
|
190
190
|
});
|
|
191
191
|
} else {
|
|
192
|
-
// #ifdef APP
|
|
192
|
+
// #ifdef APP
|
|
193
193
|
ctx.drawImage(
|
|
194
194
|
img,
|
|
195
195
|
offsetX,
|
|
@@ -199,7 +199,7 @@ export default async function generateBase64Url(
|
|
|
199
199
|
);
|
|
200
200
|
// #endif
|
|
201
201
|
|
|
202
|
-
// #ifndef APP
|
|
202
|
+
// #ifndef APP
|
|
203
203
|
ctx.drawImage(
|
|
204
204
|
img,
|
|
205
205
|
offsetX,
|
|
@@ -257,7 +257,7 @@ export default async function generateBase64Url(
|
|
|
257
257
|
);
|
|
258
258
|
}
|
|
259
259
|
}
|
|
260
|
-
// #ifdef APP
|
|
260
|
+
// #ifdef APP
|
|
261
261
|
ctx.draw();
|
|
262
262
|
// #endif
|
|
263
263
|
|
|
@@ -22,11 +22,12 @@
|
|
|
22
22
|
</template>
|
|
23
23
|
|
|
24
24
|
<script>
|
|
25
|
-
import tools from '../common/utils.wxs';
|
|
26
|
-
import watermarkProps from './props';
|
|
27
25
|
import { prefix } from '../common/config';
|
|
28
26
|
import { uniComponent } from '../common/src/index';
|
|
29
27
|
import { appBaseInfo, nextTick } from '../common/utils';
|
|
28
|
+
import tools from '../common/utils.wxs';
|
|
29
|
+
|
|
30
|
+
import watermarkProps from './props';
|
|
30
31
|
import generateBase64Url from './utils/generateBase64Url';
|
|
31
32
|
import randomMovingStyle from './utils/randomMovingStyle';
|
|
32
33
|
|
|
@@ -57,7 +58,7 @@ export default {
|
|
|
57
58
|
let result = 'width: 100px; height: 100px;';
|
|
58
59
|
let shouldHide = true;
|
|
59
60
|
|
|
60
|
-
// #ifdef APP
|
|
61
|
+
// #ifdef APP || MP-ALIPAY
|
|
61
62
|
if (!this.initialed) {
|
|
62
63
|
shouldHide = false;
|
|
63
64
|
}
|