鏡像自
https://github.com/ialley-workshop-open/uni-halo.git
已同步 2026-06-12 13:19:31 +08:00
feat: 瞬间卡片增加标签显示功能
此提交包含在:
@@ -29,6 +29,9 @@ export const DefaultAppConfigs = {
|
|||||||
},
|
},
|
||||||
categoryConfig: {
|
categoryConfig: {
|
||||||
type: "list"
|
type: "list"
|
||||||
|
},
|
||||||
|
momentConfig: {
|
||||||
|
useTagRandomColor: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
auditConfig: {
|
auditConfig: {
|
||||||
|
|||||||
@@ -34,7 +34,7 @@
|
|||||||
<mp-html class="evan-markdown" lazy-load :domain="markdownConfig.domain"
|
<mp-html class="evan-markdown" lazy-load :domain="markdownConfig.domain"
|
||||||
:loading-img="markdownConfig.loadingGif" :scroll-table="true" :selectable="true"
|
:loading-img="markdownConfig.loadingGif" :scroll-table="true" :selectable="true"
|
||||||
:tag-style="markdownConfig.tagStyle" :container-style="markdownConfig.containStyle"
|
:tag-style="markdownConfig.tagStyle" :container-style="markdownConfig.containStyle"
|
||||||
:content="moment.spec.content.html" :markdown="true" :showLineNumber="true"
|
:content="moment.spec.newHtml" :markdown="true" :showLineNumber="true"
|
||||||
:showLanguageName="true" :copyByLongPress="true"/>
|
:showLanguageName="true" :copyByLongPress="true"/>
|
||||||
</view>
|
</view>
|
||||||
<view class="mb-12 mt--12" v-if="moment.videos.length!==0"
|
<view class="mb-12 mt--12" v-if="moment.videos.length!==0"
|
||||||
@@ -54,6 +54,13 @@
|
|||||||
@click="handlePreview(mediumIndex,moment.images)"/>
|
@click="handlePreview(mediumIndex,moment.images)"/>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
<view v-if="moment.spec.tags && moment.spec.tags.length!==0" class="px-20 pb-24 flex flex-wrap">
|
||||||
|
<tm-tags
|
||||||
|
v-for="(tag,tagIndex) in moment.spec.tags" :key="tagIndex"
|
||||||
|
:color="randomTagColor()" size="m" model="text">
|
||||||
|
{{ tag }}
|
||||||
|
</tm-tags>
|
||||||
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</tm-translate>
|
</tm-translate>
|
||||||
</block>
|
</block>
|
||||||
@@ -69,9 +76,11 @@ import tmSkeleton from '@/tm-vuetify/components/tm-skeleton/tm-skeleton.vue';
|
|||||||
import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
|
import tmFlotbutton from '@/tm-vuetify/components/tm-flotbutton/tm-flotbutton.vue';
|
||||||
import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
|
import tmTranslate from '@/tm-vuetify/components/tm-translate/tm-translate.vue';
|
||||||
import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
|
import tmEmpty from '@/tm-vuetify/components/tm-empty/tm-empty.vue';
|
||||||
|
import tmTags from '@/tm-vuetify/components/tm-tags/tm-tags.vue';
|
||||||
|
|
||||||
import MarkdownConfig from '@/common/markdown/markdown.config.js';
|
import MarkdownConfig from '@/common/markdown/markdown.config.js';
|
||||||
import mpHtml from '@/components/mp-html/components/mp-html/mp-html.vue';
|
import mpHtml from '@/components/mp-html/components/mp-html/mp-html.vue';
|
||||||
|
import {getRandomNumberByRange} from "@/utils/random.js"
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
@@ -79,6 +88,7 @@ export default {
|
|||||||
tmFlotbutton,
|
tmFlotbutton,
|
||||||
tmTranslate,
|
tmTranslate,
|
||||||
tmEmpty,
|
tmEmpty,
|
||||||
|
tmTags,
|
||||||
mpHtml
|
mpHtml
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
@@ -92,7 +102,8 @@ export default {
|
|||||||
hasNext: false,
|
hasNext: false,
|
||||||
dataList: [],
|
dataList: [],
|
||||||
isLoadMore: false,
|
isLoadMore: false,
|
||||||
loadMoreText: '加载中...'
|
loadMoreText: '加载中...',
|
||||||
|
tagColors: ['orange', 'green', 'red', 'blue']
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -111,6 +122,9 @@ export default {
|
|||||||
calcAuditModeEnabled() {
|
calcAuditModeEnabled() {
|
||||||
return this.haloConfigs.auditConfig.auditModeEnabled
|
return this.haloConfigs.auditConfig.auditModeEnabled
|
||||||
},
|
},
|
||||||
|
calcUseTagRandomColor() {
|
||||||
|
return this.haloConfigs.pageConfig.momentConfig.useTagRandomColor
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
onLoad() {
|
onLoad() {
|
||||||
@@ -200,6 +214,7 @@ export default {
|
|||||||
medium.url = this.$utils.checkThumbnailUrl(medium.url, true)
|
medium.url = this.$utils.checkThumbnailUrl(medium.url, true)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
item.spec.newHtml = this.removeTagLinksCompletely(item.spec.content.html, '')
|
||||||
item['images'] = item.spec.content.medium
|
item['images'] = item.spec.content.medium
|
||||||
.filter(x => x.type === 'PHOTO')
|
.filter(x => x.type === 'PHOTO')
|
||||||
|
|
||||||
@@ -231,6 +246,19 @@ export default {
|
|||||||
current: index,
|
current: index,
|
||||||
urls: list.map(item => item.url)
|
urls: list.map(item => item.url)
|
||||||
})
|
})
|
||||||
|
},
|
||||||
|
removeTagLinksCompletely(htmlString) {
|
||||||
|
const regex = /<a\s+(?:[^>]*?\s+)?class=(['"])[^'"]*?\btag\b[^'"]*?\1[^>]*?>.*?<\/a>/gi;
|
||||||
|
const newHtml = htmlString.replace(regex, '');
|
||||||
|
return newHtml
|
||||||
|
.replace(/<[^>]+>\s*<\/[^>]+>/g, '')
|
||||||
|
.replace(/\s+/g, ' ')
|
||||||
|
.trim();
|
||||||
|
},
|
||||||
|
randomTagColor() {
|
||||||
|
if (!this.calcUseTagRandomColor) return "blue";
|
||||||
|
const randomIndex = getRandomNumberByRange(0, this.tagColors.length);
|
||||||
|
return this.tagColors[randomIndex];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
+6
-6
@@ -12,11 +12,11 @@
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 指定范围生成随机数
|
* 指定范围生成随机数
|
||||||
* @param {Number} m
|
* @param {Number} m 最小值(包含)
|
||||||
* @param {Number} n
|
* @param {Number} n 最大(不包含)
|
||||||
* @return {Number}
|
* @return {Number} 随机值
|
||||||
*/
|
*/
|
||||||
export function GetRandomNumberByRange(m, n) {
|
export function getRandomNumberByRange(m, n) {
|
||||||
return Math.floor(Math.random() * (m - n) + n);
|
return Math.floor(Math.random() * (m - n) + n);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -26,10 +26,10 @@ export function GetRandomNumberByRange(m, n) {
|
|||||||
* @param {*} min 最小值
|
* @param {*} min 最小值
|
||||||
* @param {*} max 最大值
|
* @param {*} max 最大值
|
||||||
*/
|
*/
|
||||||
export function GetRandomNumberArray(len, min, max) {
|
export function getRandomNumberArray(len, min, max) {
|
||||||
let arr = [];
|
let arr = [];
|
||||||
for (let index = 0; index < len; index++) {
|
for (let index = 0; index < len; index++) {
|
||||||
arr.push(GetRandomNumberByRange(min, max));
|
arr.push(getRandomNumberByRange(min, max));
|
||||||
}
|
}
|
||||||
return arr;
|
return arr;
|
||||||
}
|
}
|
||||||
|
|||||||
新增問題並參考
封鎖使用者