center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #13150 from dataease/pr@dev-v2_st

Browse Source 
fix(系统设置): 修改密码缺少明文标识
This commit is contained in:
xuwei-fit2cloud 2024-11-06 10:20:09 +08:00 committed by GitHub
commit cc72674b97
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/core-frontend/src/components/custom-password/src/CustomPassword.vue
View File

@ -2,7 +2,6 @@
import { useAttrs, computed } from 'vue' import { useAttrs, computed } from 'vue'
import icon_visible_outlined from '@/assets/svg/icon_visible_outlined.svg' import icon_visible_outlined from '@/assets/svg/icon_visible_outlined.svg'
import icon_invisible_outlined from '@/assets/svg/icon_invisible_outlined.svg' import icon_invisible_outlined from '@/assets/svg/icon_invisible_outlined.svg'
import { hIcon } from '@/components/icon-custom'
const attrs = useAttrs() const attrs = useAttrs()
const props = defineProps(['modelValue']) const props = defineProps(['modelValue'])
const emits = defineEmits(['update:modelValue']) const emits = defineEmits(['update:modelValue'])
@ -14,15 +13,12 @@ const value = computed({
emits('update:modelValue', value) emits('update:modelValue', value)
} }
}) })
const iconView = hIcon(icon_visible_outlined)
const iconHide = hIcon(icon_invisible_outlined)
</script> </script>
<template> <template>
<el-input <el-input
:icon-view-custom="iconView" :icon-view-custom="icon_visible_outlined"
:icon-hide-custom="iconHide" :icon-hide-custom="icon_invisible_outlined"
v-bind="attrs" v-bind="attrs"
v-model="value" v-model="value"
/> />

6
core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
View File

@ -256,7 +256,7 @@ initParams()
<el-row class="de-collapse-style"> <el-row class="de-collapse-style">
<el-collapse v-model="styleActiveNames" class="style-collapse"> <el-collapse v-model="styleActiveNames" class="style-collapse">
<el-collapse-item :effect="themes" name="basicStyle" :title="t('chart.basic_style')"> <el-collapse-item :effect="themes" name="basicStyle" :title="t('chart.basic_style')">
<el-form label-position="top"> <el-form @keydown.stop.prevent.enter label-position="top">
<el-form-item class="form-item margin-bottom-8" :class="'form-item-' + themes"> <el-form-item class="form-item margin-bottom-8" :class="'form-item-' + themes">
<el-checkbox <el-checkbox
:effect="themes" :effect="themes"
@ -394,7 +394,7 @@ initParams()
</el-form> </el-form>
</el-collapse-item> </el-collapse-item>
<el-collapse-item :effect="themes" name="addition" title="查询条件"> <el-collapse-item :effect="themes" name="addition" title="查询条件">
<el-form label-position="top"> <el-form @keydown.stop.prevent.enter label-position="top">
<el-form-item class="form-item margin-bottom-8" :class="'form-item-' + themes"> <el-form-item class="form-item margin-bottom-8" :class="'form-item-' + themes">
<el-checkbox <el-checkbox
:effect="themes" :effect="themes"
@ -638,7 +638,7 @@ initParams()
</el-form> </el-form>
</collapse-switch-item> </collapse-switch-item>
<el-collapse-item :effect="themes" name="button" :title="t('commons.button')"> <el-collapse-item :effect="themes" name="button" :title="t('commons.button')">
<el-form label-position="top"> <el-form @keydown.stop.prevent.enter label-position="top">
<el-form-item <el-form-item
:effect="themes" :effect="themes"
class="form-item" class="form-item"