From b06f6a316b6a8293bb8aba6bfff33336b66c032a Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 09:01:52 +0800
Subject: [PATCH] !64 版本升级 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance
---
src/views/tool/gen/editTable.vue | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/views/tool/gen/editTable.vue b/src/views/tool/gen/editTable.vue
index fdd1eeb..d2f7375 100644
--- a/src/views/tool/gen/editTable.vue
+++ b/src/views/tool/gen/editTable.vue
@@ -35,22 +35,22 @@
<el-table-column label="鎻掑叆" min-width="5%">
<template #default="scope">
- <el-checkbox true-label="1" false-label="0" v-model="scope.row.isInsert"></el-checkbox>
+ <el-checkbox v-model="scope.row.isInsert" true-label="1" false-label="0"></el-checkbox>
</template>
</el-table-column>
<el-table-column label="缂栬緫" min-width="5%">
<template #default="scope">
- <el-checkbox true-label="1" false-label="0" v-model="scope.row.isEdit"></el-checkbox>
+ <el-checkbox v-model="scope.row.isEdit" true-label="1" false-label="0"></el-checkbox>
</template>
</el-table-column>
<el-table-column label="鍒楄〃" min-width="5%">
<template #default="scope">
- <el-checkbox true-label="1" false-label="0" v-model="scope.row.isList"></el-checkbox>
+ <el-checkbox v-model="scope.row.isList" true-label="1" false-label="0"></el-checkbox>
</template>
</el-table-column>
<el-table-column label="鏌ヨ" min-width="5%">
<template #default="scope">
- <el-checkbox true-label="1" false-label="0" v-model="scope.row.isQuery"></el-checkbox>
+ <el-checkbox v-model="scope.row.isQuery" true-label="1" false-label="0"></el-checkbox>
</template>
</el-table-column>
<el-table-column label="鏌ヨ鏂瑰紡" min-width="10%">
@@ -69,7 +69,7 @@
</el-table-column>
<el-table-column label="蹇呭～" min-width="5%">
<template #default="scope">
- <el-checkbox true-label="1" false-label="0" v-model="scope.row.isRequired"></el-checkbox>
+ <el-checkbox v-model="scope.row.isRequired" true-label="1" false-label="0"></el-checkbox>
</template>
</el-table-column>
<el-table-column label="鏄剧ず绫诲瀷" min-width="12%">
@@ -104,7 +104,7 @@
</el-tab-pane>
</el-tabs>
<el-form label-width="100px">
- <div style="text-align: center;margin-left:-100px;margin-top:10px;">
+ <div style="text-align: center; margin-left: -100px; margin-top: 10px">
<el-button type="primary" @click="submitForm()">鎻愪氦</el-button>
<el-button @click="close()">杩斿洖</el-button>
</div>
@@ -118,7 +118,7 @@
import { optionselect as getDictOptionselect } from '@/api/system/dict/type';
import { DictTypeVO } from '@/api/system/dict/type/types';
import BasicInfoForm from './basicInfoForm.vue';
-import GenInfoForm from "./genInfoForm.vue";
+import GenInfoForm from './genInfoForm.vue';
const route = useRoute();
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@@ -138,8 +138,8 @@
const basicForm = basicInfo.value?.$refs.basicInfoForm;
const genForm = genInfo.value?.$refs.genInfoForm;
- Promise.all([basicForm, genForm].map(getFormPromise)).then(async res => {
- const validateResult = res.every(item => !!item);
+ Promise.all([basicForm, genForm].map(getFormPromise)).then(async (res) => {
+ const validateResult = res.every((item) => !!item);
if (validateResult) {
const genTable: any = Object.assign({}, info.value);
genTable.columns = columns.value;
@@ -155,24 +155,24 @@
close();
}
} else {
- proxy?.$modal.msgError("琛ㄥ崟鏍￠獙鏈�氳繃锛岃閲嶆柊妫�鏌ユ彁浜ゅ唴瀹�");
+ proxy?.$modal.msgError('琛ㄥ崟鏍￠獙鏈�氳繃锛岃閲嶆柊妫�鏌ユ彁浜ゅ唴瀹�');
}
});
-}
+};
const getFormPromise = (form: any) => {
- return new Promise(resolve => {
+ return new Promise((resolve) => {
form.validate((res: any) => {
resolve(res);
});
});
-}
+};
const close = () => {
- const obj = { path: "/tool/gen", query: { t: Date.now(), pageNum: route.query.pageNum } };
+ const obj = { path: '/tool/gen', query: { t: Date.now(), pageNum: route.query.pageNum } };
proxy?.$tab.closeOpenPage(obj);
-}
+};
(async () => {
- const tableId = route.params && route.params.tableId as string;
+ const tableId = route.params && (route.params.tableId as string);
if (tableId) {
// 鑾峰彇琛ㄨ缁嗕俊鎭�
const res = await getGenTable(tableId);
--
Gitblit v1.9.3