38a56aaf by fanguang

fix

1 parent a864307d
......@@ -98,10 +98,19 @@
</el-select>
</div>
<div class="table-form-item">
<el-select v-if="item.inputTypeCode == 2" v-model="item.dataTypeCode" style="width:160px" filterable clearable :disabled="fieldsDisabled || fieldsControlDisabled">
<el-select
v-if="item.inputTypeCode == 2"
v-model="item.dataTypeCode"
style="width:160px" filterable clearable
:disabled="fieldsDisabled || fieldsControlDisabled">
<el-option v-for="item in allDictOptions" :label="item.dictTypeName" :value="item.dictTypeName" :key="item.guid"></el-option>
</el-select>
<el-input v-else-if="item.inputTypeCode == 3" v-model="item.validateExpression" placeholder="请输入"></el-input>
<el-input
v-else-if="item.inputTypeCode == 3"
v-model="item.validateExpression"
:disabled="fieldsDisabled || fieldsControlDisabled"
placeholder="请输入"
></el-input>
</div>
<div class="table-form-operation" v-if="!fieldsDisabled && !fieldsControlDisabled">
<!-- <el-icon color="#4fa1a4" @click="() => addTableItem(index)">
......@@ -369,13 +378,14 @@ watch(
(v) => {
if (!v) return
// 上级标准:不能选自己,有数据的标准不能选
fieldsControlDisabled.value = true
// treeSelectData.value = JSON.parse(JSON.stringify(props.standardOptions))
if (props.type === 'edit') {
fieldsControlDisabled.value = false
getTreeSelectOptions().then(() => {
getDetail().then(() => formatOptions(treeSelectData.value))
})
} else {
fieldsControlDisabled.value = true
form.value = { ...formTpl }
getTreeSelectOptions().then(() => formatOptions(treeSelectData.value))
}
......
......@@ -90,10 +90,17 @@ function getTree (refresh = false, initLocate = false) {
})
treeInfo.value.data = data
if (!initLocate) {
treeInfo.value.expandedKey = [data[0].guid]
treeInfo.value.currentNodeKey = data[0].guid
// treeInfo.value.expandedKey = [data[0].guid]
// treeInfo.value.currentNodeKey = data[0].guid
console.log('data', data)
let firstNode = data[0]
if (firstNode.children) {
firstNode = firstNode.children[0]
}
treeInfo.value.expandedKey = [firstNode.guid]
treeInfo.value.currentNodeKey = firstNode.guid
nodeClick(firstNode)
}
nodeClick(data[0])
}
})
}
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!