01a74ecc by fanguang Committed by lihua

fix

1 parent 586fdb29
1 <template> 1 <template>
2 <el-dialog v-model="visible" :title="title" width="900" modal-class="standard-modal"> 2 <el-dialog v-model="visible" :title="title" width="900" modal-class="standard-modal">
3 <el-form :rules="formRules" :model="form" ref="formEl"> 3 <el-form :rules="formRules" :model="form" ref="formEl" require-asterisk-position="right">
4 <el-row> 4 <el-row>
5 <el-col :span="12" style="padding-right:10px"> 5 <el-col :span="12" style="padding-right:10px">
6 <el-form-item label="元数据标准名称" prop="standardName"> 6 <el-form-item label="元数据标准名称" prop="standardName">
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
51 </el-form-item> 51 </el-form-item>
52 </el-col> 52 </el-col>
53 <el-col :span="24"> 53 <el-col :span="24">
54 <el-form-item label="自定义字段选择" v-if="form.fieldRQVOS && form.fieldRQVOS.length"> 54 <el-form-item label="自定义字段选择" v-if="form.fieldRQVOS && form.fieldRQVOS.length" required>
55 <div class="table-form"> 55 <div class="table-form">
56 <div class="table-form-wrapper" v-for="item,index in form.fieldRQVOS" :key="index"> 56 <div class="table-form-wrapper" v-for="item,index in form.fieldRQVOS" :key="index">
57 <div class="table-form-item"> 57 <div class="table-form-item">
...@@ -248,9 +248,15 @@ watch( ...@@ -248,9 +248,15 @@ watch(
248 () => visible.value, 248 () => visible.value,
249 (v) => { 249 (v) => {
250 if (!v) return 250 if (!v) return
251
251 if (props.type === 'edit') { 252 if (props.type === 'edit') {
252 getDetail() 253 getDetail()
254 } else {
255 form.value = { ...formTpl }
253 } 256 }
257 setTimeout(() => {
258 formEl.value.clearValidate()
259 }, 100)
254 } 260 }
255 ) 261 )
256 onBeforeMount(() => { 262 onBeforeMount(() => {
...@@ -286,13 +292,16 @@ onBeforeMount(() => { ...@@ -286,13 +292,16 @@ onBeforeMount(() => {
286 .el-form-item { 292 .el-form-item {
287 flex-direction: column; 293 flex-direction: column;
288 .el-form-item__label { 294 .el-form-item__label {
289 justify-content: flex-start; 295 justify-content: flex-start;
290 } 296 }
291 } 297 }
292 .el-dialog__footer { 298 .el-dialog__footer {
293 padding: 10px; 299 padding: 10px;
294 } 300 }
295 301 .el-dialog__body {
302 height: 500px;
303 overflow: auto;
304 }
296 .table-form-wrapper { 305 .table-form-wrapper {
297 display: flex; 306 display: flex;
298 margin-bottom: 5px; 307 margin-bottom: 5px;
......
...@@ -358,7 +358,8 @@ const formTable = ref({ ...@@ -358,7 +358,8 @@ const formTable = ref({
358 title: "定义表结构", 358 title: "定义表结构",
359 col: 'no-margin', 359 col: 'no-margin',
360 style: { 360 style: {
361 height: 'calc(100% - 234px)' 361 // height: 'calc(100% - 234px)'
362 height: 'auto'
362 }, 363 },
363 tableInfo: { 364 tableInfo: {
364 id: "role-authority-table", 365 id: "role-authority-table",
...@@ -380,9 +381,9 @@ const formTable = ref({ ...@@ -380,9 +381,9 @@ const formTable = ref({
380 }, 381 },
381 editInfo: {}, 382 editInfo: {},
382 readonly: false, 383 readonly: false,
383 col: 'auto-height', 384 // col: 'auto-height',
384 style: { 385 style: {
385 height: 'calc(100% - 40px)' 386 // height: 'calc(100% - 40px)'
386 }, 387 },
387 loading: false 388 loading: false
388 }, 389 },
...@@ -1535,8 +1536,8 @@ onMounted(() => { ...@@ -1535,8 +1536,8 @@ onMounted(() => {
1535 <div class="table_tool_wrap"> 1536 <div class="table_tool_wrap">
1536 <div class="tools_btns"> 1537 <div class="tools_btns">
1537 <el-button type="primary" @click="loadDrawer" v-preReClick>新建</el-button> 1538 <el-button type="primary" @click="loadDrawer" v-preReClick>新建</el-button>
1538 <el-button @click="batching('delete')" v-preReClick>批量删除</el-button>
1539 <el-button @click="batching('export')" v-preReClick>批量导入</el-button> 1539 <el-button @click="batching('export')" v-preReClick>批量导入</el-button>
1540 <el-button @click="batching('delete')" v-preReClick>批量删除</el-button>
1540 </div> 1541 </div>
1541 <el-input class="table_search_input" v-model.trim="tableSearchInput" placeholder="请输入关键字搜索" 1542 <el-input class="table_search_input" v-model.trim="tableSearchInput" placeholder="请输入关键字搜索"
1542 :suffix-icon="Search" clearable @change="val => getFirstPageData()" /> 1543 :suffix-icon="Search" clearable @change="val => getFirstPageData()" />
...@@ -1570,5 +1571,11 @@ onMounted(() => { ...@@ -1570,5 +1571,11 @@ onMounted(() => {
1570 height: calc(100% - 68px); 1571 height: calc(100% - 68px);
1571 overflow: hidden auto; 1572 overflow: hidden auto;
1572 } 1573 }
1574
1573 } 1575 }
1574 </style> 1576 </style>
1577 <style>
1578 .el-scrollbar__bar.is-vertical {
1579 display: none!important;
1580 }
1581 </style>
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!