Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3 into dev

YunaiV · YunaiV · commit afc16706a90d · 2023-04-13T08:00:45.000+08:00
diff --git a/src/components/Icon/src/IconSelect.vue b/src/components/Icon/src/IconSelect.vue
@@ -95,7 +95,7 @@ watch(
     return props.modelValue
   },
   () => {
-    if (props.modelValue) {
+    if (props.modelValue && props.modelValue.contains(':')) {
       currentActiveType.value = props.modelValue.substring(0, props.modelValue.indexOf(':') + 1)
       icon.value = props.modelValue.substring(props.modelValue.indexOf(':') + 1)
     }

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ watch(`
`95`	`95`	`return props.modelValue`
`96`	`96`	`},`
`97`	`97`	`() => {`
`98`		`- if (props.modelValue) {`
	`98`	`+ if (props.modelValue && props.modelValue.contains(':')) {`
`99`	`99`	`currentActiveType.value = props.modelValue.substring(0, props.modelValue.indexOf(':') + 1)`
`100`	`100`	`icon.value = props.modelValue.substring(props.modelValue.indexOf(':') + 1)`
`101`	`101`	`}`