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

Merge branch 'lwx_v1'

yjf_v1
超级管理员 1 year ago
parent
d61ee7dbf9 a3551a07ee
commit
691a4d093a
5 changed files with 41 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      src/components/DesignForm/formControlAttr.vue
  2. 21
      src/components/DesignForm/formControlPropertiNew.vue
  3. 3
      src/components/DesignForm/public/form/form.vue
  4. 13
      src/widget/associatedforms/associatedFormsTinyace.vue
  5. 9
      src/widget/associatedforms/associatedFormsTinyaceRange.vue

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

@ -1883,7 +1883,7 @@ const treeDefaultProps = {
label: 'label',
}
//拿到子组件AssociatedFormsTinyace的实例
let aft = ref();
const aft = ref();
const aftRange = ref();
function getAssociatedFormsCurrentFieldTree() {
@ -3159,7 +3159,7 @@ const disabledIstrue = (val:string) => {
</el-form-item>
</div>
</div>
<div v-if="showHide(['switch'],true)&&controlData.config.optionsType==0">
<div v-if="showHide(['switch'],true)">
<el-button @click="handelGlxxszDialogSwitch">关联选项设置</el-button>
</div>
<div v-if="showHide(['radio','select',],true)&&controlData.config.optionsType==0">
@ -3858,17 +3858,19 @@ const disabledIstrue = (val:string) => {
</el-aside>
<el-main style="border: 1px solid gainsboro; padding: 3px;" class="associatedFormsHideDialogMain">
<div style="border: 1px solid gainsboro; height: 7%; border-bottom: 0px; padding-top: 3px; padding-left: 5px; background-color: #E6F3FE;">当满足以下条件时此控件隐藏</div>
<div id="associatedFormsHideEditArea" style="border: 1px solid gainsboro; height: 63%; border-bottom: 0px;">
<div id="associatedFormsHideEditArea" style="border: 1px solid gainsboro; height: 43%; border-bottom: 0px;">
<AssociatedFormsTinyace ref="aft" :aft-text="controlData.control.hideConditionHtml" :aft-text-copy = "controlData.control.hideConditionHtmlCopy" @text-change = "aftTextChanged" @gongshi-change = "aftGongshiChanged"></AssociatedFormsTinyace>
<!-- <div style="border: 1px solid #4189EF;width:90px;height:26px;border-radius: 3px;padding:2px;text-align: center;cursor:pointer;float: right;margin-top: -32px;margin-right: 5px;z-index:99999999;position: relative;">
<span style="color: #4189EF;font:6px;margin-right: 5px;">fx</span>插入函数
</div> -->
</div>
<div style="border: 1px solid gainsboro; height: 30%; padding-top: 20px;">
<div style="border: 1px solid gainsboro; height: 50%; padding-top: 20px;">
<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>参考场景：</li>
<span style="margin-left: 14px;">年龄控件输入的值大于10时，需要隐藏当前控件，则可将隐藏条件设置为：年龄>10</span>
</ul>
@ -3968,17 +3970,19 @@ const disabledIstrue = (val:string) => {
</el-aside>
<el-main style="border: 1px solid gainsboro; padding: 3px;" class="associatedFormsHideDialogMain">
<div style="border: 1px solid gainsboro; height: 7%; border-bottom: 0px; padding-top: 3px; padding-left: 5px; background-color: #E6F3FE;">仅可选择符合以下条件的数据</div>
<div id="associatedFormsHideEditArea" style="border: 1px solid gainsboro; height: 63%; border-bottom: 0px;">
<div id="associatedFormsHideEditArea" style="border: 1px solid gainsboro; height: 43%; border-bottom: 0px;">
<AssociatedFormsTinyaceRange ref="aftRange" :aft-text="controlData.control.dataRangeConditionHtml" :aft-text-copy = "controlData.control.dataRangeConditionHtmlCopy" @text-change = "aftTextChangedRange" @gongshi-change = "aftGongshiChangedRange"></AssociatedFormsTinyaceRange>
<!-- <div style="border: 1px solid #4189EF;width:90px;height:26px;border-radius: 3px;padding:2px;text-align: center;cursor:pointer;float: right;margin-top: -32px;margin-right: 5px;z-index:99999999;position: relative;">
<span style="color: #4189EF;font:6px;margin-right: 5px;">fx</span>插入函数
</div> -->
</div>
<div style="border: 1px solid gainsboro; height: 30%; padding-top: 20px;">
<div style="border: 1px solid gainsboro; height: 50%; padding-top: 20px;">
<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>参考场景：</li>
<span style="margin-left: 14px;">仅可选择关联表单中年龄大于10的数据，则可将数据范围设置为：年龄>10</span>
</ul>

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

@ -1925,7 +1925,7 @@ const treeDefaultProps = {
label: 'label',
}
//拿到子组件AssociatedFormsTinyace的实例
let aft = ref();
const aft = ref();
const aftRange = ref();
function getAssociatedFormsCurrentFieldTree() {
@ -2354,6 +2354,7 @@ let determineRange = ref(true)
watch(associatedFormsHideDialogFlag, (val) => {
if(val===true&&determine.value===false){
setTimeout(() => {
//alert(1)
aft.value.tinymceReInit()
}, 200);
}
@ -2362,6 +2363,7 @@ watch(associatedFormsHideDialogFlag, (val) => {
watch(associatedFormsDataRangeDialogFlag, (val) => {
if(val===true&&determineRange.value===false){
setTimeout(() => {
//alert(2)
aftRange.value.tinymceReInit()
}, 200);
}
@ -2406,6 +2408,8 @@ watch(()=>store.activeKey, () => {
setTimeout(() => {
formidChanged()
}, 800);
/* aft.value.tinymceReInit()
aftRange.value.tinymceReInit() */
}else if(controlData.value.type==='radio'||controlData.value.type==='select'||controlData.value.type==='checkbox'){
setTimeout(() => {
@ -3207,7 +3211,8 @@ const disabledIstrue = (val:string) => {
</el-form-item>
</div>
</div>
<div v-if="showHide(['switch'],true)&&controlData.config.optionsType==0">
<!-- {{controlData.config.optionsType}} -->
<div v-if="showHide(['switch'],true)">
<el-button @click="handelGlxxszDialogSwitch">关联选项设置</el-button>
</div>
<div v-if="showHide(['radio','select',],true)&&controlData.config.optionsType==0">
@ -3907,17 +3912,19 @@ const disabledIstrue = (val:string) => {
</el-aside>
<el-main style="border: 1px solid gainsboro; padding: 3px;" class="associatedFormsHideDialogMain">
<div style="border: 1px solid gainsboro; height: 7%; border-bottom: 0px; padding-top: 3px; padding-left: 5px; background-color: #E6F3FE;">当满足以下条件时此控件隐藏</div>
<div id="associatedFormsHideEditArea" style="border: 1px solid gainsboro; height: 63%; border-bottom: 0px;">
<div id="associatedFormsHideEditArea" style="border: 1px solid gainsboro; height: 43%; border-bottom: 0px;">
<AssociatedFormsTinyace ref="aft" :aft-text="controlData.control.hideConditionHtml" :aft-text-copy = "controlData.control.hideConditionHtmlCopy" @text-change = "aftTextChanged" @gongshi-change = "aftGongshiChanged"></AssociatedFormsTinyace>
<!-- <div style="border: 1px solid #4189EF;width:90px;height:26px;border-radius: 3px;padding:2px;text-align: center;cursor:pointer;float: right;margin-top: -32px;margin-right: 5px;z-index:99999999;position: relative;">
<span style="color: #4189EF;font:6px;margin-right: 5px;">fx</span>插入函数
</div> -->
</div>
<div style="border: 1px solid gainsboro; height: 30%; padding-top: 20px;">
<div style="border: 1px solid gainsboro; height: 50%; padding-top: 20px;">
<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>参考场景：</li>
<span style="margin-left: 14px;">年龄控件输入的值大于10时，需要隐藏当前控件，则可将隐藏条件设置为：年龄>10</span>
</ul>
@ -4017,17 +4024,19 @@ const disabledIstrue = (val:string) => {
</el-aside>
<el-main style="border: 1px solid gainsboro; padding: 3px;" class="associatedFormsHideDialogMain">
<div style="border: 1px solid gainsboro; height: 7%; border-bottom: 0px; padding-top: 3px; padding-left: 5px; background-color: #E6F3FE;">仅可选择符合以下条件的数据</div>
<div id="associatedFormsHideEditArea" style="border: 1px solid gainsboro; height: 63%; border-bottom: 0px;">
<div id="associatedFormsHideEditArea" style="border: 1px solid gainsboro; height: 43%; border-bottom: 0px;">
<AssociatedFormsTinyaceRange ref="aftRange" :aft-text="controlData.control.dataRangeConditionHtml" :aft-text-copy = "controlData.control.dataRangeConditionHtmlCopy" @text-change = "aftTextChangedRange" @gongshi-change = "aftGongshiChangedRange"></AssociatedFormsTinyaceRange>
<!-- <div style="border: 1px solid #4189EF;width:90px;height:26px;border-radius: 3px;padding:2px;text-align: center;cursor:pointer;float: right;margin-top: -32px;margin-right: 5px;z-index:99999999;position: relative;">
<span style="color: #4189EF;font:6px;margin-right: 5px;">fx</span>插入函数
</div> -->
</div>
<div style="border: 1px solid gainsboro; height: 30%; padding-top: 20px;">
<div style="border: 1px solid gainsboro; height: 50%; padding-top: 20px;">
<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>参考场景：</li>
<span style="margin-left: 14px;">仅可选择关联表单中年龄大于10的数据，则可将数据范围设置为：年龄>10</span>
</ul>

3
src/components/DesignForm/public/form/form.vue
View File

@ -401,7 +401,8 @@ const recursionToGetFinallyHideFields = (hideFieldArr: any[],radioSelectArr3: st
//编辑表单页不隐藏任何字段。
if(formProps.value.type!=5){
props.formData.config.hideField?.push(...hideFieldArr)
console.log(hideFieldArr)
props.formData.config.hideField?.push(...hideFieldArr)//实际造成隐藏效果
}
});

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

@ -18,7 +18,7 @@ const tinymceInit = {
language_url: "/tinymce/langs/zh-Hans.js", // 引入语言包（该语言包在public下，注意文件名称）
language: "zh-Hans", // 这里名称根据 zh-Hans.js 里面写的名称而定
skin_url: "/tinymce/skins/ui/oxide", // 这里引入的样式
height: 260, // 限制高度
height: 174, // 限制高度
statusbar:false,
toolbar:false,
branding: false, //是否禁用“Powered by TinyMCE”
@ -85,9 +85,11 @@ watch(()=>tinymceHtml.value, (val:any) => {
errorCondition("条件不能以蓝色块结尾")
}else if(countSpanTags(gongShi.formulaHtml)>1){
errorCondition("不允许出现多个蓝色块")
}else if(!containsSingleComparator(gongShi.mathsFormula)){
errorCondition("不存在有效符号")
}else if(checkEnding(gongShi.mathsFormula)){
}else if(!containsSingleComparator(gongShi.mathsFormula)&&!gongShi.mathsFormula.includes("包含")){
errorCondition("不存在有效符号")
}else if(checkEnding(gongShi.mathsFormula)){
errorCondition("不能以符号为结尾")
}else{
succCondition()
@ -189,9 +191,10 @@ const handelCancel = (associatedFormsHideDialogTextCopy:any) =>{
tinymceHtml.value = associatedFormsHideDialogTextCopy
}
const tinymceReInit = ()=>{
//console.log(props.aftTextCopy)
let str:string = props.aftTextCopy
tinymceHtml.value = props.aftTextCopy
}
const focusEditor = ()=>{
tinymce.EditorManager.get(onlyNumber)?.focus(true)

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

@ -17,7 +17,7 @@ const tinymceInit = {
language_url: "/tinymce/langs/zh-Hans.js", // 引入语言包（该语言包在public下，注意文件名称）
language: "zh-Hans", // 这里名称根据 zh-Hans.js 里面写的名称而定
skin_url: "/tinymce/skins/ui/oxide", // 这里引入的样式
height: 260, // 限制高度
height: 174, // 限制高度
statusbar:false,
toolbar:false,
branding: false, //是否禁用“Powered by TinyMCE”
@ -84,8 +84,10 @@ watch(()=>tinymceHtml.value, (val:any) => {
errorCondition("条件不能以蓝色块结尾")
}else if(countSpanTags(gongShi.formulaHtml)>1){
errorCondition("不允许出现多个蓝色块")
}else if(!containsSingleComparator(gongShi.mathsFormula)){
}else if(!containsSingleComparator(gongShi.mathsFormula)&&!gongShi.mathsFormula.includes("包含")){
errorCondition("不存在有效符号")
}else if(checkEnding(gongShi.mathsFormula)){
errorCondition("不能以符号为结尾")
}else{
@ -187,9 +189,10 @@ const handelCancel = (associatedFormsHideDialogTextCopy:any) =>{
tinymceHtml.value = associatedFormsHideDialogTextCopy
}
const tinymceReInit = ()=>{
//console.log(props.aftTextCopy)
let str:string = props.aftTextCopy
tinymceHtml.value = props.aftTextCopy
}
const focusEditor = ()=>{

Write Preview
Loading…
Cancel
Save