From 859a64b36d107b147f44eccd0c0a76471c5e49ea Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 15 六月 2023 18:20:39 +0800
Subject: [PATCH] 优化bug
---
Source/UBCS-WEB/src/components/Tree/attrCrud.vue | 147 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 139 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index 6f7f758..0bf7a8a 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -33,8 +33,12 @@
</template>
<!-- 缁勫悎瑙勫垯-->
<template slot="menuLeft">
- <el-button size="small" @click="isShowformulaEdit=true">缁勫悎瑙勫垯</el-button>
- <formula-editor :visible.sync="isShowformulaEdit" :systemVariableTableData="systemVariableTableData" :thisSceneTableData="thisSceneTableData"></formula-editor>
+ <el-button size="small" @click="isShowHandler">缁勫悎瑙勫垯</el-button>
+ <formula-editor :visible.sync="isShowformulaEdit"
+ :systemVariableTableData="systemVariableTableData"
+ :thisSceneTableData="thisSceneTableData"
+ @updateFormulaContent="updataFormlaContent"
+ ></formula-editor>
</template>
<!-- 楠岃瘉瑙勫垯-->
@@ -266,6 +270,7 @@
type:Boolean,
default:false
},
+
},
data() {
return {
@@ -696,20 +701,130 @@
},
{
label: "浣跨敤璇存槑",
- prop: "shiyong"
+ prop: "description"
}
]
},
//灞炴�ч獙璇佽鍒檇ata
rulesData: [
- {
- bds: "娴嬭瘯涓�",
- shiyong: "娴嬭瘯涓�"
- },
+ {bds: '[\u3000\uff01-\uff5f]+', description: '鍏ㄨ绗﹀彿'},
+ {bds: '[^\u3000\uff01-\uff5f]+', description: '鍗婅绗﹀彿'},
+ {bds: '(([-|+]{1}[\\d]+鈩冿綖[-|+]{1}[\\d]+鈩�)|鏃�)', description: '娓╁害鑼冨洿锛岀ず渚� -55鈩冿綖+125鈩�'},
+ {bds: '[\\d]{15}|[\\d]{18}|[\\d]{17}X', description: '韬唤璇佸彿鐮�(15鎴�18浣嶆暟瀛椼��17浣嶆暟瀛梄) '},
+ {bds: '鐢穦濂硘鐢锋�濂虫��', description: '涓枃鎬у埆'},
+ {bds: '[\\d]+', description: '鏁板瓧'},
+ {bds: '[a-zA-Z]+', description: '瀛楁瘝'},
+ {bds: '[A-Z]+', description: '澶у啓瀛楁瘝'},
+ {bds: '[a-z]+', description: '灏忓啓瀛楁瘝'},
+ {bds: '[0-9a-zA-Z]+', description: '瀛楁瘝銆佹暟瀛楃粍鍚�'},
+ {bds: '((0[\\d]{3}-[\\d]{7})|(0[\\d]{2}-[\\d]{8})|([\\d]{7,8}))', description: '鐢佃瘽鍙风爜'},
+ {bds: '-?[1-9]\\d*', description: '鏁存暟'},
+ {bds: '[1-9]\\d*', description: '姝ｆ暣鏁�'},
+ {bds: '-[1-9]\\d*', description: '璐熸暣鏁�'},
+ {bds: '-[1-9]\\d*|0', description: '闈炴鏁存暟(璐熸暣鏁�+0)'},
+ {bds: '[1-9]\\d*|0', description: '闈炶礋鏁存暟(姝ｆ暣鏁�+0)'},
+ {bds: '-?([1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*|0?\\.0+|0)', description: '娴偣鏁�'},
+ {bds: '[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*', description: '姝ｆ诞鐐规暟'},
+ {bds: '-[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*', description: '璐熸诞鐐规暟'},
+ {bds: '[(-([1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*))|0?\\.0+|0', description: '闈炴娴偣鏁帮紙璐熸诞鐐规暟 + 0锛�'},
+ {bds: '[1-9]\\d*\\.\\d*|0\\.\\d*[1-9]\\d*|0?\\.0+|0', description: '闈炶礋娴偣鏁帮紙姝ｆ诞鐐规暟 + 0锛�'},
+ {bds: 'x', description: '瀛楃 x'},
+ {bds: '\\\\', description: '鍙嶆枩绾垮瓧绗�'},
+ {bds: '\\0n', description: '甯︽湁鍏繘鍒跺�� 0 鐨勫瓧绗� n (0 <= n <= 7)'},
+ {bds: '\\0nn', description: '甯︽湁鍏繘鍒跺�� 0 鐨勫瓧绗� nn (0 <= n <= 7)'},
+ {bds: '\\0mnn', description: '甯︽湁鍏繘鍒跺�� 0 鐨勫瓧绗� mnn锛�0 <= m <= 3銆�0 <= n <= 7锛�'},
+ {bds: '\\xhh', description: '甯︽湁鍗佸叚杩涘埗鍊� 0x 鐨勫瓧绗� hh'},
+ {bds: '\\uhhhh', description: '甯︽湁鍗佸叚杩涘埗鍊� 0x 鐨勫瓧绗� hhhh'},
+ {bds: '\\t', description: '鍒惰〃绗� (\'\u0009\')'},
+ {bds: '\\n', description: '鏂拌锛堟崲琛岋級绗� (\'\u000A\')'},
+ {bds: '\\r', description: '鍥炶溅绗� (\'\u000D\')'},
+ {bds: '\\f', description: '鎹㈤〉绗� (\'\u000C\')'},
+ {bds: '\\a', description: '鎶ヨ (bell) 绗� (\'\u0007\')'},
+ {bds: '\\e', description: '杞箟绗� (\'\u001B\')'},
+ {bds: '\\cx', description: '瀵瑰簲浜� x 鐨勬帶鍒剁'},
+ {bds: '[abc]', description: 'a銆乥 鎴� c锛堢畝鍗曠被锛�'},
+ {bds: '[^abc]', description: '浠讳綍瀛楃锛岄櫎浜� a銆乥 鎴� c锛堝惁瀹氾級'},
+ {bds: '[a-zA-Z]', description: 'a 鍒� z 鎴� A 鍒� Z锛屼袱澶寸殑瀛楁瘝鍖呮嫭鍦ㄥ唴锛堣寖鍥达級'},
+ {bds: '[a-d[m-p]]', description: 'a 鍒� d 鎴� m 鍒� p锛歔a-dm-p]锛堝苟闆嗭級'},
+ {bds: '[a-z&&[def]]', description: '\td銆乪 鎴� f锛堜氦闆嗭級'},
+ {bds: '[a-z&&[^bc]]', description: 'a 鍒� z锛岄櫎浜� b 鍜� c锛歔ad-z]锛堝噺鍘伙級'},
+ {bds: '[a-z&&[^m-p]]', description: 'a 鍒� z锛岃�岄潪 m 鍒� p锛歔a-lq-z]锛堝噺鍘伙級'},
+ {bds: '.', description: '浠讳綍瀛楃锛堜笌琛岀粨鏉熺鍙兘鍖归厤涔熷彲鑳戒笉鍖归厤锛�'},
+ {bds: '\\d', description: '鏁板瓧锛歔0-9]'},
+ {bds: '\\D', description: '闈炴暟瀛楋細 [^0-9]'},
+ {bds: '\\s', description: '绌虹櫧瀛楃锛歔 \\t\\n\x0B\\f\\r]'},
+ {bds: '\\S', description: '闈炵┖鐧藉瓧绗︼細[^\\s]'},
+ {bds: '\\w', description: '鍗曡瘝瀛楃锛歔a-zA-Z_0-9]'},
+ {bds: '\\W', description: '闈炲崟璇嶅瓧绗︼細[^\\w]'},
+ {bds: '\\p{Lower}', description: '灏忓啓瀛楁瘝瀛楃锛歔a-z]'},
+ {bds: '\\p{Upper}', description: '澶у啓瀛楁瘝瀛楃锛歔A-Z]'},
+ {bds: '\\p{ASCII}', description: '鎵�鏈� ASCII锛歔\x00-\x7F]'},
+ {bds: '\\p{Alpha}', description: '瀛楁瘝瀛楃锛歔\\p{Lower}\\p{Upper}]'},
+ {bds: '\\p{Digit}', description: '鍗佽繘鍒舵暟瀛楋細[0-9]'},
+ {bds: '\\p{Alnum}', description: '瀛楁瘝鏁板瓧瀛楃锛歔\\p{Alpha}\\p{Digit}]'},
+ {bds: '\\p{Punct}', description: '鏍囩偣绗﹀彿锛�!"#$%&\'()*+,-./:;<=>?@[\\]^_`{|}~'},
+ {bds: '\\p{Graph}', description: '鍙瀛楃锛歔\\p{Alnum}\\p{Punct}]'},
+ {bds: '\\p{Print}', description: '鍙墦鍗板瓧绗︼細[\\p{Graph}\x20]'},
+ {bds: '\\p{Blank}', description: '绌烘牸鎴栧埗琛ㄧ锛歔 \\t]'},
+ {bds: '\\p{Cntrl}', description: '鎺у埗瀛楃锛歔\x00-\x1F\x7F]'},
+ {bds: '\\p{XDigit}', description: '鍗佸叚杩涘埗鏁板瓧锛歔0-9a-fA-F]'},
+ {bds: '\\p{Space}', description: '绌虹櫧瀛楃锛歔 \\t\\n\x0B\\f\\r]'},
+ {bds: '\\p{javaLowerCase}', description: '绛夋晥浜� java.lang.Character.isLowerCase()'},
+ {bds: '\\p{javaUpperCase}', description: '绛夋晥浜� java.lang.Character.isUpperCase()'},
+ {bds: '\\p{javaWhitespace}', description: '绛夋晥浜� java.lang.Character.isWhitespace()'},
+ {bds: '\\p{javaMirrored}', description: '绛夋晥浜� java.lang.Character.isMirrored()'},
+ {bds: '\\p{InGreek}', description: 'Greek 鍧楋紙绠�鍗曞潡锛変腑鐨勫瓧绗�'},
+ {bds: '\\p{Lu}', description: '澶у啓瀛楁瘝锛堢畝鍗曠被鍒級'},
+ {bds: '\\p{Sc}', description: '璐у竵绗﹀彿'},
+ {bds: '\\P{InGreek}', description: '鎵�鏈夊瓧绗︼紝Greek 鍧椾腑鐨勯櫎澶栵紙鍚﹀畾锛�'},
+ {bds: '[\\p{L}&&[^\\p{Lu}]]', description: '鎵�鏈夊瓧姣嶏紝澶у啓瀛楁瘝闄ゅ锛堝噺鍘伙級'},
+ {bds: '^', description: '琛岀殑寮�澶�'},
+ {bds: '$', description: '琛岀殑缁撳熬'},
+ {bds: '\\b', description: '鍗曡瘝杈圭晫'},
+ {bds: '\\B', description: '闈炲崟璇嶈竟鐣�'},
+ {bds: '\\A', description: '杈撳叆鐨勫紑澶�'},
+ {bds: '\\G', description: '涓婁竴涓尮閰嶇殑缁撳熬'},
+ {bds: '\\Z', description: '杈撳叆鐨勭粨灏撅紝浠呯敤浜庢渶鍚庣殑缁撴潫绗︼紙濡傛灉鏈夌殑璇濓級'},
+ {bds: '\\z', description: '杈撳叆鐨勭粨灏�'},
+ {bds: 'X ?', description: 'X锛屼竴娆℃垨涓�娆′篃娌℃湁'},
+ {bds: 'X *', description: 'X锛岄浂娆℃垨澶氭'},
+ {bds: 'X +', description: 'X锛屼竴娆℃垨澶氭'},
+ {bds: 'X {n }', description: 'X锛屾伆濂� n 娆�'},
+ {bds: 'X {n ,}', description: 'X锛岃嚦灏� n 娆�'},
+ {bds: 'X {n ,m }', description: 'X锛岃嚦灏� n 娆★紝浣嗘槸涓嶈秴杩� m 娆�'},
+ {bds: 'X ??', description: 'X锛屼竴娆℃垨涓�娆′篃娌℃湁'},
+ {bds: 'X *?', description: 'X锛岄浂娆℃垨澶氭'},
+ {bds: 'X +?', description: 'X锛屼竴娆℃垨澶氭'},
+ {bds: 'X {n }?', description: 'X锛屾伆濂� n 娆�'},
+ {bds: 'X {n ,}?', description: 'X锛岃嚦灏� n 娆�'},
+ {bds: 'X {n ,m }?', description: 'X锛岃嚦灏� n 娆★紝浣嗘槸涓嶈秴杩� m 娆�'},
+ {bds: 'X ?+', description: 'X锛屼竴娆℃垨涓�娆′篃娌℃湁'},
+ {bds: 'X *+', description: 'X锛岄浂娆℃垨澶氭'},
+ {bds: 'X ++', description: 'X锛屼竴娆℃垨澶氭'},
+ {bds: 'X {n }+', description: 'X锛屾伆濂� n 娆�'},
+ {bds: 'X {n ,}+', description: 'X锛岃嚦灏� n 娆�'},
+ {bds: 'X {n ,m }+', description: 'X锛岃嚦灏� n 娆★紝浣嗘槸涓嶈秴杩� m 娆�'},
+ {bds: 'XY', description: 'X 鍚庤窡 Y'},
+ {bds: 'X |Y', description: 'X 鎴� Y'},
+ {bds: '(X )', description: 'X锛屼綔涓烘崟鑾风粍'},
+ {bds: '\\n', description: '浠讳綍鍖归厤鐨� n<sup>th</sup> 鎹曡幏缁�'},
+ {bds: '\\', description: 'Nothing锛屼絾鏄紩鐢ㄤ互涓嬪瓧绗�'},
+ {bds: '\\Q', description: 'Nothing锛屼絾鏄紩鐢ㄦ墍鏈夊瓧绗︼紝鐩村埌 \\E'},
+ {bds: '\\E', description: 'Nothing锛屼絾鏄粨鏉熶粠 \\Q 寮�濮嬬殑寮曠敤'},
+ {bds: '(?:X )', description: 'X锛屼綔涓洪潪鎹曡幏缁�'},
+ {bds: '(?idmsux-idmsux)', description: 'Nothing锛屼絾鏄皢鍖归厤鏍囧織鐢� on 杞负 off'},
+ {bds: '(?idmsux-idmsux:X )', description: 'X锛屼綔涓哄甫鏈夌粰瀹氭爣蹇� on - off 鐨勯潪鎹曡幏缁�'},
+ {bds: '(?=X )', description: 'X锛岄�氳繃闆跺搴︾殑姝� lookahead'},
+ {bds: '(?!X )', description: 'X锛岄�氳繃闆跺搴︾殑璐� lookahead'},
+ {bds: '(?<=X )', description: 'X锛岄�氳繃闆跺搴︾殑姝� lookbehind'},
+ {bds: '(?<!X )', description: 'X锛岄�氳繃闆跺搴︾殑璐� lookbehind'},
+ {bds: '(?>X )', description: 'X锛屼綔涓虹嫭绔嬬殑闈炴崟鑾风粍'}
],
// 鏂板涓氬姟绫诲瀷
businessData: [],
businessOption: {
+ indexClassName:"搴忓彿",
+ indexLabelClassName:'搴忓彿',
index: true,
border: true,
addBtn: false,
@@ -1178,7 +1293,9 @@
},
//楠岃瘉瑙勫垯妫�鏌�
rulesExamine() {
-
+ if(this.RulesForm.expressionText.test(this.RulesForm.TestContent)){
+ this.$message.success('鏍￠獙鎴愬姛')
+ }
},
//鐐瑰嚮鍒嗙被娉ㄥ叆鎸夐挳
injectBtn(){
@@ -1273,6 +1390,16 @@
// console.log(res)
// })
},
+ //缁勫悎瑙勫垯
+ isShowHandler(){
+ if(this.CrudSelect.length>1){
+ this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉垮睘鎬ф暟鎹�')
+ }else if(this.CrudSelect.length<1){
+ this.$message.warning('璇烽�夋嫨涓�鏉℃ā鏉垮睘鎬ф暟鎹�')
+ }else if(this.CrudSelect.length === 1){
+ this.isShowformulaEdit=true;
+ }
+ },
//鍏ㄥ睆缂栬緫
fullscreenHandle(){
if(this.crudArray.length<1){
@@ -1290,6 +1417,10 @@
this.attrEditVisible=false;
console.log(this.attrEditVisible)
},
+ updataFormlaContent(val){
+ console.log(val)
+ this.$set(this.attrRow,'componentRule',val)
+ },
// 鎺掑簭
sortChange(val) {
console.log(val)
--
Gitblit v1.9.3