diff --git a/core/core-frontend/package.json b/core/core-frontend/package.json index c39383529c..04e8129408 100644 --- a/core/core-frontend/package.json +++ b/core/core-frontend/package.json @@ -24,7 +24,7 @@ "axios": "^1.3.3", "crypto-js": "^4.1.1", "dayjs": "^1.11.9", - "element-plus-secondary": "^0.5.4", + "element-plus-secondary": "^0.5.5", "element-resize-detector": "^1.2.4", "file-saver": "^2.0.5", "html-to-image": "^1.11.11", diff --git a/core/core-frontend/src/components/drawer-filter/src/DrawerTimeFilter.vue b/core/core-frontend/src/components/drawer-filter/src/DrawerTimeFilter.vue index 2a73bbd82d..2820e02397 100644 --- a/core/core-frontend/src/components/drawer-filter/src/DrawerTimeFilter.vue +++ b/core/core-frontend/src/components/drawer-filter/src/DrawerTimeFilter.vue @@ -2,7 +2,6 @@ import { propTypes } from '@/utils/propTypes' import { computed, PropType, reactive, toRefs, h } from 'vue' import { useI18n } from '@/hooks/web/useI18n' -import { Icon } from '@/components/icon-custom' const { t } = useI18n() @@ -11,8 +10,6 @@ interface Config { showType: string // 日期分隔符 rangeSeparator: string - // 前缀图标 - prefixIcon: string // 开始日期label startPlaceholder: string // 结束日期label @@ -32,13 +29,11 @@ const props = defineProps({ title: propTypes.string }) const { property } = toRefs(props) -const prefixIcon = h(Icon, { name: 'icon_calendar_outlined' }) const timeConfig = computed(() => { let obj = Object.assign( { showType: 'datetime', rangeSeparator: '-', - prefixIcon, startPlaceholder: t('datasource.start_time'), endPlaceholder: t('datasource.end_time'), format: 'YYYY-MM-DD HH:mm:ss', @@ -74,7 +69,6 @@ defineExpose({ v-model="state.modelValue" :type="timeConfig.showType" :range-separator="timeConfig.rangeSeparator" - :prefix-icon="timeConfig.prefixIcon" :start-placeholder="timeConfig.startPlaceholder" :end-placeholder="timeConfig.endPlaceholder" :format="timeConfig.format" diff --git a/core/core-frontend/src/custom-component/v-query/Time.vue b/core/core-frontend/src/custom-component/v-query/Time.vue index e403f5fa79..e15a1fa556 100644 --- a/core/core-frontend/src/custom-component/v-query/Time.vue +++ b/core/core-frontend/src/custom-component/v-query/Time.vue @@ -65,7 +65,6 @@ const props = defineProps({ const selectValue = ref() const multiple = ref(false) const dvMainStore = dvMainStoreWithOut() -const calendar = h(Icon, { name: 'icon_calendar_outlined' }) const { config } = toRefs(props) const minDate = new Date('1970/1/1') const maxDate = new Date('2100/1/1') @@ -377,7 +376,6 @@ const formatDate = computed(() => { :disabled-date="disabledDate" @calendar-change="calendarChange" :format="formatDate" - :prefix-icon="calendar" v-if="multiple" @change="handleValueChange" :range-separator="$t('cron.to')" @@ -389,7 +387,6 @@ const formatDate = computed(() => { v-model="selectValue" :type="config.timeGranularity" @change="handleValueChange" - :prefix-icon="calendar" :style="selectStyle" :placeholder="$t('commons.date.select_date_time')" /> diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue index bb48a24eda..83760e4c3a 100644 --- a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue +++ b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue @@ -1,13 +1,13 @@