hhyykk/ipms-sjy-ui
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy-ui.git synced 2025-07-07 23:45:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'yudao/dev' into dev

Browse Source 
# Conflicts:
#	src/views/mp/components/wx-editor/WxEditor.vue
#	src/views/mp/tag/TagForm.vue
This commit is contained in:
puhui999
2023-04-14 21:58:49 +08:00
parent d62e607292 1a1bfe0ebb
commit 02d98f2ce7
17 changed files with 917 additions and 882 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Icon/src/IconSelect.vue
View File

@ -95,7 +95,7 @@ watch(
return props.modelValue
},
() => {
if (props.modelValue && props.modelValue.contains(':')) {
if (props.modelValue && props.modelValue.indexOf(':') >= 0) {
currentActiveType.value = props.modelValue.substring(0, props.modelValue.indexOf(':') + 1)
icon.value = props.modelValue.substring(props.modelValue.indexOf(':') + 1)
}