Merge branch 'dev_20241202_xukangle' into develop
Showing
2 changed files
with
4 additions
and
1 deletions
| ... | @@ -1816,6 +1816,7 @@ const onBChange = async () => { | ... | @@ -1816,6 +1816,7 @@ const onBChange = async () => { |
| 1816 | await getSearchTableList(3, selectedB.value); // 分类分级搜索 | 1816 | await getSearchTableList(3, selectedB.value); // 分类分级搜索 |
| 1817 | } | 1817 | } |
| 1818 | if (activeName.value == 'second') { | 1818 | if (activeName.value == 'second') { |
| 1819 | await getDbDirFieldSelectData(3, { tableGuid: selectedB.value, databaseGuid: selectedA.value, condition: "3" }); | ||
| 1819 | if (activeTab.value === 'word') { | 1820 | if (activeTab.value === 'word') { |
| 1820 | await getDbDirFieldSelectData(3, { tableGuid: selectedB.value, databaseGuid: selectedA.value, condition: "3" }); | 1821 | await getDbDirFieldSelectData(3, { tableGuid: selectedB.value, databaseGuid: selectedA.value, condition: "3" }); |
| 1821 | } | 1822 | } | ... | ... |
| ... | @@ -266,8 +266,10 @@ const saveRow = (row) => { | ... | @@ -266,8 +266,10 @@ const saveRow = (row) => { |
| 266 | fieldValueRange = (row.startValue ? row.startValue : '') + '#' + (row.endValue ? row.endValue : '') | 266 | fieldValueRange = (row.startValue ? row.startValue : '') + '#' + (row.endValue ? row.endValue : '') |
| 267 | } else { | 267 | } else { |
| 268 | row.fieldValueRange = '' | 268 | row.fieldValueRange = '' |
| 269 | fieldValueRange = '' | 269 | fieldValueRange = row.fieldValueRange |
| 270 | } | 270 | } |
| 271 | } else { | ||
| 272 | fieldValueRange = row.fieldValueRange | ||
| 271 | } | 273 | } |
| 272 | 274 | ||
| 273 | if (tableData.value.find((item: any) => item.fieldGuid === row.fieldGuid)) { | 275 | if (tableData.value.find((item: any) => item.fieldGuid === row.fieldGuid)) { | ... | ... |
-
Please register or sign in to post a comment