Commit 207a261373c98c7c90d2a54c8a00e3060ef05794
Merge branch 'perf/configuration-center-org' into 'main_dev'
fix: 优化组态数据源绑定数据根据组态所属组织查询 See merge request yunteng/thingskit-front!897
Showing
2 changed files
with
10 additions
and
2 deletions
... | ... | @@ -136,13 +136,19 @@ |
136 | 136 | const handlePreview = (record: ConfigurationCenterItemsModal) => { |
137 | 137 | if (!unref(getPreviewFlag)) return; |
138 | 138 | window.open( |
139 | - `${configurationPrefix}/${isDev ? '?dev=1&' : '?'}configurationId=${record!.id}&lightbox=1` | |
139 | + `${configurationPrefix}/${isDev ? '?dev=1&' : '?'}configurationId=${ | |
140 | + record!.id | |
141 | + }&lightbox=1&organizationId=${record.organizationId}` | |
140 | 142 | ); |
141 | 143 | }; |
142 | 144 | |
143 | 145 | const handleDesign = (record: ConfigurationCenterItemsModal) => { |
144 | 146 | if (!unref(getDesignFlag)) return; |
145 | - window.open(`${configurationPrefix}/${isDev ? '?dev=1&' : '?'}configurationId=${record!.id}`); | |
147 | + window.open( | |
148 | + `${configurationPrefix}/${isDev ? '?dev=1&' : '?'}configurationId=${ | |
149 | + record!.id | |
150 | + }&organizationId=${record.organizationId}` | |
151 | + ); | |
146 | 152 | }; |
147 | 153 | |
148 | 154 | const handleDelete = async (record: ConfigurationCenterItemsModal) => { |
... | ... | @@ -165,6 +171,7 @@ |
165 | 171 | searchParams.set('configurationId', record.id); |
166 | 172 | searchParams.set('publicId', record.publicId || ''); |
167 | 173 | searchParams.set('lightbox', '1'); |
174 | + searchParams.set('organizationId', record!.organizationId || ''); | |
168 | 175 | return `${origin}${configurationPrefix}/?${searchParams.toString()}`; |
169 | 176 | }; |
170 | 177 | ... | ... |