Skip to content

Commit b65af78

Browse files
authored
fix: resolve naming conflicts and add loading state in QML components (#109)
- Added loading property to DetailAddonsItem and DetailConfigItem - Fixed parent name conflicts by adding "_Container" suffix - Updated all parentName references to use consistent naming convention Log: resolve naming conflicts and add loading state in QML components pms: BUG-324491
1 parent 5da7067 commit b65af78

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

src/dcc-fcitx5configtool/qml/DetailAddonsItem.qml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import org.deepin.dcc 1.0
1111
DccObject {
1212
id: root
1313
property var globalAddons: []
14+
property bool loading: true
1415

1516
Component.onCompleted: {
1617
dccData.fcitx5AddonsProxy.onRequestAddonsFinished.connect(() => {

src/dcc-fcitx5configtool/qml/DetailConfigItem.qml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@ DccObject {
1212
id: root
1313
property var configOptions: []
1414
property var keyName: ""
15+
property bool loading: true
1516

1617
DccObject {
17-
name: root.displayName
18+
name: root.displayName + "_Container" // Add suffix to avoid conflict with root.name
1819
parentName: "GlobalConfigPage"
1920
weight: 40
2021
pageType: DccObject.Item
@@ -33,7 +34,7 @@ DccObject {
3334
DccObject {
3435
id: headerItem
3536
property bool expanded: false
36-
parentName: root.displayName
37+
parentName: root.displayName + "_Container" // Update to match the new name above
3738
displayName: root.displayName
3839
weight: root.weight
3940
pageType: DccObject.Item
@@ -81,7 +82,7 @@ DccObject {
8182
model: configOptions
8283
delegate: Component {
8384
DccObject {
84-
parentName: root.displayName
85+
parentName: root.displayName + "_Container" // Update to match the new name above
8586
displayName: modelData.description
8687
weight: root.weight + index + 1
8788
pageType: DccObject.Editor

0 commit comments

Comments
 (0)