From 2a225d84f5a14caddb853d3c07b26907d1cb1428 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 15 十一月 2024 10:11:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue | 161 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 92 insertions(+), 69 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue
index f6d274e..35b0974 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/enumType/index.vue
@@ -16,7 +16,7 @@
>
<template slot="menuLeft" slot-scope="scope">
- <el-button icon="el-icon-plus" size="small" type="primary" @click="rowSaveHandlerClick">鍒涘缓</el-button>
+ <el-button icon="el-icon-plus" plain size="small" type="primary" @click="rowSaveHandlerClick">鍒涘缓</el-button>
<el-button icon="el-icon-delete" plain size="small" type="danger" @click="allDelHandler">鍒犻櫎</el-button>
<el-button icon="el-icon-view" plain size="small" type="primary" @click="chekView">鏌ョ湅浣跨敤鑼冨洿</el-button>
<el-button icon="el-icon-download" plain size="small" type="primary" @click="downloadTemplateHandler">涓嬭浇瀵煎叆妯℃澘
@@ -41,13 +41,13 @@
:visible.sync="dialogVisible"
append-to-body="true"
class="avue-dialog"
- width="70%"
+ width="1000px"
@close="dialogClose"
>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+ <el-form ref="form" :model="form" :rules="rules" size="small" label-width="100px">
<el-row>
<el-col :span="12">
- <el-form-item label="鍚嶇О锛�" prop="id">
+ <el-form-item label="鏋氫妇鍚嶇О锛�" prop="id">
<el-input v-model="form.id"></el-input>
</el-form-item>
</el-col>
@@ -58,7 +58,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="绫诲瀷锛�">
- <el-select v-model="form.enumValueDataType" placeholder="璇烽�夋嫨绫诲瀷">
+ <el-select v-model="form.enumValueDataType" placeholder="璇烽�夋嫨绫诲瀷" style="width: 376px;">
<el-option label="String" value="String"></el-option>
<el-option label="Integer" value="Integer"></el-option>
</el-select>
@@ -66,7 +66,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="闀垮害锛�">
- <el-input-number v-model="form.length" :max="999" :min="1" label="鎻忚堪鏂囧瓧"></el-input-number>
+ <el-input-number v-model="form.length" :max="999" :min="1" label="鎻忚堪鏂囧瓧" style="width: 376px;"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="24">
@@ -82,11 +82,10 @@
</el-col>
</el-row>
</el-form>
-
<span slot="footer" class="dialog-footer">
- <el-button type="primary" @click="rowSaveHandler">纭� 瀹�</el-button>
- <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
- </span>
+ <el-button type="primary" @click="rowSaveHandler">纭� 瀹�</el-button>
+ <el-button @click="dialogVisible = false">鍙� 娑�</el-button>
+ </span>
</el-dialog>
<!-- 鏌ョ湅浣跨敤鑼冨洿 -->
@@ -97,7 +96,7 @@
append-to-body="true"
class="avue-dialog"
title="鏌ョ湅浣跨敤鑼冨洿"
- width="70%"
+ width="60%"
>
<avue-crud
ref="checkViewCrud"
@@ -116,9 +115,9 @@
</basic-container>
</el-main>
- <el-aside width="30%">
+ <el-aside width="35%">
<basic-container>
- <el-descriptions :column="1" border size="medium" style="margin-bottom: 20px" title="鏋氫妇淇℃伅">
+ <el-descriptions :column="1" border size="medium" style="margin-bottom: 20px" title="鏋氫妇淇℃伅" :labelStyle="{width:'150px'}">
<el-descriptions-item>
<template slot="label">
鍚嶇О
@@ -183,6 +182,8 @@
refreshBtn: false,
selection: false,
index: false,
+ header:false,
+ calcHeight: -40,
column: [
{
label: '鏋氫妇椤瑰悕绉�',
@@ -243,13 +244,16 @@
dialogData: [],
dialogOption: {
...basicOption,
+ calcHeight: 50,
refreshBtn: false,
selection: false,
+ dialogWidth:500,
column: [
{
label: '鏋氫妇椤瑰悕',
prop: 'name',
sortable: true,
+ span:24,
rules: [
{
required: true,
@@ -262,6 +266,7 @@
label: '鏋氫妇鍊�',
prop: 'value',
sortable: true,
+ span:24,
rules: [
{
required: true,
@@ -273,13 +278,13 @@
{
label: '鎻忚堪',
prop: 'description',
- sortable: true,
+ span:24
},
]
},
rules: {
id: [
- {required: true, message: '璇疯緭鍏ユ灇涓鹃」鍚�', trigger: 'blur'},
+ {required: true, message: '璇疯緭鍏ユ灇涓惧悕绉�', trigger: 'blur'},
{validator: this.validateEnglishOnly, trigger: 'blur'}
],
},
@@ -294,11 +299,12 @@
tableData: [],
option: {
...basicOption,
- calcHeight: -60,
+ calcHeight: -40,
searchMenuSpan: 8,
addBtn: false,
editBtn: false,
delBtn: false,
+ menuWidth:160,
column: [
{
label: '鏋氫妇鍚嶇О',
@@ -315,12 +321,14 @@
label: '杩斿洖绫诲瀷',
prop: 'enumValueDataTypeText',
sortable: true,
+ width:130
}
]
},
tableLoading: false,
selectList: [],
- searchParams: {}
+ searchParams: {},
+ lastIndex: null
}
},
computed: {
@@ -366,13 +374,22 @@
// 閫夋嫨妗�
selectChange(row) {
- console.log(row)
this.selectList = row;
},
// 鐐瑰嚮琛�
rowClickHandler(row) {
- this.$refs.userCrud.toggleRowSelection(row);
+ func.rowClickHandler(
+ row,
+ this.$refs.userCrud,
+ this.lastIndex,
+ (newIndex) => {
+ this.lastIndex = newIndex;
+ },
+ () => {
+ this.selectList = [];
+ }
+ );
},
// 鍏抽棴瀵硅瘽妗�
@@ -466,61 +483,67 @@
// 瀵硅瘽妗嗘灇涓句繚瀛�
rowSaveHandler() {
- const lengthStatus = this.dialogData.some(item => item.value.length > this.form.length)
- if (lengthStatus) {
- this.$message.error('璇锋鏌ユ灇涓惧�兼槸鍚﹁秴杩囨渶澶ч暱搴︼紒')
- return;
- }
-
- if (this.form.enumValueDataType === "Integer") {
- // 鍒ゆ柇鏄惁鍖呭惈闈炴暟瀛楀瓧绗�
- const integerStatus = this.dialogData.some(item => {
- if (!/^\-?\d+$/.test(item.value)) {
- return true;
+ const lengthStatus = this.dialogData.some(item => item.value.length > this.form.length);
+ this.$refs.form.validate((valid) => {
+ if (valid) {
+ if (lengthStatus) {
+ this.$message.error('璇锋鏌ユ灇涓惧�兼槸鍚﹁秴杩囨渶澶ч暱搴︼紒')
+ return;
}
- })
- // 鍒ゆ柇鏄惁鏄痠nteger鏍煎紡
- const integerNumStatus = this.dialogData.some(item => {
- let numValue = parseInt(item.value);
- if (isNaN(numValue) || !Number.isInteger(numValue)) {
- return true;
+ if (this.form.enumValueDataType === "Integer") {
+ // 鍒ゆ柇鏄惁鍖呭惈闈炴暟瀛楀瓧绗�
+ const integerStatus = this.dialogData.some(item => {
+ if (!/^\-?\d+$/.test(item.value)) {
+ return true;
+ }
+ })
+
+ // 鍒ゆ柇鏄惁鏄痠nteger鏍煎紡
+ const integerNumStatus = this.dialogData.some(item => {
+ let numValue = parseInt(item.value);
+ if (isNaN(numValue) || !Number.isInteger(numValue)) {
+ return true;
+ }
+ })
+
+ if (integerStatus || integerNumStatus) {
+ this.$message.error('鏋氫妇鍊煎繀椤绘槸Integer绫诲瀷');
+ return;
+ }
}
- })
- if (integerStatus || integerNumStatus) {
- this.$message.error('鏋氫妇鍊煎繀椤绘槸Integer绫诲瀷');
- return;
+ if (this.dialogType === 'add') {
+ let params = {
+ ...this.form,
+ items: this.dialogData
+ }
+ addEnumType(params).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success(res.data.obj);
+ this.dialogVisible = false;
+ this.getTableList();
+ }
+ })
+ } else if (this.dialogType === 'edit') {
+ let params = {
+ ...this.form,
+ items: this.dialogData,
+ oid: this.editRow.oid,
+ ts: this.editRow.ts
+ }
+ updateEnumType(params).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success(res.data.obj);
+ this.dialogVisible = false;
+ this.getTableList();
+ }
+ })
+ }
+ } else {
+ return false;
}
- }
-
- if (this.dialogType === 'add') {
- let params = {
- ...this.form,
- items: this.dialogData
- }
- addEnumType(params).then(res => {
- if (res.data.code === 200) {
- this.$message.success(res.data.obj);
- this.dialogVisible = false;
- this.getTableList();
- }
- })
- } else if (this.dialogType === 'edit') {
- let params = {
- ...this.form,
- items: this.dialogData,
- oid: this.editRow.oid,
- ts: this.editRow.ts
- }
- updateEnumType(params).then(res => {
- if (res.data.code === 200) {
- this.$message.success(res.data.obj);
- this.dialogVisible = false;
- this.getTableList();
- }
- })
- }
+ });
},
// 鏋氫妇椤规柊澧�
--
Gitblit v1.9.3