Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/appmarket/AppPreview.vue

+<template>
+  <!-- 应用预览页面 -->
+  <div class="app-preview flex flexc jcc aic">
+    <div class="header">
+      <span class="btn" @click="handleBack">
+        <a-icon type="left" class="mr10" />
+        <span>返回上一级</span>
+      </span>
+    </div>
+    <div class="main flex1">
+      <iframe
+        style="width: 100%; height: 100%"
+        :src="previewUrl"
+        frameborder="0"
+      ></iframe>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      previewUrl: this.$route.query.previewUrl,
+    };
+  },
+  methods: {
+    handleBack() {
+      this.$router.back();
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.app-preview {
+  width: 100%;
+  height: 1080px;
+  padding-bottom: 20px;
+  background-color: #f5f5f5;
+  .header {
+    width: 100%;
+    height: 100px;
+    line-height: 100px;
+    height: 100px;
+    padding: 0px 40px;
+    margin-bottom: 10px;
+    background: url("../../../assets/img/title.jpg") no-repeat center;
+    background-size: 100% 100%;
+    box-shadow: 0px 2px 6px 6px #ccc;
+    .back-text {
+      font-size: 28px;
+      color: #ffffff;
+    }
+    .btn {
+      font-size: 28px;
+      color: #fff;
+      cursor: pointer;
+    }
+  }
+  .main {
+    width: 98%;
+  }
+}
+</style>
\ No newline at end of file

base-manager-ui/admin/src/pages/basicset/appmarket/components/AppDetailsPage.vue

@@ -225,7 +225,13 @@ export default {
       let res = await previewVersion({ appVersionId });
       let { code, data } = res.data;
       if (code === 1) {
-        window.open(data);
+        this.$router.push({
+          path: "/apppreview",
+          query: {
+            previewUrl: data,
+          },
+        });
+        // window.open(data);
       }
     },
     // 翻页

base-manager-ui/admin/src/pages/basicset/appmarket/modal/AddData.vue

@@ -21,7 +21,7 @@
             class="content"
             :prop="`appInfoFieldList.${i}.fieldValue`"
             :rules="{
-              required: true,
+              required: v.fieldNull ? false : true,
               message: `${v.fieldName}不能为空`,
               trigger:
                 v.fieldType == 'date' || v.fieldType == 'text'
@@ -43,6 +43,10 @@
             <a-textarea
               v-else-if="v.fieldType == 'textarea'"
               v-model="v.fieldValue"
+              :autoSize="{
+                minRows: 4,
+                maxRows: 4,
+              }"
               :placeholder="`请输入${v.fieldName}`"
               allow-clear
             />

base-manager-ui/admin/src/router/config.js

@@ -20,6 +20,11 @@ const options = {
       name: "403",
       component: () => import("@/pages/exception/403"),
     },
+    {
+      path: "/apppreview",
+      name: "预览页面",
+      component: () => import("@/pages/basicset/appmarket/AppPreview"),
+    },
     {
       path: "/",
       name: "首页",