From 0979b5af5df4bde14d3af57cdeb228dcb6d62b62 Mon Sep 17 00:00:00 2001
From: xiaoma <735878602@qq.com>
Date: Mon, 9 Aug 2021 16:16:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9AForm=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=94=AF=E6=8C=81=E5=93=8D=E5=BA=94=E5=BC=8F=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E8=B7=AF=E7=94=B1=E6=94=AF=E6=8C=81=E5=A4=96?=
 =?UTF-8?q?=E9=83=A8=E5=9C=B0=E5=9D=80=EF=BC=88=E5=86=85=E8=81=94=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Form/src/BasicForm.vue     |  7 +--
 src/components/Upload/src/BasicUpload.vue |  7 ++-
 src/layout/components/Menu/index.vue      |  1 -
 src/router/modules/about.ts               |  2 +-
 src/router/modules/docs.ts                |  2 +-
 src/router/modules/frame.ts               | 42 +++++++++++++
 src/views/frame/docs.vue                  |  1 +
 src/views/iframe/index.vue                | 72 +++++++++++++++++++++++
 src/views/list/basicList/index.vue        |  2 +-
 9 files changed, 124 insertions(+), 12 deletions(-)
 create mode 100644 src/router/modules/frame.ts
 create mode 100644 src/views/frame/docs.vue
 create mode 100644 src/views/iframe/index.vue

diff --git a/src/components/Form/src/BasicForm.vue b/src/components/Form/src/BasicForm.vue
index ea40df0..b9fe4c0 100644
--- a/src/components/Form/src/BasicForm.vue
+++ b/src/components/Form/src/BasicForm.vue
@@ -102,11 +102,7 @@
             type="primary"
             text
             icon-placement="right"
-            v-if="
-              isInline &&
-              getSchema.length > (getProps.gridProps?.cols || 0) &&
-              getProps.showAdvancedButton
-            "
+            v-if="overflow && isInline && getProps.showAdvancedButton"
             @click="unfoldToggle"
           >
             <template #icon>
@@ -212,6 +208,7 @@
         return {
           ...gridProps,
           collapsed: isInline.value ? gridCollapsed.value : false,
+          responsive: 'screen',
         };
       });
 
diff --git a/src/components/Upload/src/BasicUpload.vue b/src/components/Upload/src/BasicUpload.vue
index 4566317..d106c36 100644
--- a/src/components/Upload/src/BasicUpload.vue
+++ b/src/components/Upload/src/BasicUpload.vue
@@ -101,8 +101,8 @@
       const state = reactive({
         showModal: false,
         previewUrl: '',
-        originalImgList: [],
-        imgList: [],
+        originalImgList: [] as string[],
+        imgList: [] as string[],
       });
 
       //赋值默认图片显示
@@ -176,7 +176,7 @@
         const result = res[infoField];
         //成功
         if (code === ResultEnum.SUCCESS) {
-          let imgUrl = getImgUrl(result.photo);
+          let imgUrl: string = getImgUrl(result.photo);
           state.imgList.push(imgUrl);
           state.originalImgList.push(result.photo);
           emit('uploadChange', state.originalImgList);
@@ -220,6 +220,7 @@
 
         &:hover {
           background: 0 0;
+
           .upload-card-item-info::before {
             opacity: 1;
           }
diff --git a/src/layout/components/Menu/index.vue b/src/layout/components/Menu/index.vue
index e1e8fe1..a21fbf3 100644
--- a/src/layout/components/Menu/index.vue
+++ b/src/layout/components/Menu/index.vue
@@ -104,7 +104,6 @@
           const matched = currentRoute.matched;
           state.openKeys = matched.map((item) => item.name);
           const activeMenu: string = (currentRoute.meta?.activeMenu as string) || '';
-          console.log(currentRoute);
           selectedKeys.value = activeMenu ? (activeMenu as string) : (currentRoute.name as string);
         }
       );
diff --git a/src/router/modules/about.ts b/src/router/modules/about.ts
index 8227297..cbca90c 100644
--- a/src/router/modules/about.ts
+++ b/src/router/modules/about.ts
@@ -9,7 +9,7 @@ const routes: Array<RouteRecordRaw> = [
     name: 'about',
     component: Layout,
     meta: {
-      sort: 9,
+      sort: 10,
       isRoot: true,
       activeMenu: 'about_index',
     },
diff --git a/src/router/modules/docs.ts b/src/router/modules/docs.ts
index 626c74e..2545ec9 100644
--- a/src/router/modules/docs.ts
+++ b/src/router/modules/docs.ts
@@ -11,7 +11,7 @@ const routes: Array<RouteRecordRaw> = [
     meta: {
       title: '项目文档',
       icon: renderIcon(DocumentTextOutline),
-      sort: 8,
+      sort: 9,
     },
   },
 ];
diff --git a/src/router/modules/frame.ts b/src/router/modules/frame.ts
new file mode 100644
index 0000000..b61db0a
--- /dev/null
+++ b/src/router/modules/frame.ts
@@ -0,0 +1,42 @@
+import { RouteRecordRaw } from 'vue-router';
+import { Layout } from '@/router/constant';
+import { DesktopOutline } from '@vicons/ionicons5';
+import { renderIcon } from '@/utils/index';
+
+const IFrame = () => import('@/views/iframe/index.vue');
+
+const routes: Array<RouteRecordRaw> = [
+  {
+    path: '/frame',
+    name: 'Frame',
+    redirect: '/frame/docs',
+    component: Layout,
+    meta: {
+      title: '外部页面',
+      sort: 8,
+      icon: renderIcon(DesktopOutline),
+    },
+    children: [
+      {
+        path: 'docs',
+        name: 'frame-docs',
+        meta: {
+          title: '项目文档(内嵌)',
+          frameSrc: 'https://naive-ui-admin-docs.vercel.app',
+        },
+        component: IFrame,
+      },
+      {
+        path: 'naive',
+        name: 'frame-naive',
+        meta: {
+          title: 'NaiveUi(内嵌)',
+          frameSrc: 'https://www.naiveui.com',
+        },
+        component: IFrame,
+      },
+    ],
+  },
+];
+
+export default routes;
diff --git a/src/views/frame/docs.vue b/src/views/frame/docs.vue
new file mode 100644
index 0000000..6de47a4
--- /dev/null
+++ b/src/views/frame/docs.vue
@@ -0,0 +1 @@
+<template> 项目文档 </template>
diff --git a/src/views/iframe/index.vue b/src/views/iframe/index.vue
new file mode 100644
index 0000000..075bbb6
--- /dev/null
+++ b/src/views/iframe/index.vue
@@ -0,0 +1,72 @@
+<template>
+  <n-spin :show="loading">
+    <div class="frame">
+      <iframe :src="frameSrc" class="frame-iframe" scrolling="no" ref="frameRef"></iframe>
+    </div>
+  </n-spin>
+</template>
+<script lang="ts">
+  import { defineComponent, ref, unref, onMounted, nextTick } from 'vue';
+  import { useRoute } from 'vue-router';
+
+  export default defineComponent({
+    name: 'IFrame',
+    setup() {
+      const currentRoute = useRoute();
+      const loading = ref(false);
+      const frameRef = ref<HTMLFrameElement | null>(null);
+      const frameSrc = ref<string>('');
+
+      if (unref(currentRoute.meta)?.frameSrc) {
+        frameSrc.value = unref(currentRoute.meta)?.frameSrc as string;
+      }
+
+      function hideLoading() {
+        loading.value = false;
+      }
+
+      function init() {
+        nextTick(() => {
+          const iframe = unref(frameRef);
+          if (!iframe) return;
+          const _frame = iframe as any;
+          if (_frame.attachEvent) {
+            _frame.attachEvent('onload', () => {
+              hideLoading();
+            });
+          } else {
+            iframe.onload = () => {
+              hideLoading();
+            };
+          }
+        });
+      }
+
+      onMounted(() => {
+        loading.value = true;
+        init();
+      });
+
+      return {
+        loading,
+        frameRef,
+        frameSrc,
+      };
+    },
+  });
+</script>
+
+<style lang="less" scoped>
+  .frame {
+    width: 100%;
+    height: 100vh;
+
+    &-iframe {
+      width: 100%;
+      height: 100%;
+      overflow: hidden;
+      border: 0;
+      box-sizing: border-box;
+    }
+  }
+</style>
diff --git a/src/views/list/basicList/index.vue b/src/views/list/basicList/index.vue
index e32bb74..e707303 100644
--- a/src/views/list/basicList/index.vue
+++ b/src/views/list/basicList/index.vue
@@ -285,7 +285,7 @@
       });
 
       const [register, {}] = useForm({
-        gridProps: { cols: '4' },
+        gridProps: { cols: '1 s:1 m:2 l:3 xl:4 2xl:4' },
         labelWidth: 80,
         schemas,
       });