From 03c38da7555b69cb598e534c97fa25bd5385701c Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 29 十月 2024 17:55:50 +0800
Subject: [PATCH] 表单定义权限控制和属性权限&&成员管理添加密级&&首页修改密码&&登录判断过期停用修改密码后跳转首页
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue | 59 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 33 insertions(+), 26 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue
index befcded..b49b2bd 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue
@@ -21,7 +21,9 @@
<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">涓嬭浇瀵煎叆妯℃澘</el-button>
+ <el-button icon="el-icon-download" plain size="small" type="primary" @click="downloadTemplateHandler">
+ 涓嬭浇瀵煎叆妯℃澘
+ </el-button>
<el-button icon="el-icon-upload2" plain size="small" type="primary" @click="upLoadHandler">瀵煎叆</el-button>
<el-button icon="el-icon-download" plain size="small" type="primary" @click="downLoadHandler">瀵煎嚭</el-button>
</template>
@@ -53,7 +55,7 @@
鏍囩
</template>
<div style="width: 330px">
- {{ lastItem.name }}
+ {{ lastItem.name }}
</div>
</el-descriptions-item>
<el-descriptions-item>
@@ -61,7 +63,7 @@
鎻忚堪
</template>
<div style="width: 330px">
- {{ lastItem.description }}
+ {{ lastItem.description }}
</div>
</el-descriptions-item>
<el-descriptions-item>
@@ -81,9 +83,9 @@
鍏佽涓虹┖
</template>
<div style="width: 330px">
- <el-tag :type="lastItem.nullableFlag ? 'success' : 'danger'">
- {{ lastItem.nullableFlag ? '鏄�' : '鍚�' }}
- </el-tag>
+ <el-tag :type="lastItem.nullableFlag ? 'success' : 'danger'">
+ {{ lastItem.nullableFlag ? '鏄�' : '鍚�' }}
+ </el-tag>
</div>
</el-descriptions-item>
<el-descriptions-item v-if="accuracy">
@@ -97,7 +99,7 @@
闀垮害
</template>
<div style="width: 330px">
- {{ lastItem.attrLength }}
+ {{ lastItem.attrLength }}
</div>
</el-descriptions-item>
<el-descriptions-item>
@@ -105,7 +107,7 @@
榛樿鍊�
</template>
<div style="width: 330px">
- {{ lastItem.defaultValue }}
+ {{ lastItem.defaultValue }}
</div>
</el-descriptions-item>
</el-descriptions>
@@ -118,7 +120,7 @@
褰撳墠绫诲瀷
</template>
<div style="width: 345px">
- {{ lastItem.version ? '閾炬帴绫诲瀷' : '涓氬姟绫诲瀷' }}
+ {{ lastItem.version ? '閾炬帴绫诲瀷' : '涓氬姟绫诲瀷' }}
</div>
</el-descriptions-item>
<el-descriptions-item>
@@ -126,7 +128,7 @@
褰撳墠绫诲瀷鍊�
</template>
<div style="width: 345px">
- {{ lastItem.version ? lastItem.linkTypeName : lastItem.btmTypeId }}
+ {{ lastItem.version ? lastItem.linkTypeName : lastItem.btmTypeId }}
</div>
</el-descriptions-item>
<el-descriptions-item v-if="lastItem.version">
@@ -134,7 +136,7 @@
褰撳墠鐗堟湰娆�
</template>
<div style="width: 345px">
- {{ lastItem.version }}
+ {{ lastItem.version }}
</div>
</el-descriptions-item>
<el-descriptions-item>
@@ -142,9 +144,9 @@
浣跨敤鏋氫妇
</template>
<div style="width: 345px">
- <el-tag :type="lastItem.enumId ? 'success' : 'danger'">
- {{ lastItem.enumId ? '鏄�' : '鍚�' }}
- </el-tag>
+ <el-tag :type="lastItem.enumId ? 'success' : 'danger'">
+ {{ lastItem.enumId ? '鏄�' : '鍚�' }}
+ </el-tag>
</div>
</el-descriptions-item>
<el-descriptions-item>
@@ -152,7 +154,7 @@
褰撳墠鏋氫妇绫诲瀷
</template>
<div style="width: 345px">
- {{ lastItem.enumId }}
+ {{ lastItem.enumId }}
</div>
</el-descriptions-item>
<el-descriptions-item>
@@ -175,9 +177,9 @@
浣跨敤鏋氫妇
</template>
<div style="width: 330px">
- <el-tag :type="lastItem.enumFlag ? 'success' : 'danger'">
- {{ lastItem.enumFlag ? '鏄�' : '鍚�' }}
- </el-tag>
+ <el-tag :type="lastItem.enumFlag ? 'success' : 'danger'">
+ {{ lastItem.enumFlag ? '鏄�' : '鍚�' }}
+ </el-tag>
</div>
</el-descriptions-item>
<el-descriptions-item>
@@ -185,7 +187,7 @@
鏋氫妇绫诲瀷
</template>
<div style="width: 330px">
- {{ lastItem.enumFlag }}
+ {{ lastItem.enumFlag }}
</div>
</el-descriptions-item>
<el-descriptions-item>
@@ -376,7 +378,7 @@
<el-button size="mini" @click="operationHandler('<=')"> <=</el-button>
<el-button size="mini" @click="operationHandler('=')"> =</el-button>
<el-button size="mini" @click="operationHandler('!=')"> !=</el-button>
- <el-button size="mini" @click="operationHandler('()')"> ()</el-button>
+ <el-button size="mini" @click="operationHandler('()')"> ([])</el-button>
</div>
</el-form-item>
<el-form-item :label="form.enumSwitch ? '褰撳墠鏋氫妇鍊硷細' : '褰撳墠鍊煎煙锛�'" prop="rangeValue">
@@ -400,7 +402,7 @@
<el-button size="mini" @click="operationHandler('<=')"> <=</el-button>
<el-button size="mini" @click="operationHandler('=')"> =</el-button>
<el-button size="mini" @click="operationHandler('!=')"> !=</el-button>
- <el-button size="mini" @click="operationHandler('()')"> ()</el-button>
+ <el-button size="mini" @click="operationHandler('()')">([])</el-button>
</div>
</el-form-item>
<el-form-item :label="form.enumSwitch ? '褰撳墠鏋氫妇鍊硷細' : '褰撳墠鍊煎煙锛�'" prop="rangeValue">
@@ -599,7 +601,7 @@
addBtn: false,
editBtn: false,
delBtn: false,
- menuWidth:160,
+ menuWidth: 160,
column
},
tableLoading: false,
@@ -991,8 +993,13 @@
// 澶勭悊 '()' 杩愮畻绗︾殑鎯呭喌
if (val === '()') {
+ let regex = /[,\[\]()]+/g;
+ let firstValue = this.form.enumAddValue[0];
+ let lastValue = this.form.enumAddValue[(this.form.enumAddValue.length - 1)];
// 鍒囧壊 enumAddValue 鐨勯�楀彿
- let values = this.form.enumAddValue.split(',').map(item => item.trim());
+ let values = this.form.enumAddValue.split(regex).map(item => item.trim()).filter(item => item !== "");
+ ;
+
// 妫�鏌ユ槸鍚︽湁鏈夋晥鐨勫��
if (values.length < 2 || values.some(item => item === '')) {
@@ -1015,7 +1022,7 @@
}
// 鏋勫缓 newValue 鐨勫舰寮� (鍊�1,鍊�2)
- let newValue = `(${values.join(',')})`;
+ let newValue = `${firstValue}${values.join(',')}${lastValue}`;
// 妫�鏌ユ柊鐨勫�兼槸鍚﹀凡瀛樺湪
if (currentRangeArray.includes(newValue)) {
@@ -1244,7 +1251,7 @@
this.$refs.form.validate((valid) => {
if (valid) {
if (this.dialogTitle === 'add') {
- this.form.range = this.form.rangeValue.replace(/\n/g, ';');
+ this.form.range = this.form.rangeValue ? this.form.rangeValue.replace(/\n/g, ';') : '';
if (this.form.attributeSelectType === 'business') {
this.form.btmTypeId = this.form.referValue;
} else {
@@ -1260,7 +1267,7 @@
})
}
if (this.dialogTitle === 'edit') {
- this.form.range = this.form.rangeValue.replace(/\n/g, ';');
+ this.form.range = this.form.rangeValue ? this.form.rangeValue.replace(/\n/g, ';') : '';
if (this.form.attributeSelectType === 'business') {
this.form.btmTypeId = this.form.referValue;
} else {
--
Gitblit v1.9.3