Merge remote-tracking branch 'origin/main' into multi-tenant

src/views/system/role/index.vue

@@ -999,8 +999,10 @@ onMounted(() => {
     </a-card>
 
     <!-- 详情框 -->
-    <a-modal
-      width="800px"
+    <ProModal
+      :drag="true"
+      :width="800"
+      :destroyOnClose="false"
       :visible="modalState.visibleByView"
       :title="modalState.title"
       @cancel="fnModalCancel"
@@ -1098,11 +1100,13 @@ onMounted(() => {
           t('common.cancel')
         }}</a-button>
       </template>
-    </a-modal>
+    </ProModal>
 
     <!-- 新增框或修改框 -->
-    <a-modal
-      width="800px"
+    <ProModal
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByEdit"
@@ -1242,11 +1246,13 @@ onMounted(() => {
           </a-tree>
         </a-form-item>
       </a-form>
-    </a-modal>
+    </ProModal>
 
     <!-- 分配角色数据权限修改框 -->
-    <a-modal
-      width="800px"
+    <ProModal
+      :drag="true"
+      :width="800"
+      :destroyOnClose="true"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByDataScope"
@@ -1387,7 +1393,7 @@ onMounted(() => {
           </a-tree>
         </a-form-item>
       </a-form>
-    </a-modal>
+    </ProModal>
   </PageContainer>
 </template>