明树Git Lab

Commit ea4b8bb4 authored by zhanghan's avatar zhanghan

1

parent 32de73d8
Pipeline #108526 passed with stage
in 20 seconds
...@@ -14,7 +14,11 @@ ...@@ -14,7 +14,11 @@
:key="item.prop || index" :key="item.prop || index"
:span="item.span || defaultSpan" :span="item.span || defaultSpan"
> >
<el-form-item :label="item.label" :prop="item.prop"> <el-form-item
style="width: 100%"
:label="item.label"
:prop="item.prop"
>
<!-- 输入框 --> <!-- 输入框 -->
<el-input <el-input
v-if="item.type === 'input'" v-if="item.type === 'input'"
...@@ -392,7 +396,7 @@ onMounted(() => { ...@@ -392,7 +396,7 @@ onMounted(() => {
<style lang="less" scoped> <style lang="less" scoped>
.search-form { .search-form {
:deep(.el-form-item) { :deep(.el-form-item) {
margin-bottom: 12px; margin-bottom: 16px;
} }
:deep(.el-form-item__label) { :deep(.el-form-item__label) {
...@@ -415,5 +419,9 @@ onMounted(() => { ...@@ -415,5 +419,9 @@ onMounted(() => {
:deep(.el-input-number) { :deep(.el-input-number) {
width: 100%; width: 100%;
} }
.el-col-6.is-guttered {
padding: 0px 24px !important;
}
} }
</style> </style>
...@@ -393,7 +393,10 @@ ...@@ -393,7 +393,10 @@
</el-col> </el-col>
<!-- 表单操作按钮 --> <!-- 表单操作按钮 -->
<el-col :span="24"> <el-col :span="24">
<el-form-item v-if="config.showButtons !== false" class="form-buttons"> <el-form-item
v-if="config.showButtons !== false"
class="form-buttons"
>
<el-button <el-button
v-if="config.showSubmit !== false" v-if="config.showSubmit !== false"
type="primary" type="primary"
...@@ -414,7 +417,6 @@ ...@@ -414,7 +417,6 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
</div> </div>
</template> </template>
...@@ -516,7 +518,7 @@ watch( ...@@ -516,7 +518,7 @@ watch(
emit("update:modelValue", { ...newVal }); emit("update:modelValue", { ...newVal });
emit("change", newVal); emit("change", newVal);
}, },
{ deep: true } { deep: true },
); );
// 监听外部数据变化 // 监听外部数据变化
...@@ -529,7 +531,7 @@ watch( ...@@ -529,7 +531,7 @@ watch(
} }
}); });
}, },
{ deep: true } { deep: true },
); );
// 事件处理 // 事件处理
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
flex-direction: column; flex-direction: column;
box-sizing: border-box; box-sizing: border-box;
} }
.add-project-content { .add-project-content {
background-color: #fff; background-color: #fff;
padding-top: 16px; padding-top: 16px;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div class="manage-container"> <div class="manage-container">
<div class="manage-wrap"> <div class="manage-wrap">
<!-- 搜索表单区域 --> <!-- 搜索表单区域 -->
<div class="manage-search" v-if="showSearch"> <div class="manage-search">
<search-form <search-form
v-model="searchForm" v-model="searchForm"
:items="searchItems" :items="searchItems"
...@@ -82,7 +82,6 @@ ...@@ -82,7 +82,6 @@
<script setup> <script setup>
import { reactive, ref, onMounted, computed, getCurrentInstance } from "vue"; import { reactive, ref, onMounted, computed, getCurrentInstance } from "vue";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import { ArrowUp, ArrowDown } from "@element-plus/icons-vue";
import CommonTable from "@/components/common/commonTable.vue"; import CommonTable from "@/components/common/commonTable.vue";
import SearchForm from "@/components/common/SearchForm.vue"; import SearchForm from "@/components/common/SearchForm.vue";
...@@ -204,7 +203,6 @@ let currentPage = ref(1); ...@@ -204,7 +203,6 @@ let currentPage = ref(1);
let pageSize = ref(10); let pageSize = ref(10);
// ========== 搜索表单相关 ========== // ========== 搜索表单相关 ==========
const showSearch = ref(true);
const searchForm = ref({}); const searchForm = ref({});
// 搜索字段配置 // 搜索字段配置
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment