From a4a7426f1286c8d8afe512f155fb650e3e8b940c Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期一, 02 十二月 2024 17:57:43 +0800 Subject: [PATCH] 整合代码&&表单定义扩展属性添加提示文字&&显示类型修改默认值和绑定值 --- Source/plt-web/plt-web-ui/src/views/system/role/index.vue | 5 - Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue | 118 ++++++++++++++++++----------- Source/plt-web/plt-web-ui/src/util/func.js | 36 ++++++++ Source/plt-web/plt-web-ui/src/store/modules/user.js | 26 ++++- Source/plt-web/plt-web-ui/src/views/wel/index.vue | 18 ++-- 5 files changed, 135 insertions(+), 68 deletions(-) diff --git a/Source/plt-web/plt-web-ui/src/store/modules/user.js b/Source/plt-web/plt-web-ui/src/store/modules/user.js index d4a78eb..e6e7fba 100644 --- a/Source/plt-web/plt-web-ui/src/store/modules/user.js +++ b/Source/plt-web/plt-web-ui/src/store/modules/user.js @@ -2,7 +2,7 @@ import {Message} from 'element-ui' import {setStore, getStore} from '@/util/store' import {isURL, validatenull} from '@/util/validate' -import {deepClone,queryStringToObject} from '@/util/util' +import {deepClone, queryStringToObject} from '@/util/util' import website from '@/config/website' import {loginByUsername, loginBySocial, loginBySso, getUserInfo, logout, refreshToken, getButtons} from '@/api/user' import {getTopMenu, getRoutes} from '@/api/system/menu' @@ -38,7 +38,7 @@ item.pathValue = item.path; item.path = '/' + item.code; item.query = {}; // 鍒濆鍖� item.query - if(item.pathValue.indexOf('?')!=-1) { + if (item.pathValue.indexOf('?') != -1) { item.query = queryStringToObject(item.pathValue) } if (item.children && item.children.length > 0) { @@ -63,8 +63,8 @@ //鏍规嵁鐢ㄦ埛鍚嶇櫥褰� LoginByUsername({commit}, userInfo) { return new Promise((resolve, reject) => { - let passwordDes = func.encryptData(userInfo.password,'daliantan0v0vcip') - loginByUsername(userInfo.deptId, userInfo.roleId, userInfo.username,passwordDes, userInfo.type, userInfo.key,).then(res => { + let passwordDes = func.encryptData(userInfo.password, 'daliantan0v0vcip') + loginByUsername(userInfo.deptId, userInfo.roleId, userInfo.username, passwordDes, userInfo.type, userInfo.key,).then(res => { const data = res.data; if (data.obj.failCode === 'loginSuccess') { commit('SET_TOKEN', data.obj.tokenVO.accessToken); @@ -210,7 +210,7 @@ return new Promise((resolve, reject) => { getUserInfo().then((res) => { const data = res.data.data; - console.log('user',res) + console.log('user', res) // commit('SET_USER_INFO', data.roles); resolve(data); }).catch(err => { @@ -296,8 +296,20 @@ SET_ROLES: (state, roles) => { state.roles = roles; }, - + SET_PERMISSION: (state, permission) => { + let permission_new = {}; + permission.forEach(item => { + let children = {}; + if (item.children && item.children.length > 0) { + item.children.forEach(child => { + Vue.set(children, child.code, true); + }); + } + Vue.set(permission_new, item.code, children); + }); + state.permission = permission_new; + setStore({name: "permission", content: permission_new}); + }, } - } export default user diff --git a/Source/plt-web/plt-web-ui/src/util/func.js b/Source/plt-web/plt-web-ui/src/util/func.js index 19783ca..db69cbb 100644 --- a/Source/plt-web/plt-web-ui/src/util/func.js +++ b/Source/plt-web/plt-web-ui/src/util/func.js @@ -4,6 +4,38 @@ import CryptoJS from 'crypto-js' export default class func { + + static getSvgList() { + const fs = require('fs'); + const path = require('path'); + + // 鎸囧畾鏂囦欢澶硅矾寰� + const directoryPath = "../config/svg"; // 淇敼涓轰綘鐨勬枃浠跺す璺緞 + + // 瀛樺偍 .svg 鏂囦欢璺緞鐨勬暟缁� + let svgFiles = []; + + // 璇诲彇鏂囦欢澶� + fs.readdir(directoryPath, (err, files) => { + if (err) { + return console.error('鏃犳硶璇诲彇鐩綍: ' + err); + } + + // 閬嶅巻鏂囦欢 + files.forEach(file => { + // 妫�鏌ユ枃浠跺悗缂�鍚� + if (path.extname(file).toLowerCase() === '.svg') { + // 鏋勫缓鏂囦欢鐨勫畬鏁磋矾寰� + const filePath = path.join(directoryPath, file); + svgFiles.push(filePath); + } + }); + + // 杈撳嚭缁撴灉 + console.log(JSON.stringify(svgFiles, null, 2)); + }); + } + /** * 鍗曢�夎〃鏍艰 * 鏃堕棿鎴虫牸寮忓寲 @@ -92,9 +124,9 @@ */ static isEmptyObject(obj) { - if(obj){ + if (obj) { return Object.keys(obj).length === 0; - }else { + } else { return true; } } diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue index e78aadb..b921caf 100644 --- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue +++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/uiDefine/rightRegion/bottomTable/index.vue @@ -56,6 +56,29 @@ <span v-else-if="form.searchTarger === '1'">婧愬璞�</span> <span v-else-if="form.searchTarger === '2'">鐩爣瀵硅薄</span> </template> + + <template slot="extAttrLabel" slot-scope="{}"> + <el-tooltip placement="top"> + <div slot="content">绀轰緥:ext1:xx;ext2;ext3:xx;ext4:xxx;extn:xxx; + <br/>1銆佺敤鑻变氦鍗婅鍒嗗彿:鍒嗛殧鍚勭粍鍊�; + <br/>2銆佹瘡缁勭敤鑻变氦鍗婅鍐掑彿:鍒嗛殧鍗曚竴鎵╁睍灞炴�у悕绉板強灞炴�у��; + <br/>3銆佸彲浠ュ畾涔変换鎰忕粍锛屼絾鎬诲瓧绗﹂暱搴︿笉寰楄秴杩�4000; + <br/>4銆佽緭鍏ユ椂锛屼笉瑕佹暡鍥炶溅鎹㈣; + </div> + <span>鎵╁睍灞炴�� <i class="el-icon-warning" style="color:red;"></i> </span> + </el-tooltip> + </template> + + <template slot="templateIdForm" slot-scope="{}"> + <el-select v-model="form.templateId" filterable placeholder="璇烽�夋嫨"> + <el-option + v-for="item in templateIdList" + :key="item.viName" + :label="item.viName" + :value="item.viName"> + </el-option> + </el-select> + </template> </avue-crud> <el-dialog v-dialogDrag @@ -216,7 +239,8 @@ delPageDefination, joinBtn, exitBtn, - updatePageDefination + updatePageDefination, + getPortalVIDatasByPage } from "@/api/UI/uiDefine"; import actionDialog from '@/views/modelingMenu/ui/Aciton/components/dialog'; import cloneDialog from "@/views/modelingMenu/ui/uiDefine/rightRegion/cloneDialog"; @@ -240,6 +264,8 @@ name: "index", data() { return { + templateIdList: [], + searchTargerChangeFlag: false, formBtnOid: '', sourceBtnOid: '', sourceOId: '', @@ -397,7 +423,7 @@ hide: true, }, { - label: '鎵╁睍灞炴��', + label: '', prop: 'extAttr', hide: true, }, @@ -469,7 +495,7 @@ dicData: [ { label: '涓嶆樉绀�', - value: '3' + value: '1' }, { label: '鏄剧ず瑙掕壊', @@ -477,7 +503,7 @@ }, { label: '鏄剧ずFolder', - value: '1', + value: '3', }, ], }, @@ -507,11 +533,15 @@ const obj = this.option.group[0].column.find(item => item.prop === 'linkType'); obj.display = val.value !== '1'; } - // 鍒囨崲娓呯┖妯℃澘绫诲瀷 - const list = ['showType', 'linkType', 'templateId', 'SubUILayout', 'queryTemplateName', 'searchObjType']; - // list.forEach(item => { - // this.form[item] = ''; - // }) + if (this.searchTargerChangeFlag) { + // 鍒囨崲娓呯┖妯℃澘绫诲瀷 + const list = ['showType', 'linkType', 'templateId', 'SubUILayout', 'queryTemplateName', 'searchObjType', 'bsCustQueryCLsOrUrl', 'csCustQueryCLsOrUrl']; + list.forEach(item => { + this.form[item] = ''; + }) + } else { + this.searchTargerChangeFlag = true; + } } }, { @@ -534,6 +564,17 @@ placeholder: "璇疯緭鍏ュ唴瀹�", dicUrl: '/api/uiManagerController/getBtmDatasByPage?page=1&limit=-1', filterable: true, + change: (val) => { + console.log('val', val); + if (val) { + let params = { + 'conditionMap[selectBtmType]': this.form.searchTarger === '1' ? this.form.showType : this.form.linkType + } + getPortalVIDatasByPage(1, -1, params).then(res => { + this.templateIdList = res.data.data; + }) + } + }, props: { label: 'name', value: 'name', @@ -564,9 +605,7 @@ label: '閫夋嫨妯℃澘', prop: 'templateId', display: false, - type: 'select', - filterable: true, - dicUrl: '/api/uiManagerController/getPortalVIDatasByPage?page=1&limit=-1&conditionMap[selectBtmType]={{key}}', + formslot: true, rules: [ { required: true, @@ -574,11 +613,6 @@ trigger: 'submit' } ], - props: { - label: 'viName', - value: 'viName', - desc: 'viType' - }, }, { label: 'UI瀹氫箟', @@ -692,6 +726,20 @@ labelWidth: 135, span: 12 }, + { + label: 'B/S鑷畾涔夋煡璇�', + prop: 'bsCustQueryCLsOrUrl', + display: false, + labelWidth: 115, + span: 12 + }, + { + label: 'C/S鑷畾涔夋煡璇�', + prop: 'csCustQueryCLsOrUrl', + display: false, + labelWidth: 115, + span: 12 + }, ] }, { @@ -779,21 +827,11 @@ // 澧炲姞 addClickHandler() { - console.log(this.sourceData); if (!this.sourceData || !this.sourceData.plOId) { this.$message.error('璇峰湪涓婃柟閫夋嫨涓�鏉℃暟鎹悗杩涜娣诲姞'); return; } this.$refs.crud.rowAdd(); - }, - - // 缂栬緫鎵撳紑琛ㄥ崟鍓� - beforeOpen(done, type) { - // if (type === 'edit') { - // console.log('edit'); - // this.form.showType = 'Ludc'; - // } - done(); }, // 澧炲姞鍏抽棴瀵硅瘽妗� 娓呯┖event鏁扮粍 @@ -819,12 +857,10 @@ }); } this.$refs.crud.rowEdit(row); - console.log(this.form); }, // 鍒犻櫎 rowDeleteHandler(row) { - console.log(row); this.$confirm('鎮ㄧ‘瀹氳鍒犻櫎鎵�閫夋嫨鐨勬暟鎹悧锛�', '鎻愮ず', { confirmButtonText: '纭畾', cancelButtonText: '鍙栨秷', @@ -853,13 +889,11 @@ row.SubUIObjType = row.showType; row.showType = ""; } - console.log(this.sourceData); const params = { ...row, tabPageOId: this.sourceData.plOId } addPageDefination(params).then(res => { - console.log(res); if (res.data.code === 200) { this.$message.success(res.data.obj); this.getTableList(); @@ -870,18 +904,16 @@ }) }, - rowUpdateHandler(row,index,done,loading){ + rowUpdateHandler(row, index, done, loading) { if (row.templateType === '6') { row.SubUIObjType = row.showType; row.showType = ""; } - console.log(this.sourceData); const params = { ...row, tabPageOId: this.sourceData.plOId } updatePageDefination(params).then(res => { - console.log(res); if (res.data.code === 200) { this.$message.success(res.data.obj); this.getTableList(); @@ -943,7 +975,7 @@ // 妯℃澘绫诲瀷涓鸿〃鏍� templateTypeTable(val) { if (!val) return; - this.updateDisplay(val, ['showType', 'templateId', 'queryTemplateName']); + this.updateDisplay(val, ['showType', 'templateId', 'queryTemplateName', 'bsCustQueryCLsOrUrl', 'csCustQueryCLsOrUrl']); }, // 妯℃澘绫诲瀷涓鸿嚜瀹氫箟妯℃澘 @@ -957,13 +989,13 @@ // 妯℃澘绫诲瀷涓烘爲琛� templateTypeTreeTable(val) { if (!val) return; - this.updateDisplay(val, ['showType', 'templateId', 'queryTemplateName', 'expandCols', 'expandMode']); + this.updateDisplay(val, ['showType', 'templateId', 'queryTemplateName', 'expandCols', 'expandMode', 'bsCustQueryCLsOrUrl', 'csCustQueryCLsOrUrl']); }, // 妯℃澘绫诲瀷涓鸿〃鍗� templateTypeForm(val) { if (!val) return; - this.updateDisplay(val, ['showType', 'templateId', 'queryTemplateName']); + this.updateDisplay(val, ['showType', 'templateId', 'queryTemplateName', 'bsCustQueryCLsOrUrl', 'csCustQueryCLsOrUrl']); }, // 妯℃澘绫诲瀷涓烘爲 @@ -971,7 +1003,7 @@ if (!val) return; const searchTarger = this.option.column.find(item => item.prop === 'searchTarger'); // 鑾峰彇鎼滅储绫诲瀷閰嶇疆椤� searchTarger.display = false; // 涓嶅睍绀烘悳绱㈢被鍨� - this.updateDisplay(val, ['showType', 'queryTemplateName', 'rootContent', 'showAbs', 'showLinkAbs', 'separator', 'expandMode', 'linkType']); + this.updateDisplay(val, ['showType', 'queryTemplateName', 'rootContent', 'showAbs', 'showLinkAbs', 'separator', 'expandMode', 'linkType', 'bsCustQueryCLsOrUrl', 'csCustQueryCLsOrUrl']); }, // 妯℃澘绫诲瀷涓篣I瀹氫箟 @@ -979,7 +1011,7 @@ if (!val) return; const searchTarger = this.option.column.find(item => item.prop === 'searchTarger'); // 鑾峰彇鎼滅储绫诲瀷閰嶇疆椤� searchTarger.display = false; // 涓嶅睍绀烘悳绱㈢被鍨� - this.updateDisplay(val, ['showType', 'SubUILayout', 'searchType', 'searchObjType', 'queryTemplateName']); + this.updateDisplay(val, ['showType', 'SubUILayout', 'searchType', 'searchObjType', 'queryTemplateName', 'bsCustQueryCLsOrUrl', 'csCustQueryCLsOrUrl']); }, // 鏌ユ壘鏁扮粍涓璞$储寮� @@ -1013,7 +1045,6 @@ this.$message.error('璇烽�夋嫨涓�鏉℃暟鎹�'); return; } - console.log(this.selectList); this.btnDesignVisible = true; this.formBtnOid = this.selectList[0].id; this.getTabBtnTree(); @@ -1059,7 +1090,7 @@ // 鎸夐挳璁捐淇℃伅鍙傛暟淇℃伅淇敼 paramsRowEditHandler(row) { - this.$refs.paramsCrud.rowEdit(row,row.$index); + this.$refs.paramsCrud.rowEdit(row, row.$index); }, // 鎸夐挳璁捐鍙傛暟淇℃伅娣诲姞鎸夐挳 @@ -1069,7 +1100,6 @@ // 鎸夐挳璁捐鍙傛暟淇℃伅淇敼淇濆瓨 paramsRowUpdate(row, index, done, loading) { - console.log(row,index); this.paramsData.splice(index, 1, row); done(); }, @@ -1179,7 +1209,6 @@ type: 'warning' }).then(() => { deleteTabButton(this.nodeTreeRow).then(res => { - // console.log(res); if (res.data.code === 200) { this.$message.success('鍒犻櫎鎴愬姛'); this.getTabBtnTree(); @@ -1222,7 +1251,6 @@ // 鎵撳紑鍏嬮殕瀵硅瘽妗� rowCloneHandler(row) { - console.log(row); this.fromOid = this.sourceData.plOId; this.sourceOId = row.id; this.$refs.cloneDialog.openDialog(row); @@ -1240,7 +1268,6 @@ return; } joinBtn(this.nodeTreeRow).then(res => { - // console.log(res); if (res.data.code === 200) { this.$message.success(res.data.obj); this.getTabBtnTree(); @@ -1254,7 +1281,6 @@ this.$message.error('璇烽�夋嫨鑺傜偣杩涜淇敼'); return; } - if (this.nodeTreeRow.oId === "parentNode") { this.$message.error('椤跺眰鑺傜偣涓嶅厑璁歌皟鏁�'); return; diff --git a/Source/plt-web/plt-web-ui/src/views/system/role/index.vue b/Source/plt-web/plt-web-ui/src/views/system/role/index.vue index 6f9e5f6..64d260f 100644 --- a/Source/plt-web/plt-web-ui/src/views/system/role/index.vue +++ b/Source/plt-web/plt-web-ui/src/views/system/role/index.vue @@ -190,7 +190,6 @@ rowSaveHandler(row, done, loading) { delete row.roleClassifyText; addRole(row).then(res => { - console.log(res) if (res.data.code === 200) { this.$message.success(res.data.obj); this.getTableList(); @@ -213,7 +212,6 @@ } }).catch(err => { loading(); - console.log(err); }); }, @@ -325,7 +323,6 @@ return; } listUserByRoleOid({pkRole: this.selectList[0].oid}).then(res => { - console.log(res) if (res.data.code === 200) { const data = res.data.data; this.countData = data.map(item => { @@ -338,8 +335,6 @@ }); this.statisticsVisible = true; } - }).catch(err => { - console.log(err) }) }, diff --git a/Source/plt-web/plt-web-ui/src/views/wel/index.vue b/Source/plt-web/plt-web-ui/src/views/wel/index.vue index 6624c8d..7d762f7 100644 --- a/Source/plt-web/plt-web-ui/src/views/wel/index.vue +++ b/Source/plt-web/plt-web-ui/src/views/wel/index.vue @@ -10,7 +10,7 @@ <el-row> <el-col :span="16" style="height: 560px"> <basic-container> - <el-collapse v-model="activeNames" @change="handleChange"> + <el-collapse v-model="activeNames"> <el-collapse-item name="1" title="娆㈣繋浣跨敤PLT-WEB骞冲彴"> <div> 1銆佸寳浜畯鍗氳繙杈剧鎶�鏈夐檺鍏徃锛堜互涓嬬畝绉扳�滃畯鍗氳繙杈锯�濓級闀挎湡涓撴敞浜庡埗閫犱笟淇℃伅鍖栧缓璁撅紝涓哄鎴锋彁渚涗紒涓氫俊鎭寲鏁翠綋瑙e喅鏂规鍙婄浉鍏宠蒋浠剁爺鍙戙�佸挩璇㈠強瀹炴柦鏈嶅姟銆傚畯鍗氳繙杈惧鎴风兢浣撴兜鐩栬埅绌恒�佽埅澶┿�佽埞鑸躲�佸叺鍣ㄣ�佹苯杞︺�侀�氱敤鏈烘銆佺數瀛愮瓑鍒堕�犺涓氾紝閫氳繃涓庡鎴锋繁搴﹀悎浣滐紝鎵挎媴浜嗗椤瑰浗瀹剁骇杞欢鐮斿彂涓庢妧鏈湇鍔¢」鐩紝鎷ユ湁澶氶」鍏锋湁鑷富鐭ヨ瘑浜ф潈鐨勮蒋浠朵骇鍝併�� @@ -18,7 +18,9 @@ <div> 2銆佷负浜嗙粰瀹㈡埛鎻愪緵鏇村鐨勬妧鏈垱鏂拌兘鍔涘強鐩稿簲鐨勪紒涓氱骇绠$悊鏀拺骞冲彴锛屽畯鍗氳繙杈剧爺鍙戜簡鍏锋湁鑷富鐭ヨ瘑浜ф潈鐨勪紒涓氱骇淇℃伅鍖栨暣浣撹В鍐虫柟妗堬紝鍚屾椂閽堝瀹㈡埛鐨勭壒瀹氶渶姹傦紝鎻愪緵浜嗛珮搴﹀彲瀹氬埗鐨勪笓涓氬簲鐢ㄣ�備负浜嗚繘涓�姝ユ彁鍗囨妧鏈湇鍔¤兘鍔涳紝瀹忓崥杩滆揪鎶曞叆涓撻棬鍔涢噺鍦ㄥ墠娌挎妧鏈柟闈㈣繘琛屾帰绱紝鍦ㄤ紒涓氱鏈変簯璁$畻鍜屽ぇ鏁版嵁绛夐鍩熶笉鏂彇寰楃獊鐮淬�傞殢鐫�鏂颁竴浠d笟鍔′笌绠$悊鎶�鏈钩鍙扮殑鎺ㄥ嚭锛屾洿澧炲己浜嗗叕鍙镐负瀹㈡埛鎻愪緵楂樿川閲忋�佸叏鏂逛綅銆佹繁灞傛鏈嶅姟鐨勬妧鏈兘鍔涖�� </div> - <div>3銆佸畯鍗氳繙杈句竴鐩寸鎵库�滅敤鏅烘収涓哄鎴峰垱閫犱环鍊尖�濈殑瀹楁棬锛屾効浠モ�滆瘹淇¤礋璐b�濈殑鎬佸害鍜屼笓涓氬寲鐨勬湇鍔★紝鍦ㄤ紒涓氫俊鎭寲鍙戝睍鐨勯亾璺笂锛屼笌瀹㈡埛涓�璧锋垚闀匡紝鍏卞悓瑙佽瘉鎴愬姛锛�</div> + <div> + 3銆佸畯鍗氳繙杈句竴鐩寸鎵库�滅敤鏅烘収涓哄鎴峰垱閫犱环鍊尖�濈殑瀹楁棬锛屾効浠モ�滆瘹淇¤礋璐b�濈殑鎬佸害鍜屼笓涓氬寲鐨勬湇鍔★紝鍦ㄤ紒涓氫俊鎭寲鍙戝睍鐨勯亾璺笂锛屼笌瀹㈡埛涓�璧锋垚闀匡紝鍏卞悓瑙佽瘉鎴愬姛锛� + </div> </el-collapse-item> <el-collapse-item name="2" title="鏈嶅姟璁″垝鍒跺畾"> @@ -57,8 +59,11 @@ <span>璇存槑鏂囨。</span> <el-divider direction="vertical"/> - <span><el-link href="https://bladex.vip" target="_blank" - type="primary">https://bladex.vip</el-link></span> + <span> + <el-link href="https://bladex.vip" target="_blank" + type="primary">https://bladex.vip + </el-link> + </span> <el-divider content-position="right"><i class="el-icon-star-off"/></el-divider> </div> @@ -82,6 +87,7 @@ import 'echarts/lib/chart/pie' // 瀵煎叆鏌辩姸鍥剧粍浠� import 'echarts/lib/component/tooltip' import 'echarts/lib/component/legend' +import func from "@/util/func"; export default { name: "wel", @@ -147,10 +153,6 @@ this.getLogHandler(); }, methods: { - handleChange(val) { - window.console.log(val); - }, - getLogHandler() { this.loading = true; -- Gitblit v1.9.3