herenshan112
/
ShutongInterconnectedChemicalCloudPlatform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

关联表但条件设置帮助描述优化

lwx_v3
liwenxuan 1 year ago
parent
e9af798abf
commit
f59c918c04
4 changed files with 21 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/components/DesignForm/formControlAttr.vue
  2. 13
      src/components/DesignForm/formControlPropertiNew.vue
  3. 4
      src/widget/associatedforms/associatedFormsTinyace.vue
  4. 4
      src/widget/associatedforms/associatedFormsTinyaceRange.vue

20
src/components/DesignForm/formControlAttr.vue
View File

@ -3868,11 +3868,11 @@ const disabledIstrue = (val:string) => {
<div style="border: 1px solid gainsboro; height: 50%; padding-top: 20px;"> <div style="border: 1px solid gainsboro; height: 50%; padding-top: 20px;">
<ul> <ul>
<li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li> <li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li>
<li>支持<span style="color: red">英文</span>模式下运算符<!-- （+、-、*、/、>、<、==、） --></li> <li>支持的符号：<span style="color: red">'==', '>=', '>', '<=', '<', '!='</span></li>
<li>支持<span style="color: red">"包含"</span>关键字,用于组织机构条件</li> <li>支持<span style="color: red">"包含,不包含,当前用户"</span>关键字,用于组织机构条件和角色条件</li>
<li>支持<span style="color: red">"当前用户"</span>关键字,用于角色条件</li> <li>参考举例：</li>
<li>参考场景：</li> <span style="margin-left: 14px;">年龄>10</span><br>
<span style="margin-left: 14px;">年龄控件输入的值大于10时，需要隐藏当前控件，则可将隐藏条件设置为：年龄>10</span> <span style="margin-left: 14px;">企管部包含当前用户</span>
</ul> </ul>
</div> </div>
</el-main> </el-main>
@ -3980,11 +3980,11 @@ const disabledIstrue = (val:string) => {
<div style="border: 1px solid gainsboro; height: 50%; padding-top: 20px;"> <div style="border: 1px solid gainsboro; height: 50%; padding-top: 20px;">
<ul> <ul>
<li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li> <li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li>
<li>支持<span style="color: red">英文</span>模式下运算符<!-- （+、-、*、/、>、<、==、） --></li> <li>支持的符号：<span style="color: red">'==', '>=', '>', '<=', '<', '!='</span></li>
<li>支持<span style="color: red">"包含"</span>关键字,用于组织机构条件</li> <li>支持<span style="color: red">"包含,不包含,当前用户"</span>关键字,用于组织机构条件和角色条件</li>
<li>支持<span style="color: red">"当前用户"</span>关键字,用于角色条件</li> <li>参考举例：</li>
<li>参考场景：</li> <span style="margin-left: 14px;">年龄>10</span><br>
<span style="margin-left: 14px;">仅可选择关联表单中年龄大于10的数据，则可将数据范围设置为：年龄>10</span> <span style="margin-left: 14px;">企管部包含当前用户</span>
</ul> </ul>
</div> </div>
</el-main> </el-main>

13
src/components/DesignForm/formControlPropertiNew.vue
View File

@ -3923,11 +3923,11 @@ const disabledIstrue = (val:string) => {
<div style="border: 1px solid gainsboro; height: 50%; padding-top: 20px;"> <div style="border: 1px solid gainsboro; height: 50%; padding-top: 20px;">
<ul> <ul>
<li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li> <li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li>
<li>支持<span style="color: red">英文</span>模式下运算符<!-- （+、-、*、/、>、<、==、） --></li> <li>支持的符号：<span style="color: red">'==', '>=', '>', '<=', '<', '!='</span></li>
<li>支持<span style="color: red">"包含"</span>关键字,用于组织机构条件</li> <li>支持<span style="color: red">"包含,不包含,当前用户"</span>关键字,用于组织机构条件和角色条件</li>
<li>支持<span style="color: red">"当前用户"</span>关键字,用于角色条件</li> <li>参考举例：</li>
<li>参考场景：</li> <span style="margin-left: 14px;">年龄>10</span><br>
<span style="margin-left: 14px;">年龄控件输入的值大于10时，需要隐藏当前控件，则可将隐藏条件设置为：年龄>10</span> <span style="margin-left: 14px;">企管部包含当前用户</span>
</ul> </ul>
</div> </div>
</el-main> </el-main>
@ -4036,7 +4036,8 @@ const disabledIstrue = (val:string) => {
<ul> <ul>
<li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li> <li>请从左侧面板<span style="color: red">右击</span>选择字段或选项</li>
<li>支持<span style="color: red">英文</span>模式下运算符<!-- （+、-、*、/、>、<、==、） --></li> <li>支持<span style="color: red">英文</span>模式下运算符<!-- （+、-、*、/、>、<、==、） --></li>
<li>支持<span style="color: red">"包含"</span>关键字,用于组织机构条件</li>
<li>支持<span style="color: red">"包含,不包含"</span>关键字,用于组织机构条件和角色条件</li>
<li>支持<span style="color: red">"当前用户"</span>关键字,用于角色条件</li> <li>支持<span style="color: red">"当前用户"</span>关键字,用于角色条件</li>
<li>参考场景：</li> <li>参考场景：</li>
<span style="margin-left: 14px;">仅可选择关联表单中年龄大于10的数据，则可将数据范围设置为：年龄>10</span> <span style="margin-left: 14px;">仅可选择关联表单中年龄大于10的数据，则可将数据范围设置为：年龄>10</span>

4
src/widget/associatedforms/associatedFormsTinyace.vue
View File

@ -85,7 +85,7 @@ watch(()=>tinymceHtml.value, (val:any) => {
errorCondition("条件不能以蓝色块结尾") errorCondition("条件不能以蓝色块结尾")
}else if(countSpanTags(gongShi.formulaHtml)>1){ }else if(countSpanTags(gongShi.formulaHtml)>1){
errorCondition("不允许出现多个蓝色块") errorCondition("不允许出现多个蓝色块")
}else if(!containsSingleComparator(gongShi.mathsFormula)&&!gongShi.mathsFormula.includes("包含")){ }else if(!containsSingleComparator(gongShi.mathsFormula)&&!gongShi.mathsFormula.includes("包含")&&!gongShi.mathsFormula.includes("不包含")){
errorCondition("不存在有效符号") errorCondition("不存在有效符号")
@ -100,7 +100,7 @@ watch(()=>tinymceHtml.value, (val:any) => {
{ deep: true } { deep: true }
) )
function checkEnding(str: string) { function checkEnding(str: string) {
const symbols = ['==', '>=', '>', '<=', '<', '!=', '=']; const symbols = ['==', '>=', '>', '<=', '<', '!=', '=','包含','不包含'];
const trimmedStr = str.trim(); const trimmedStr = str.trim();
for (let symbol of symbols) { for (let symbol of symbols) {
if (trimmedStr.endsWith(symbol)) { if (trimmedStr.endsWith(symbol)) {

4
src/widget/associatedforms/associatedFormsTinyaceRange.vue
View File

@ -84,7 +84,7 @@ watch(()=>tinymceHtml.value, (val:any) => {
errorCondition("条件不能以蓝色块结尾") errorCondition("条件不能以蓝色块结尾")
}else if(countSpanTags(gongShi.formulaHtml)>1){ }else if(countSpanTags(gongShi.formulaHtml)>1){
errorCondition("不允许出现多个蓝色块") errorCondition("不允许出现多个蓝色块")
}else if(!containsSingleComparator(gongShi.mathsFormula)&&!gongShi.mathsFormula.includes("包含")){ }else if(!containsSingleComparator(gongShi.mathsFormula)&&!gongShi.mathsFormula.includes("包含")&&!gongShi.mathsFormula.includes("不包含")){
errorCondition("不存在有效符号") errorCondition("不存在有效符号")
@ -126,7 +126,7 @@ function containsSingleComparator(str: string) {
return found; return found;
} }
function checkEnding(str: string) { function checkEnding(str: string) {
const symbols = ['==', '>=', '>', '<=', '<', '!=', '=']; const symbols = ['==', '>=', '>', '<=', '<', '!=', '=','包含','不包含'];
const trimmedStr = str.trim(); const trimmedStr = str.trim();
for (let symbol of symbols) { for (let symbol of symbols) {
if (trimmedStr.endsWith(symbol)) { if (trimmedStr.endsWith(symbol)) {

Write Preview
Loading…
Cancel
Save