组件申请成功信息修改

public/mapsee.html

@@ -59,7 +59,7 @@
             console.log('Message received:', event.data);
             sessionStorage.clear();
             localStorage.clear();
-            window.location.href = '/spatialDataMng/index.html#/login?redirect=/dashboard/workbench'
+            window.close();
         };
 
         window.onload = function () {
@@ -83,7 +83,6 @@
             } else {
                 window.location.href = '/spatialDataMng/index.html#/login?redirect=/dashboard/workbench'
             }
-
         }
 
         function creteIframe(url) {

public/mapview.html

@@ -33,7 +33,7 @@
             console.log('Message received:', event.data);
             sessionStorage.clear();
             localStorage.clear();
-            window.location.href = '/spatialDataMng/index.html#/login?redirect=/dashboard/workbench'
+            window.close();
         };
         window.onload = function () {
             var t1 = sessionStorage.getItem('tokenSpace');

public/sceneview.html

@@ -33,7 +33,7 @@
             console.log('Message received:', event.data);
             sessionStorage.clear();
             localStorage.clear();
-            window.location.href = '/spatialDataMng/index.html#/login?redirect=/dashboard/workbench'
+            window.close();
         };
         window.onload = function () {
             var t1 = sessionStorage.getItem('tokenSpace');

src/views/assembly/item/EmpowerInfo.vue

@@ -5,7 +5,10 @@
                 <span>审核结果:{{ info?.shzt }}</span><span>审核意见:{{ shyjInfo }}</span>
             </li>
             <li>
-                <p>访问地址:{{ info.assUrl }}</p>
+                <p>案例地址:{{ info.assUrl }}</p>
+            </li>
+            <li>
+                <p>授权文件:{{ info?.resInfo?.PUBLICCURL }}</p>
             </li>
         </ul>
     </a-modal>

src/views/systemAdmin/system/menu/MenuDrawer.vue

@@ -1,5 +1,5 @@
 <template>
-  <BasicDrawer
+  <BasicModal
     v-bind="$attrs"
     @register="registerDrawer"
     showFooter
@@ -8,7 +8,7 @@
     @ok="handleSubmit"
   >
     <BasicForm @register="registerForm" />
-  </BasicDrawer>
+  </BasicModal>
 </template>
 <script lang="ts">
   import { defineComponent, ref, computed, unref } from 'vue';
@@ -24,10 +24,11 @@
 
   import { useI18n } from '/@/hooks/web/useI18n';
   import { metaModel } from '/@/api/system/model/menuModel';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
 
   export default defineComponent({
     name: 'MenuDrawer',
-    components: { BasicDrawer, BasicForm },
+    components: { BasicDrawer, BasicForm, BasicModal },
     emits: ['success', 'register'],
     setup(_, { emit }) {
       const isUpdate = ref(true);
@@ -42,7 +43,7 @@
       const { t } = useI18n(); //加载国际化
 
       //默认传递页面数据
-      const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+      const [registerDrawer, {setModalProps :setDrawerProps, closeModal:closeDrawer }] = useModalInner(async (data) => {
         resetFields();
         setDrawerProps({ confirmLoading: false });
         isUpdate.value = !!data?.isUpdate;

src/views/systemAdmin/system/menu/index.vue

@@ -32,7 +32,7 @@
     </BasicTable>
 
     <!-- 弹出框 -->
-    <MenuDrawer @register="registerDrawer" @success="handleSuccess" />
+    <MenuDrawer @register="registerModal" @success="handleSuccess" />
   </div>
 </template>
 <script lang="ts">
@@ -56,12 +56,15 @@ import { useI18n } from '/@/hooks/web/useI18n';
 import { Button, notification } from 'ant-design-vue';
 import { useSyncConfirm } from '/@/hooks/component/useSyncConfirm';
 import { isArray } from '/@/utils/is';
+import { useModal } from '/@/components/Modal';
+
 // 自定义表格组件和属性
 export default defineComponent({
   name: 'MenuManagement',
   components: { BasicTable, MenuDrawer, TableAction, Button },
   setup() {
-    const [registerDrawer, { openDrawer }] = useDrawer(); //使用右侧弹出框
+    // const [registerDrawer, { openDrawer }] = useDrawer(); //使用右侧弹出框
+    const [registerModal, { openModal }] = useModal(); //使用右侧弹出框
     const { t } = useI18n(); //加载国际化
     // 新增菜单
     // const getI18nCreateMenu = computed(() => t('routes.common.system.pageSystemTitleCreateMenu'));
@@ -130,7 +133,7 @@ export default defineComponent({
      * 打开新增菜单
      */
     function handleCreate() {
-      openDrawer(true, {
+      openModal(true, {
         isUpdate: false,
       });
     }
@@ -140,7 +143,7 @@ export default defineComponent({
      * @param record
      */
     function handleEdit(record: Recordable) {
-      openDrawer(true, {
+      openModal(true, {
         record,
         isUpdate: true,
       });
@@ -181,7 +184,7 @@ export default defineComponent({
       getDeleteTitle,
       getI18nCreateMenu,
       registerTable,
-      registerDrawer,
+      registerModal,
       handleCreate,
       handleEdit,
       handleDelete,

src/views/systemAdmin/system/menu/menu.data.ts

@@ -156,7 +156,7 @@ export const formSchema: FormSchema[] = [
       api: async () => {
         // debugger;
         var data = await menuList();
-        console.log("请你的选择上级菜单:", data);
+        console.log('请你的选择上级菜单:', data);
         return data;
       },
       onChange(value) {
@@ -202,6 +202,19 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       maxLength: 32,
     },
+    dynamicRules: () => {
+      return [
+        {
+          required: false,
+          validator: (_, value) => {
+            if (value < 0) {
+              return Promise.reject('排序不为负数!');
+            }
+            return Promise.resolve();
+          },
+        },
+      ];
+    },
   },
   {
     field: 'icon',