From c86748a2c254ea22ac8f57d7984cc4743efaaed7 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期五, 26 七月 2024 16:53:07 +0800 Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/PLTWEB --- Source/plt-web/plt-web-ui/src/views/modelingMenu/modeling/attributePool/index.vue | 676 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 584 insertions(+), 92 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 871f037..1220e90 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 @@ -35,109 +35,370 @@ <el-aside width="30%"> <basic-container> - <div style="height: 85vh; overflow-y: auto"> - <el-descriptions :column="1" border size="medium" title="灞炴�ч」"> - <el-descriptions-item> - <template slot="label"> - 鍚嶇О - </template> - 鍚嶇О - </el-descriptions-item> - <el-descriptions-item> - <template slot="label"> - 鏍囩 - </template> - 鏍囩 - </el-descriptions-item> - <el-descriptions-item> - <template slot="label"> - 鎻忚堪 - </template> - 鎻忚堪 - </el-descriptions-item> - <el-descriptions-item> - <template slot="label"> - 鎿嶄綔绫诲瀷 - </template> - 鎿嶄綔绫诲瀷 - </el-descriptions-item> - </el-descriptions> + <div style="height: 85vh; overflow-y: auto"> + <el-descriptions :column="1" border size="medium" title="灞炴�ч」"> + <el-descriptions-item> + <template slot="label"> + 鍚嶇О + </template> + {{ lastItem.id }} + </el-descriptions-item> + <el-descriptions-item> + <template slot="label"> + 鏍囩 + </template> + {{ lastItem.name }} + </el-descriptions-item> + <el-descriptions-item> + <template slot="label"> + 鎻忚堪 + </template> + {{ lastItem.description }} + </el-descriptions-item> + <el-descriptions-item> + <template slot="label"> + 鎿嶄綔绫诲瀷 + </template> + {{ lastItem.attributeDataType }} + </el-descriptions-item> + </el-descriptions> - <el-descriptions :column="1" border class="margin-top" size="medium" title="VTString"> - <el-descriptions-item> - <template slot="label"> - 鍏佽涓虹┖ - </template> - <el-tag type="success">鏄�</el-tag> - </el-descriptions-item> - <el-descriptions-item> - <template slot="label"> - 绮惧害 - </template> - 绮惧害 - </el-descriptions-item> - <el-descriptions-item> - <template slot="label"> - 闀垮害 - </template> - 闀垮害 - </el-descriptions-item> - <el-descriptions-item> - <template slot="label"> - 榛樿鍊� - </template> - 榛樿鍊� - </el-descriptions-item> - </el-descriptions> + <!-- 鍊煎煙 --> + <el-descriptions v-if="!isSpecialDataType" :column="1" :title="lastItem.attributeDataType" border + class="margin-top" + size="medium"> + <el-descriptions-item> + <template slot="label"> + 鍏佽涓虹┖ + </template> + <el-tag :type="lastItem.nullableFlag ? 'success' : 'danger'"> + {{ lastItem.nullableFlag ? '鏄�' : '鍚�' }} + </el-tag> + </el-descriptions-item> + <el-descriptions-item v-if="accuracy"> + <template slot="label"> + 绮惧害 + </template> + 绮惧害 + </el-descriptions-item> + <el-descriptions-item v-if="length"> + <template slot="label"> + 闀垮害 + </template> + {{ lastItem.attrLength }} + </el-descriptions-item> + <el-descriptions-item> + <template slot="label"> + 榛樿鍊� + </template> + {{ lastItem.defaultValue }} + </el-descriptions-item> + </el-descriptions> - <el-descriptions :column="1" border class="margin-top" size="medium" title="鍊煎煙"> - <el-descriptions-item> - <template slot="label"> - 褰撳墠绫诲瀷 - </template> - 涓氬姟绫诲瀷 - </el-descriptions-item> - <el-descriptions-item> - <template slot="label"> - 褰撳墠绫诲瀷鍊� - </template> + <!-- VTString --> + <el-descriptions v-if="lastItem.attributeDataType === 'VTString' || !lastItem.attributeDataType" + :column="1" border class="margin-top" size="medium" title="鍊煎煙"> + <el-descriptions-item> + <template slot="label"> + 褰撳墠绫诲瀷 + </template> + {{ lastItem.version ? '閾炬帴绫诲瀷' : '涓氬姟绫诲瀷' }} + </el-descriptions-item> + <el-descriptions-item> + <template slot="label"> + 褰撳墠绫诲瀷鍊� + </template> + {{ lastItem.version ? lastItem.linkTypeName : lastItem.btmTypeId }} + </el-descriptions-item> + <el-descriptions-item v-if="lastItem.version"> + <template slot="label"> + 褰撳墠鐗堟湰娆� + </template> + {{ lastItem.version }} + </el-descriptions-item> + <el-descriptions-item> + <template slot="label"> + 浣跨敤鏋氫妇 + </template> + <el-tag :type="lastItem.enumId ? 'success' : 'danger'"> + {{ lastItem.enumId ? '鏄�' : '鍚�' }} + </el-tag> + </el-descriptions-item> + <el-descriptions-item> + <template slot="label"> + 鏋氫妇绫诲瀷 + </template> + {{ lastItem.enumId }} + </el-descriptions-item> + <el-descriptions-item> + <template slot="label"> + 鍙栧�艰寖鍥� + </template> + <div style="width: 330px; height: 80px;overflow: auto"> + <el-tag v-for="item in rangeList" plain style="margin: 5px">{{ item }}</el-tag> + </div> + </el-descriptions-item> - </el-descriptions-item> - <el-descriptions-item> - <template slot="label"> - 褰撳墠鐗堟湰娆� - </template> + </el-descriptions> + <!-- VTInteger && VTInteger --> + <el-descriptions + v-if="lastItem.attributeDataType === 'VTInteger' || lastItem.attributeDataType === 'VTInteger'" + :column="1" border class="margin-top" size="medium" title="鍊煎煙"> - </el-descriptions-item> - <el-descriptions-item> - <template slot="label"> - 浣跨敤鏋氫妇 - </template> - <el-tag type="success">鏄�</el-tag> - </el-descriptions-item> - <el-descriptions-item> - <template slot="label"> - 鏋氫妇绫诲瀷 - </template> - 鏋氫妇绫诲瀷 - </el-descriptions-item> - <el-descriptions-item> - <template slot="label"> - 鏋氫妇鍊� - </template> + <el-descriptions-item> + <template slot="label"> + 浣跨敤鏋氫妇 + </template> + <el-tag :type="lastItem.enumId ? 'success' : 'danger'"> + {{ lastItem.enumId ? '鏄�' : '鍚�' }} + </el-tag> + </el-descriptions-item> + <el-descriptions-item> + <template slot="label"> + 鏋氫妇绫诲瀷 + </template> + {{ lastItem.enumId }} + </el-descriptions-item> + <el-descriptions-item> + <template slot="label"> + 鍙栧�艰寖鍥� + </template> + <div style="width: 330px; height: 80px;overflow: auto"> + <el-tag v-for="item in rangeList" plain style="margin: 5px">{{ item }}</el-tag> + </div> + </el-descriptions-item> - </el-descriptions-item> + </el-descriptions> + <!-- VTDouble --> + <el-descriptions v-if="lastItem.attributeDataType === 'VTDouble'" + :column="1" border class="margin-top" size="medium" title="鍊煎煙"> - </el-descriptions> + <el-descriptions-item> + <template slot="label"> + 鍙栧�艰寖鍥� + </template> + <div style="width: 330px; height: 80px;overflow: auto"> + <el-tag v-for="item in rangeList" plain style="margin: 5px">{{ item }}</el-tag> + </div> + </el-descriptions-item> - </div> + </el-descriptions> + <!-- VTDate VTTime VTDateTime VTNote VTFilePath VTClob鍧囦笉鏄剧ず VTBoolean涓嶆樉绀哄�煎煙 鍙樉绀虹被鍨� --> + </div> </basic-container> </el-aside> + + <!-- 鏌ョ湅浣跨敤鑼冨洿 --> + <el-dialog + v-dialogDrag + v-loading="checkViewLoading" + :visible.sync="checkViewVisible" + append-to-body="true" + class="avue-dialog" + title="鏌ョ湅浣跨敤鑼冨洿" + width="70%" + > + <avue-crud + ref="checkViewCrud" + :data="checkViewData" + :option="checkViewOption" + @search-change="checkHandleSearch" + @search-reset="checkHandleReset" + > + + </avue-crud> + </el-dialog> + + <!-- 鏂板瀵硅瘽妗� --> + <el-dialog + v-dialogDrag + v-loading="addLoading" + :visible.sync="addVisible" + append-to-body="true" + class="avue-dialog" + title="鍒涘缓" + width="65%" + > + <el-form ref="form" :model="form" :rules="rules" label-width="120px"> + <el-row> + <div class="addDialog"> + <div> + + <h3>灞炴�ч」</h3> + + <el-col :span="12"> + <el-form-item label="鍚嶇О锛�" prop="id"> + <el-input v-model="form.id"></el-input> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="鏍囩锛�"> + <el-input v-model="form.name"></el-input> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="灞炴�х被鍨嬶細"> + <el-select v-model="form.attributeDataType" placeholder="璇烽�夋嫨灞炴�х被鍨�" @change="attributeDataTypeChange"> + <el-option v-for="item in typeSelectList" :label="item" :value="item"></el-option> + </el-select> + </el-form-item> + </el-col> + <el-col :span="12"> + <el-form-item label="鎻忚堪锛�"> + <el-input v-model="form.description" :rows="2" type="textarea"></el-input> + </el-form-item> + </el-col> + + </div> + <div v-if="!hideType" class="addDialogBottom"> + <div class="left"> + <h3>{{ form.attributeDataType }}</h3> + + <el-form-item + v-if="form.attributeDataType !== 'VTInteger' && form.attributeDataType !== 'VTLong' + && form.attributeDataType !== 'VTDouble' && form.attributeDataType !== 'VTBoolean'" + label="闀垮害锛�"> + <el-input v-model="form.attrLength"></el-input> + </el-form-item> + + <el-form-item v-if="form.attributeDataType === 'VTDouble'" label="绮惧害锛�"> + <el-input v-model="form.precisionLength"></el-input> + </el-form-item> + + <el-form-item v-if="form.attributeDataType === 'VTDouble'" label="闀垮害锛�"> + <el-input v-model="form.scaleLength"></el-input> + </el-form-item> + + + <el-form-item v-if="form.attributeDataType !== 'VTBoolean'" label="榛樿鍊硷細"> + <el-input v-model="form.defaultValue"></el-input> + </el-form-item> + + <el-form-item v-if="form.attributeDataType === 'VTBoolean'" label="榛樿鍊硷細"> + <el-select> + <el-option label="false" value="false"></el-option> + <el-option label="true" value="true"></el-option> + </el-select> + </el-form-item> + + <el-form-item label="鍏佽涓虹┖锛�"> + <el-switch v-model="form.nullableFlag"></el-switch> + </el-form-item> + + </div> + <el-divider direction="vertical"></el-divider> + <!-- VTString --> + <div v-if="form.attributeDataType === 'VTString'" class="right"> + <h3>鍊煎煙</h3> + <el-form-item label="褰撳墠鍊煎煙绫诲瀷锛�"> + <el-select v-model="form.attributeSelectType" placeholder="璇烽�夋嫨灞炴�х被鍨�" @change="attributeSelectTypeChange"> + <el-option label="涓氬姟绫诲瀷" value="business"></el-option> + <el-option label="閾炬帴绫诲瀷" value="link"></el-option> + </el-select> + </el-form-item> + + + <el-form-item label="閫夋嫨鍙傜収绫诲瀷锛�"> + <el-input v-model="form.attrLength"></el-input> + </el-form-item> + + + <el-form-item label="浣跨敤鏋氫妇锛�"> + <el-switch v-model="form.enumSwitch" @change="switchEnumChange"></el-switch> + </el-form-item> + + + <el-form-item :label="form.enumSwitch ? '鏋氫妇閫夋嫨锛�' : '娣诲姞鏋氫妇鍊硷細'"> + <el-select v-if="form.enumSwitch" v-model="form.attributeDataTypePick" placeholder="璇烽�夋嫨鏋氫妇绫诲瀷" + @change="enumSelectChange"> + <el-option v-for="(item,index) in attributeDataTypePickList" :key="index" :label="item.key" + :value="item.key"></el-option> + </el-select> + <el-input v-if="!form.enumSwitch" v-model="form.enumAddValue"> + </el-input> + </el-form-item> + <el-form-item v-if="!form.enumSwitch" label="杩愮畻绗︼細"> + <div> + <el-button size="mini" @click="enumAddHandler"> =</el-button> + </div> + </el-form-item> + <el-form-item label="褰撳墠鏋氫妇鍊硷細"> + <textarea v-model="form.range" + style="width: 330px; height: 80px; border: 1px solid #DCDFE6; overflow: auto; text-align: left;resize: none;"> + </textarea> + </el-form-item> + </div> + <!-- VTInteger VTLong --> + <div v-if="form.attributeDataType === 'VTInteger' || form.attributeDataType === 'VTLong' " class="right"> + <h3>鍊煎煙</h3> + + <el-form-item label="浣跨敤鏋氫妇锛�"> + <el-switch v-model="form.enumSwitch" @change="switchEnumChange"></el-switch> + </el-form-item> + + + <el-form-item :label="form.enumSwitch ? '鏋氫妇閫夋嫨锛�' : '娣诲姞鏋氫妇鍊硷細'"> + <el-select v-if="form.enumSwitch" v-model="form.attributeDataTypePick" placeholder="璇烽�夋嫨鏋氫妇绫诲瀷" + @change="enumSelectChange"> + <el-option v-for="(item,index) in attributeDataTypePickList" :key="index" :label="item.key" + :value="item.key"></el-option> + </el-select> + <el-input v-if="!form.enumSwitch" v-model="form.enumAddValue"> + </el-input> + </el-form-item> + <el-form-item v-if="!form.enumSwitch" label="杩愮畻绗︼細"> + <div> + <el-button size="mini"> ></el-button> + <el-button size="mini"> <</el-button> + <el-button size="mini"> >=</el-button> + <el-button size="mini"> <=</el-button> + <el-button size="mini"> =</el-button> + <el-button size="mini"> !=</el-button> + <el-button size="mini"> ( )</el-button> + </div> + </el-form-item> + <el-form-item label="褰撳墠鏋氫妇鍊硷細"> + <textarea v-model="form.range" + style="width: 330px; height: 80px; border: 1px solid #DCDFE6; overflow: auto; text-align: left;resize: none;"> + </textarea> + </el-form-item> + </div> + <!-- VTDouble --> + <div v-if="form.attributeDataType === 'VTDouble'" class="right"> + <h3>鍊煎煙</h3> + + + <el-form-item label="娣诲姞鏋氫妇鍊硷細"> + <el-input v-model="form.enumAddValue"> + </el-input> + </el-form-item> + <el-form-item label="杩愮畻绗︼細"> + <div> + <el-button size="mini"> ></el-button> + <el-button size="mini"> <</el-button> + <el-button size="mini"> >=</el-button> + <el-button size="mini"> <=</el-button> + <el-button size="mini"> =</el-button> + <el-button size="mini"> !=</el-button> + <el-button size="mini"> ( )</el-button> + </div> + </el-form-item> + <el-form-item label="褰撳墠鏋氫妇鍊硷細"> + <textarea v-model="form.range" + style="width: 330px; height: 80px; border: 1px solid #DCDFE6; overflow: auto; text-align: left;resize: none;"> + </textarea> + </el-form-item> + </div> + </div> + </div> + </el-row> + </el-form> + </el-dialog> </el-container> </template> <script> -import {gridAttribute} from "@/api/modeling/attributePool/api"; +import {gridAttribute, getUsedAttributeList, getEnumMapByType} from "@/api/modeling/attributePool/api"; import basicOption from '@/util/basic-option'; import {column} from "./option" @@ -163,7 +424,100 @@ pageSizes: [10, 30, 50, 100], }, searchParams: {}, - selectList: [] + selectList: [], + checkViewData: [], + checkViewDataSearch: [], + checkViewVisible: false, + checkViewLoading: false, + checkViewOption: { + ...basicOption, + addBtn: false, + menu: false, + searchMenuSpan: 8, + refreshBtn: false, + selection: false, + column: [ + { + label: '鍚嶇О', + prop: 'attributeName', + sortable: true, + }, + { + label: '鏉ユ簮', + prop: 'source', + sortable: true, + search: true + }, + { + label: '璇存槑', + prop: 'desc', + } + ] + }, + addVisible: false, + addLoading: false, + form: { + id: "", + name: "", + attributeDataType: "VTString", + description: "", + nullableFlag: true, + attrLength: 50, + enumId: false, + enumSwitch: false, + attributeDataTypePick: "", + enumAddValue: '', + range: '' + }, + defaultForm: { + id: "", + name: "", + attributeDataType: "VTString", + description: "", + nullableFlag: true, + attrLength: 50, + enumId: false, + enumSwitch: false, + attributeDataTypePick: "", + enumAddValue: '', + range: '', + attributeSelectType:'business' + }, + rules: [], + typeSelectList: ['VTString', 'VTInteger', 'VTLong', 'VTDouble', 'VTBoolean', 'VTDate', 'VTTime', 'VTDateTime', 'VTNote', 'VTFilePath', 'VTClob'], + attributeDataTypePickList: [], + enumAddListChange: [] + } + }, + computed: { + lastItem() { + return this.selectList.length > 0 ? this.selectList[this.selectList.length - 1] : {}; + }, + isSpecialDataType() { + // 瀹氫箟涓�涓寘鍚墍鏈夐渶瑕佹瘮杈冪殑绫诲瀷鐨勬暟缁� + const specialTypes = ['VTDate', 'VTTime', 'VTDateTime', 'VTNote', 'VTFilePath', 'VTClob']; + // 鍒ゆ柇 lastItem.attributeDataType 鏄惁鍦ㄨ繖涓暟缁勪腑 + return specialTypes.includes(this.lastItem.attributeDataType); + }, + rangeList() { + if (this.lastItem.range) { + return this.lastItem.range.split(';'); + } + }, + accuracy() { + return this.lastItem.attributeDataType === 'VTDouble'; + }, + length() { + return this.lastItem.attributeDataType === 'VTString' || this.lastItem.attributeDataType === 'VTDoubule'; + }, + // 绛変簬鍏朵腑浠ヤ笅鍊� 涓嶅睍绀烘灇涓� + hideType() { + return this.form.attributeDataType === 'VTNote' || + this.form.attributeDataType === 'VTDate' || + this.form.attributeDataType === 'VTTime' || + this.form.attributeDataType === 'VTClob' || + this.form.attributeDataType === 'VTDateTime' || + this.form.attributeDataType === 'VTFilePath'; } }, methods: { @@ -203,6 +557,7 @@ // 鐐瑰嚮琛� rowClickHandler(row) { this.$refs.userCrud.toggleRowSelection(row); + console.log(row); }, // 鏉℃暟 @@ -215,16 +570,60 @@ this.page.currentPage = val; }, + // 鍒涘缓鎵撳紑瀵硅瘽妗� rowSaveHandlerClick() { + this.addVisible = true; + this.form = this.defaultForm; + this.getEnumMapByTypeHandler('VTString'); }, allDelHandler() { }, + // 鏌ョ湅浣跨敤鑼冨洿 chekView() { + if (this.selectList.length <= 0) { + this.$message.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�'); + return; + } + if (this.selectList.length > 1) { + this.$message.warning('鍙兘閫夋嫨涓�鏉℃暟鎹繘琛屾煡鐪�'); + return; + } + + getUsedAttributeList({attributeName: this.selectList[0].id}).then(res => { + if (res.data.code === 200) { + this.checkViewVisible = true; + this.checkViewData = res.data.data; + this.checkViewDataSearch = res.data.data; + } + }) + }, + + // 鏌ョ湅浣跨敤鑼冨洿鏌ヨ + checkHandleSearch(params, done) { + const {source} = params; + + if (!params.source) { + this.checkViewData = this.checkViewDataSearch; + return done(); + } + ; + + this.checkViewData = this.checkViewData.filter(item => { + return item.source && item.source.includes(source); + }); + + done(); }, + + // 鏌ョ湅浣跨敤鑼冨洿閲嶇疆 + checkHandleReset() { + this.checkViewData = this.checkViewDataSearch; + }, + editBtnClick() { @@ -232,13 +631,106 @@ rowDeleteHandler() { + }, + + // 灞炴�х被鍨嬩笅鎷夋change + attributeDataTypeChange(val) { + this.getEnumMapByTypeHandler(val); + this.form.enumSwitch = false; + }, + + // 灞炴�х被鍨嬩笅鎷夋鏁版嵁澶勭悊 + getEnumMapByTypeHandler(val) { + const enumType = { + VTString: 'String', + VTInteger: 'Integer', + VTLong: 'Integer', + }; + if (enumType[val]) { + const string = enumType[val]; + getEnumMapByType({enumType: string}).then(res => { + const data = res.data.data; + this.attributeDataTypePickList = data.flatMap(obj => + Object.entries(obj).map(([key, values]) => ({ + key: key, + values: values + })) + ); + }) + } + }, + + // 浣跨敤鏋氫妇鏃� 鏋氫妇閫夋嫨涓嬫媺妗哻hange浜嬩欢 + enumSelectChange(val) { + const list = this.attributeDataTypePickList.find(item => item.key === val).values; + this.form.range = list.join('\n'); + }, + + // 浣跨敤鏋氫妇switch婊戝潡change浜嬩欢 + switchEnumChange(status) { + if (status) { + this.form.attributeDataTypePick = this.attributeDataTypePickList[0].key; + const list = this.attributeDataTypePickList[0].values; + this.form.range = list.join('\n'); + } else { + this.form.range = ""; + } + }, + + // 涓嶄娇鐢ㄦ灇涓� 鎵嬪姩娣诲姞鏋氫妇鍊� + enumAddHandler() { + // 妫�鏌ュ拰杞崲 this.form.range 涓烘暟缁勶紝鍚屾椂鎺掗櫎绌哄�� + let currentRangeArray = this.form.range ? this.form.range.split('\n').filter(item => item.trim() !== '') : []; + + let newValue = this.form.enumAddValue.trim(); + if (currentRangeArray.includes(newValue)) { + this.$message.error('璇ュ�煎煙瑙勫垯宸茬粡瀛樺湪锛�') + return; + } + + currentRangeArray.push(newValue); + this.enumAddListChange = currentRangeArray; + this.form.range = currentRangeArray.join('\n'); + this.form.enumAddValue = ""; + }, + + // 鍊煎煙绫诲瀷鍒囨崲 + attributeSelectTypeChange(){ + } } } </script> <style lang="scss" scoped> -.margin-top{ +.margin-top { margin-top: 25px; } + +.left { + width: 45%; + height: 100%; + margin-right: 60px; +} + +.right { + height: 100%; + width: auto; + margin-left: 60px; +} + +.addDialogBottom { + width: 100%; + display: flex; + flex-direction: row; +} + +.addDialogBottom > .el-divider--vertical { + width: 2px; + height: 78%; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -10%); +} </style> -- Gitblit v1.9.3