Browse Source

穿梭框编辑固定选项时,修改的节点无法立即预览到,需保存后退出重进才能预览到修改后的----bug

lwx_v11
liwenxuan 1 year ago
parent
commit
093db03ab3
  1. 14
      src/components/DesignForm/formControlPropertiNew.vue
  2. 9
      src/widget/lowcodetransfer/index.vue
  3. 234
      src/widget/lowcodetransfer/lowcodeTransfer.vue

14
src/components/DesignForm/formControlPropertiNew.vue

@ -1261,26 +1261,20 @@ const getPropByPath = (obj: any, path: string, val: any) => {
} }
// //
const showAssociatedFormsFillRole = ref(true)
//----bug
const saveRefreshFormControlAttr = () => {
//
//----bug
//穿退----bug
//setTimeout(() => { const showAssociatedFormsFillRole = ref(true)
const saveRefreshFormControlAttr = () => {
getAssociatedFormsCurrentFieldTree1() getAssociatedFormsCurrentFieldTree1()
showAssociatedFormsFillRole.value = false; showAssociatedFormsFillRole.value = false;
// //
setTimeout(() => { setTimeout(() => {
showAssociatedFormsFillRole.value = true; showAssociatedFormsFillRole.value = true;
}, 200); }, 200);
//}, 13000);
}; };
// //

9
src/widget/lowcodetransfer/index.vue

@ -14,7 +14,7 @@
<input v-model="value" type="hidden" > <input v-model="value" type="hidden" >
</el-form-item> </el-form-item>
<LowcodeTransfer :data="props.data" :selected-value="value" @checked-id-list-changed="checkedIdListChangedIndex" @update-model="updateModel" ></LowcodeTransfer> <LowcodeTransfer :key="componentKey" :data="props.data" :selected-value="value" @checked-id-list-changed="checkedIdListChangedIndex" @update-model="updateModel" @re-render-component="reRenderComponent"></LowcodeTransfer>
</template> </template>
<script lang='ts' setup> <script lang='ts' setup>
import LowcodeTransfer from './lowcodeTransfer.vue'; import LowcodeTransfer from './lowcodeTransfer.vue';
@ -89,6 +89,13 @@ const value = computed({
updateModel(newVal) updateModel(newVal)
} }
}) })
let componentKey = 0
function reRenderComponent() {
componentKey++;
}
function waitModelHasValue(){ function waitModelHasValue(){
//console.log("waitModelHasValue") //console.log("waitModelHasValue")
setTimeout(()=>{ setTimeout(()=>{

234
src/widget/lowcodetransfer/lowcodeTransfer.vue

@ -1,4 +1,8 @@
<template> <template>
<!-- {{ props.data?.control.fixedOptions }} --><!-- {{transferConfig}} --><!-- {{ resData }} --><!-- {{ count1 }} -->
<!-- <hr>
<hr>
<hr> -->
<div v-if="dataFinished" class="transfer"><!-- {{props.selectedValue}} --> <div v-if="dataFinished" class="transfer"><!-- {{props.selectedValue}} -->
<div class="leftArea"><!-- {{ selectedValueCompu }}{{checkedIdList}} --> <div class="leftArea"><!-- {{ selectedValueCompu }}{{checkedIdList}} -->
<div class="transferName">{{ transferConfig.transferName }}</div> <div class="transferName">{{ transferConfig.transferName }}</div>
@ -13,23 +17,26 @@
</div> </div>
<div class="leftScroll"> <div class="leftScroll">
<ElScrollbar height="100%"> <ElScrollbar height="100%">
<ElTree <ElTree ref="treeRef" node-key="id" empty-text="暂无数据" :data="userList" :props="treeProps"
ref="treeRef" node-key="id" empty-text="暂无数据" :data="userList" :props="treeProps" show-checkbox show-checkbox highlight-current :default-expand-all="isExpandAll"
highlight-current :default-expand-all="isExpandAll" :filter-node-method="filterNode" :filter-node-method="filterNode" @check="handleCheckList" @check-change="getCheckedList" />
@check="handleCheckList" @check-change="getCheckedList" />
</ElScrollbar> </ElScrollbar>
</div> </div>
</div> </div>
<div class="rigthArea"> <div class="rigthArea">
<div style="margin-bottom: 8px;"> <div style="margin-bottom: 8px;">
<div class="transferName"><span>已选: {{ checkList.length }}</span><ElButton link style="float: right;margin-right: 5px;" @click="clearCheckList" >清空</ElButton></div> <div class="transferName"><span>已选: {{ checkList.length }}</span>
<ElButton link style="float: right;margin-right: 5px;" @click="clearCheckList">清空</ElButton>
</div>
</div> </div>
<ElScrollbar height="calc(100% - 50px)"> <ElScrollbar height="calc(100% - 50px)">
<ElTag v-for="user in checkList" :key="user.id" style="display: block; font-size: 13px; letter-spacing: 1.5px;text-align: center;margin-top: 8px;height: 30px;width: 75%;margin-left:40px;padding-top: 6px;" closable @close="handleCloseTag(user)"> <ElTag v-for="user in checkList" :key="user.id"
style="display: block; font-size: 13px; letter-spacing: 1.5px;text-align: center;margin-top: 8px;height: 30px;width: 75%;margin-left:40px;padding-top: 6px;"
closable @close="handleCloseTag(user)">
{{ {{
user.label user.label
}}[{{ }}[{{
@ -64,41 +71,77 @@ const props = defineProps({
}) })
const emits = defineEmits(['checkedIdListChanged','updateModel']); const emits = defineEmits(['checkedIdListChanged', 'updateModel','reRenderComponent']);
const fixedOptions = props.data?.control.fixedOptions /* const fixedOptions = ref([]) */
const transferConfig = props.data?.config /* fixedOptions.value = props.data?.control.fixedOptions */
//const transferConfig = props.data?.config
const transferConfig = computed({
set(){
},
get(){
return props.data?.config
}
})
const treeProps = { const treeProps = {
value: 'id', value: 'id',
label: 'label', label: 'label',
disabled: 'disabled', disabled: 'disabled',
children: 'children' children: 'children'
} }
let dataFinished = false let dataFinished = ref(false)
const treeRef = ref() const treeRef = ref()
const isExpandAll = ref(false) // const isExpandAll = ref(false) //
const keyword = ref('') // const keyword = ref('') //
const checkList = ref([]) // list const checkList = ref([]) // list
const userList = ref([]) const userList = computed({
get(){
if (transferConfig.value.transferDataSource === "数据源") {
return [{
id: '全选',
label: '全选',
children: [...resData.value]
}]
}else{
return [{
id: '全选',
label: '全选',
children: props.data?.control.fixedOptions
}]
}
},
set(){
}
})
let checkedIdList = ref([]); let checkedIdList = ref([]);
let count = 0 let count = 0
function waitAndReGet(){ function waitAndReGet() {
/* console.log("waitAndReGet") /* console.log("waitAndReGet")
console.log(props.selectedValue) console.log(props.selectedValue)
console.log(props.selectedValue.value) */ console.log(props.selectedValue.value) */
setTimeout(()=>{ setTimeout(() => {
let values = props.selectedValue.map(item => { let values = props.selectedValue.map(item => {
// //
return item; return item;
}); });
if(props.selectedValue&&values){ if (props.selectedValue && values) {
/* console.log("") /* console.log("")
console.log(props.selectedValue) console.log(props.selectedValue)
console.log(values) */ console.log(values) */
//return props.selectedValue.value //return props.selectedValue.value
checkedIdList.value = values checkedIdList.value = values
}else{ } else {
if(count<3){ if (count < 3) {
count++ count++
waitAndReGet() waitAndReGet()
} }
@ -106,8 +149,14 @@ function waitAndReGet(){
/* console.log("waitAndReGet---else") */ /* console.log("waitAndReGet---else") */
} }
},2000) }, 2000)
} }
/*
*/
const selectedValueCompu = computed({ const selectedValueCompu = computed({
get() { get() {
@ -117,11 +166,11 @@ const selectedValueCompu = computed({
// //
return item; return item;
}); });
if(props.selectedValue&&values){ if (props.selectedValue && values) {
/* console.log(props.selectedValue.value) /* console.log(props.selectedValue.value)
console.log("computed---if") */ console.log("computed---if") */
return values return values
}else{ } else {
waitAndReGet() waitAndReGet()
/* console.log("computed---else") */ /* console.log("computed---else") */
return [] return []
@ -131,37 +180,37 @@ const selectedValueCompu = computed({
//}) //})
}, },
set(){} set() { }
}) })
/* console.log(props.selectedValue) */ /* console.log(props.selectedValue) */
const url = transferConfig.apiUrl;/* '/javasys/lowCode/transfer/getOrgAndManTree' */ const url = transferConfig.value.apiUrl;/* '/javasys/lowCode/transfer/getOrgAndManTree' */
let resData = ref([])
function getDetail() { function getDetail() {
//console.log(11111) //console.log(11111)
if(transferConfig.transferDataSource==="数据源"){ if (transferConfig.value.transferDataSource === "数据源") {
return request({ return request({
url: url, url: url,
method: transferConfig.method, method: transferConfig.value.method,
}); });
} }
} }
if(transferConfig.transferDataSource==="数据源"){ if (transferConfig.value.transferDataSource === "数据源") {
getDetail().then(({ data }) => { getDetail().then(({ data }) => {
//console.log(`穿`); //console.log(`穿`);
let resData = ref(data.children) resData.value = data.children
// 2: node // 2: node
userList.value = [{ userList.value = [{
id: '全选', id: '全选',
label: '全选', label: '全选',
children: [...resData.value] children: [...resData.value]
}] }]
treeRef.value.setCheckedKeys(checkedIdList.value,true) treeRef.value.setCheckedKeys(checkedIdList.value, true)
setTimeout(() => { setTimeout(() => {
checkedIdList.value.forEach(element => { checkedIdList.value.forEach(element => {
const _node = treeRef?.value?.getNode(element) const _node = treeRef?.value?.getNode(element)
@ -364,18 +413,18 @@ watch(keyword, (newVal) => {
// //
if(transferConfig.transferDataSource==="固定选项"){ if (transferConfig.value.transferDataSource === "固定选项") {
setTimeout(() => { setTimeout(() => {
// 2: node // 2: node
userList.value = [{ userList.value = [{
id: '全选', id: '全选',
label: '全选', label: '全选',
children: fixedOptions children: props.data?.control.fixedOptions
}] }]
//console.log(treeRef) //console.log(treeRef)
/* console.log(checkedIdList.value) */ /* console.log(checkedIdList.value) */
treeRef.value.setCheckedKeys(checkedIdList.value,true) treeRef.value.setCheckedKeys(checkedIdList.value, true)
setTimeout(() => { setTimeout(() => {
checkedIdList.value.forEach(element => { checkedIdList.value.forEach(element => {
const _node = treeRef?.value?.getNode(element) const _node = treeRef?.value?.getNode(element)
@ -397,42 +446,130 @@ if(transferConfig.transferDataSource==="固定选项"){
}); });
}, 50); }, 50);
}, 50); }, 50);
dataFinished = true dataFinished.value = true
}else{ } else {
getDetail getDetail
dataFinished = true dataFinished.value = true
}
/* setTimeout(()=>{
console.log("setTimeout")
if(props.data?.config.transferDataSource==="数据源"){
//emits('reRenderComponent');
count1.value++
} }
},1500) */
onMounted(() => {
})
// checkedIdList // checkedIdList
watch(checkedIdList, (newValue, oldValue) => { watch(checkedIdList, (newValue, oldValue) => {
//console.log('checkedIdList ', newValue); //console.log('checkedIdList ', newValue);
emits('checkedIdListChanged',newValue); emits('checkedIdListChanged', newValue);
},{deep:true}); }, { deep: true });
let count1 = ref(0);
/* onBeforeMount(() => {
console.log('onBeforeMount: 组件即将挂载');
});
onMounted(() => {
console.log('onMounted: 组件已挂载');
});
onBeforeUpdate(() => {
console.log('onBeforeUpdate: 数据即将更新到 DOM');
});
onUpdated(() => {
console.log('onUpdated: DOM 已更新');
if(props.data?.config.transferDataSource==="数据源"){
console.log("emits('reRenderComponent');")
emits('reRenderComponent');
}
});
onBeforeUnmount(() => {
console.log('onBeforeUnmount: 组件即将卸载,清除定时器');
});
onUnmounted(() => {
console.log('onUnmounted: 组件已卸载');
}); */
watch(transferConfig, (newValue, oldValue) => {
count1.value++
//emits('reRenderComponent', newValue);
try {
count1.value++
if (newValue.transferDataSource === "数据源") {
emits('reRenderComponent');
getDetail().then(({ data }) => {
//console.log(`穿`);
resData.value = data.children
// 2: node
userList.value = [{
id: '全选',
label: '全选',
children: [...resData.value]
}]
treeRef.value.setCheckedKeys(checkedIdList.value, true)
setTimeout(() => {
checkedIdList.value.forEach(element => {
const _node = treeRef?.value?.getNode(element)
if (!_node) return
const _checkList = checkList.value
if (_node.checked) { //
if (_node.checked && _node.childNodes.length === 0) {
_checkList.push(_node)
}
// new Set()
checkList.value = Array.from(new Set(_checkList))
// ,,
if (_node.childNodes.length > 0) {
_node.childNodes.map(item => handleCheckList(item.data))
}
} else if (!_node.checked) { //
checkList.value = checkList.value.filter(item => item.checked)
}
});
}, 50);
});
}
} catch (error) {
console.error('Error :', error);
//
//parsedData.value = null;
}
}, { deep: true });
watch(selectedValueCompu, (newValue, oldValue) => { watch(selectedValueCompu, (newValue, oldValue) => {
//console.log('selectedValueCompu ', newValue); //console.log('selectedValueCompu ', newValue);
checkedIdList.value = selectedValueCompu.value checkedIdList.value = selectedValueCompu.value
// //
if(transferConfig.transferDataSource==="固定选项"){ if (transferConfig.value.transferDataSource === "固定选项") {
setTimeout(() => { setTimeout(() => {
// 2: node // 2: node
userList.value = [{ userList.value = [{
id: '全选', id: '全选',
label: '全选', label: '全选',
children: fixedOptions children: props.data?.control.fixedOptions
}] }]
//console.log(treeRef) //console.log(treeRef)
/* console.log(checkedIdList.value) */ /* console.log(checkedIdList.value) */
treeRef.value.setCheckedKeys(checkedIdList.value,true) treeRef.value.setCheckedKeys(checkedIdList.value, true)
setTimeout(() => { setTimeout(() => {
checkedIdList.value.forEach(element => { checkedIdList.value.forEach(element => {
const _node = treeRef?.value?.getNode(element) const _node = treeRef?.value?.getNode(element)
@ -454,13 +591,13 @@ if(transferConfig.transferDataSource==="固定选项"){
}); });
}, 50); }, 50);
}, 50); }, 50);
dataFinished = true dataFinished.value = true
}else{ } else {
getDetail getDetail
dataFinished = true dataFinished.value = true
} }
//emits('updateModel',newValue); //emits('updateModel',newValue);
},{deep:true}); }, { deep: true });
</script> </script>
@ -516,4 +653,5 @@ if(transferConfig.transferDataSource==="固定选项"){
height: 456px; height: 456px;
background-color: white; background-color: white;
}</style> }
</style>

Loading…
Cancel
Save