Browse Source

fix: dialog和table的组件优化

feature/three
guoapeng 3 months ago
parent
commit
102d335c23
  1. 9
      src/components/common/FTDialog/index.vue
  2. 13
      src/components/common/FTTable/index.vue
  3. 4
      src/components/home/SelectCraft/index.vue
  4. 4
      src/components/home/StartExperiment/index.vue

9
src/components/common/FTDialog/index.vue

@ -14,9 +14,9 @@ const props = defineProps({
type: String, type: String,
default: '50%', default: '50%',
}, },
okLoading: {
okHandle: {
type: Boolean, type: Boolean,
default: false,
default: () => {},
}, },
}) })
const emits = defineEmits(['update:visible', 'ok', 'cancel']) const emits = defineEmits(['update:visible', 'ok', 'cancel'])
@ -25,9 +25,6 @@ const cancel = () => {
show.value = false show.value = false
emits('cancel') emits('cancel')
} }
const ok = () => {
emits('ok')
}
const show = ref(false) const show = ref(false)
@ -66,7 +63,7 @@ watch(
<ft-button :click-handle="cancel"> <ft-button :click-handle="cancel">
取消 取消
</ft-button> </ft-button>
<ft-button type="primary" :loading="okLoading" :click-handle="ok">
<ft-button type="primary" :click-handle="okHandle">
确认 确认
</ft-button> </ft-button>
</div> </div>

13
src/components/common/FTTable/index.vue

@ -10,6 +10,7 @@ const props = withDefaults(defineProps<TableProp>(), {
columns: () => [], columns: () => [],
mustInit: true, mustInit: true,
hasHeader: true, hasHeader: true,
getDataFn: () => Promise.resolve([]),
}) })
const emits = defineEmits([]) const emits = defineEmits([])
enum ColumnType { enum ColumnType {
@ -79,7 +80,6 @@ defineExpose({
</script> </script>
<template> <template>
<el-main>
<div v-if="hasHeader" class="header"> <div v-if="hasHeader" class="header">
<div v-for="btn in btnList" :key="btn.serverUrl"> <div v-for="btn in btnList" :key="btn.serverUrl">
<el-button :icon="btn.icon" :type="btn.type" @click="methodParent(btn.serverUrl)"> <el-button :icon="btn.icon" :type="btn.type" @click="methodParent(btn.serverUrl)">
@ -101,7 +101,7 @@ defineExpose({
:="$attrs" :="$attrs"
:data="state.tableData" :data="state.tableData"
style="width: 100%" style="width: 100%"
height="calc(100% - 100px)"
height="100%"
:highlight-current-row="true" :highlight-current-row="true"
class="container-table" class="container-table"
header-row-class-name="header-row-class" header-row-class-name="header-row-class"
@ -121,7 +121,6 @@ defineExpose({
</el-table-column> </el-table-column>
</template> </template>
</el-table> </el-table>
</el-main>
</template> </template>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -129,17 +128,17 @@ defineExpose({
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
height: 100px;
height: 40px;
.search { .search {
width: 200px; width: 200px;
} }
} }
:deep(.header-row-class) { :deep(.header-row-class) {
th { th {
background: #f7f8fa;
font-weight: 900;
background-color: rgba(0,0,0,0.02 ) !important;
//font-weight: 500;
//border-bottom: none; //border-bottom: none;
color: #000;
color: rgba(0, 0, 0, 0.85)
} }
} }
</style> </style>

4
src/components/home/SelectCraft/index.vue

@ -51,8 +51,8 @@ const getOres = async () => {
</script> </script>
<template> <template>
<FtDialog visible title="选择工艺" width="40%" @ok="okHandle" @cancel="cancel">
<el-form ref="formRef" label-width="120" :model="form" :rules="rules">
<FtDialog visible title="选择工艺" width="40%" :ok-handle="okHandle" @cancel="cancel">
<el-form ref="formRef" label-width="auto" :model="form" :rules="rules">
<el-form-item label="加热区"> <el-form-item label="加热区">
<el-tag v-for="item in homeStore.heatAreaList.filter(item => item.selected)" :key="item.value" class="mask-tag"> <el-tag v-for="item in homeStore.heatAreaList.filter(item => item.selected)" :key="item.value" class="mask-tag">
{{ item.label }} {{ item.label }}

4
src/components/home/StartExperiment/index.vue

@ -36,8 +36,8 @@ const cancel = () => {
</script> </script>
<template> <template>
<FtDialog visible title="开始新实验" width="40%" @ok="okHandle" @cancel="cancel">
<el-form ref="formRef" label-width="120" :model="form" :rules="rules">
<FtDialog visible title="开始新实验" width="30%" :ok-handle="okHandle" @cancel="cancel">
<el-form ref="formRef" label-width="auto" :model="form" :rules="rules">
<el-form-item label="实验名称" prop="name"> <el-form-item label="实验名称" prop="name">
<el-input v-model="form.name" placeholder="" /> <el-input v-model="form.name" placeholder="" />
</el-form-item> </el-form-item>

Loading…
Cancel
Save