resolver-egretimp-plus 0.0.107 → 0.0.108
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -3,6 +3,7 @@ import { computed, defineAsyncComponent, ref } from 'vue';
|
|
|
3
3
|
import { ElDialog } from 'element-plus';
|
|
4
4
|
import zhCn from 'element-plus/es/locale/lang/zh-cn'
|
|
5
5
|
import en from 'element-plus/es/locale/lang/en'
|
|
6
|
+
import { hasOwn } from '../../../utils';
|
|
6
7
|
const Resolver = defineAsyncComponent(() => import('../../../resolver-web.vue'))
|
|
7
8
|
|
|
8
9
|
const props = defineProps({
|
|
@@ -76,7 +77,9 @@ const dialogStyle = computed(() => {
|
|
|
76
77
|
|
|
77
78
|
const dialogProps = computed(() => {
|
|
78
79
|
const ret = Object.keys(ElDialog.props).reduce((ret, key) => {
|
|
79
|
-
|
|
80
|
+
if (hasOwn(props.dialogProps, key)) {
|
|
81
|
+
ret[key] = props.dialogProps[key]
|
|
82
|
+
}
|
|
80
83
|
return ret
|
|
81
84
|
}, {})
|
|
82
85
|
return ret
|
|
@@ -104,6 +107,7 @@ defineExpose({
|
|
|
104
107
|
<ElConfigProvider :locale="locale">
|
|
105
108
|
<ElDialog class="open-child-frame"
|
|
106
109
|
:close-on-click-modal="false"
|
|
110
|
+
:show-close="false"
|
|
107
111
|
v-bind="dialogProps"
|
|
108
112
|
:width="dialogWidth"
|
|
109
113
|
v-model="dialogVisible"
|
|
@@ -47,7 +47,7 @@ function toCollapse() {
|
|
|
47
47
|
</script>
|
|
48
48
|
<template>
|
|
49
49
|
<cmi-card v-bind="{...cmiProps, ...attrs}">
|
|
50
|
-
<div slot="content"
|
|
50
|
+
<div slot="content">
|
|
51
51
|
<Renderer :config="showPageMeteList" v-model="modelValue"></Renderer>
|
|
52
52
|
<div v-if="showCollapseBtn" class="collapse-wrap">
|
|
53
53
|
<cmi-button type="text" size="small" @click="toCollapse">
|
|
@@ -62,9 +62,4 @@ function toCollapse() {
|
|
|
62
62
|
display: flex;
|
|
63
63
|
justify-content: end;
|
|
64
64
|
}
|
|
65
|
-
cmi-card {
|
|
66
|
-
cmi-form-item {
|
|
67
|
-
background-color: transparent;
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
65
|
</style>
|
|
@@ -53,7 +53,7 @@ const normalPageTotal = computed(() => {
|
|
|
53
53
|
const paginationProps = computed(() => {
|
|
54
54
|
return {
|
|
55
55
|
pagesizes: props.config?.pagesizes || [3, 10, 20, 50],
|
|
56
|
-
showHomeEnd: hasOwn(props.config, 'showHomeEnd') ? props.config.showHomeEnd === '1' : hasOwn(props.config, 'show-home-end') ? props.config['show-home-end'] === '1' :
|
|
56
|
+
showHomeEnd: hasOwn(props.config, 'showHomeEnd') ? props.config.showHomeEnd === '1' : hasOwn(props.config, 'show-home-end') ? props.config['show-home-end'] === '1' : true,
|
|
57
57
|
}
|
|
58
58
|
})
|
|
59
59
|
const pagenationEvents = computed(() => {
|
|
@@ -213,10 +213,9 @@ function normalTableRowValue(row) {
|
|
|
213
213
|
>
|
|
214
214
|
</cmi-table-column>
|
|
215
215
|
</cmi-table>
|
|
216
|
-
<div v-if="pageable && normalPageTotal > 3" :style="{'
|
|
216
|
+
<div v-if="pageable && normalPageTotal > 3" :style="{'justify-content': pageAlignEnmu[pageAlign || PAGE_RIGHT]}" style="margin-bottom: 12px;">
|
|
217
217
|
<cmi-pagination
|
|
218
218
|
:key="normalPageTotal"
|
|
219
|
-
style="border-radius: 8px;border: 1px solid rgba(219,219,219,1);"
|
|
220
219
|
v-bind="{...paginationProps, ...pagenationEvents}"
|
|
221
220
|
@sizeChange="pagenationEvents.onSizeChange"
|
|
222
221
|
@currentChange="pagenationEvents.onCurrentChange"
|