Skip to content

Commit 93f4547

Browse files
sonofmagicsonofmagic
committed
chore: bump version
1 parent b89561c commit 93f4547

File tree

5 files changed

+866
-1500
lines changed

5 files changed

+866
-1500
lines changed

‎apps/vite-native-ts/miniprogram/pages/index/merge/index.scss‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,4 +83,40 @@
8383
color: #2563eb;
8484
word-break: break-all;
8585
}
86+
87+
&__preview {
88+
border-top: 1rpx dashed #e2e8f0;
89+
padding-top: 16rpx;
90+
}
91+
92+
&__preview-target {
93+
min-height: 120rpx;
94+
padding: 16rpx 20rpx;
95+
border-radius: 18rpx;
96+
border: 1rpx dashed rgba(148, 163, 184, 0.6);
97+
background: rgba(226, 232, 240, 0.4);
98+
color: #0f172a;
99+
transition: all 0.2s ease;
100+
}
101+
102+
&__preview-target--flow {
103+
display: flex;
104+
flex-wrap: wrap;
105+
align-items: center;
106+
gap: 12rpx;
107+
}
108+
109+
&__preview-item {
110+
display: inline-flex;
111+
align-items: center;
112+
justify-content: center;
113+
padding: 10rpx 16rpx;
114+
border-radius: 14rpx;
115+
background: rgba(255, 255, 255, 0.92);
116+
color: inherit;
117+
font-size: 24rpx;
118+
font-weight: 600;
119+
letter-spacing: 0.8rpx;
120+
box-shadow: 0 8rpx 20rpx -12rpx rgba(15, 23, 42, 0.5);
121+
}
86122
}

‎apps/vite-native-ts/miniprogram/pages/index/merge/index.ts‎

Lines changed: 48 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ const { twMerge: mergeWithoutEscape } = createRuntime({ escape: false })
99
const { twMerge: mergeWithoutUnescape } = createRuntime({ unescape: false })
1010
const { twMerge: mergePassthrough } = createRuntime({ escape: false, unescape: false })
1111

12+
const basePreviewItems = ['A', 'B', 'C']
13+
1214
const versionComparison = [
1315
{
1416
label: 'twMerge v3 (Tailwind CSS v3)',
@@ -323,16 +325,19 @@ const cvaSamples = [
323325
label: '默认',
324326
code: 'button()',
325327
result: button(),
328+
previewItems: ['主要按钮'],
326329
},
327330
{
328331
label: '副按钮',
329332
code: "button({ intent: 'secondary', size: 'small' })",
330333
result: button({ intent: 'secondary', size: 'small' }),
334+
previewItems: ['副按钮'],
331335
},
332336
{
333337
label: '禁用状态',
334338
code: "button({ disabled: true })",
335339
result: button({ disabled: true }),
340+
previewItems: ['禁用按钮'],
336341
},
337342
]
338343

@@ -377,25 +382,63 @@ const variantsSamples = [
377382
label: '默认徽章',
378383
code: 'badge()',
379384
result: badge(),
385+
previewItems: ['Primary'],
380386
},
381387
{
382388
label: '描边成功态',
383389
code: "badge({ tone: 'success', outline: true })",
384390
result: badge({ tone: 'success', outline: true }),
391+
previewItems: ['Success'],
385392
},
386393
{
387394
label: '危险小号',
388395
code: "badge({ tone: 'danger', size: 'sm' })",
389396
result: badge({ tone: 'danger', size: 'sm' }),
397+
previewItems: ['Danger'],
390398
},
391399
]
392400

401+
const withPreview = (className: string, previewItems?: string[], previewBaseClass?: string) => ({
402+
previewClass: className,
403+
previewItems: previewItems ?? basePreviewItems,
404+
previewBaseClass: previewBaseClass ?? 'sample__preview-target--flow',
405+
})
406+
407+
const versionComparisonWithPreview = versionComparison.map((item) => ({
408+
...item,
409+
...withPreview(item.result, item.previewItems, item.previewBaseClass),
410+
}))
411+
412+
const mergingExamplesWithPreview = mergingExamples.map(({ samples, ...rest }) => ({
413+
...rest,
414+
samples: samples.map((sample) => ({
415+
...sample,
416+
...withPreview(sample.result, sample.previewItems, sample.previewBaseClass),
417+
})),
418+
}))
419+
420+
const runtimeExamplesWithPreview = runtimeExamples.map((item) => ({
421+
...item,
422+
...withPreview(item.result, item.previewItems, item.previewBaseClass),
423+
}))
424+
425+
const cvaSamplesWithPreview = cvaSamples.map((item) => ({
426+
...item,
427+
...withPreview(item.result, item.previewItems, item.previewBaseClass),
428+
}))
429+
430+
const variantsSamplesWithPreview = variantsSamples.map((item) => ({
431+
...item,
432+
...withPreview(item.result, item.previewItems, item.previewBaseClass),
433+
}))
434+
393435
Page({
394436
data: {
395-
versionComparison,
396-
mergingExamples,
397-
runtimeExamples,
398-
cvaSamples,
399-
variantsSamples,
437+
basePreviewItems,
438+
versionComparison: versionComparisonWithPreview,
439+
mergingExamples: mergingExamplesWithPreview,
440+
runtimeExamples: runtimeExamplesWithPreview,
441+
cvaSamples: cvaSamplesWithPreview,
442+
variantsSamples: variantsSamplesWithPreview,
400443
},
401444
})

‎apps/vite-native-ts/miniprogram/pages/index/merge/index.wxml‎

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,18 @@
1313
<view class="sample__label">{{item.label}}</view>
1414
<view class="sample__code">{{item.code}}</view>
1515
<view class="sample__result">{{item.result}}</view>
16+
<view class="sample__preview">
17+
<view class="sample__preview-target {{item.previewBaseClass}} {{item.previewClass}}">
18+
<view
19+
class="sample__preview-item"
20+
wx:for="{{item.previewItems || basePreviewItems}}"
21+
wx:for-item="preview"
22+
wx:key="*this"
23+
>
24+
{{preview}}
25+
</view>
26+
</view>
27+
</view>
1628
</view>
1729
</view>
1830
</view>
@@ -22,10 +34,22 @@
2234
<view class="section__title">{{item.title}}</view>
2335
<view class="section__desc">{{item.description}}</view>
2436
<view class="section__list">
25-
<view class="sample" wx:for="{{item.samples}}" wx:for-item="sample" wx:key="label">
37+
<view class="sample" wx:for="{{item.samples}}" wx:for-item="sample" wx:key="label">
2638
<view class="sample__label">{{sample.label}}</view>
2739
<view class="sample__code">{{sample.code}}</view>
2840
<view class="sample__result">{{sample.result}}</view>
41+
<view class="sample__preview">
42+
<view class="sample__preview-target {{sample.previewBaseClass}} {{sample.previewClass}}">
43+
<view
44+
class="sample__preview-item"
45+
wx:for="{{sample.previewItems || basePreviewItems}}"
46+
wx:for-item="preview"
47+
wx:key="*this"
48+
>
49+
{{preview}}
50+
</view>
51+
</view>
52+
</view>
2953
</view>
3054
</view>
3155
</view>
@@ -39,6 +63,18 @@
3963
<view class="sample__label">{{item.label}}</view>
4064
<view class="sample__code">{{item.code}}</view>
4165
<view class="sample__result">{{item.result}}</view>
66+
<view class="sample__preview">
67+
<view class="sample__preview-target {{item.previewBaseClass}} {{item.previewClass}}">
68+
<view
69+
class="sample__preview-item"
70+
wx:for="{{item.previewItems || basePreviewItems}}"
71+
wx:for-item="preview"
72+
wx:key="*this"
73+
>
74+
{{preview}}
75+
</view>
76+
</view>
77+
</view>
4278
</view>
4379
</view>
4480
</view>
@@ -51,6 +87,18 @@
5187
<view class="sample__label">{{item.label}}</view>
5288
<view class="sample__code">{{item.code}}</view>
5389
<view class="sample__result">{{item.result}}</view>
90+
<view class="sample__preview">
91+
<view class="sample__preview-target {{item.previewBaseClass}} {{item.previewClass}}">
92+
<view
93+
class="sample__preview-item"
94+
wx:for="{{item.previewItems || basePreviewItems}}"
95+
wx:for-item="preview"
96+
wx:key="*this"
97+
>
98+
{{preview}}
99+
</view>
100+
</view>
101+
</view>
54102
</view>
55103
</view>
56104
</view>
@@ -63,6 +111,18 @@
63111
<view class="sample__label">{{item.label}}</view>
64112
<view class="sample__code">{{item.code}}</view>
65113
<view class="sample__result">{{item.result}}</view>
114+
<view class="sample__preview">
115+
<view class="sample__preview-target {{item.previewBaseClass}} {{item.previewClass}}">
116+
<view
117+
class="sample__preview-item"
118+
wx:for="{{item.previewItems || basePreviewItems}}"
119+
wx:for-item="preview"
120+
wx:key="*this"
121+
>
122+
{{preview}}
123+
</view>
124+
</view>
125+
</view>
66126
</view>
67127
</view>
68128
</view>

0 commit comments

Comments
 (0)