From b3063e2c66ef4305ca75219e8f116472fc1291f7 Mon Sep 17 00:00:00 2001
From: qsc <3153284618@qq.com>
Date: Tue, 11 Jul 2023 10:12:54 +0800
Subject: [PATCH] =?UTF-8?q?article=E9=BB=98=E8=AE=A4=E5=B1=95=E5=BC=80?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/pages/article/doc/index.d.ts |  5 ++--
 lib/pages/article/doc/index.js   | 39 ++++++++++++++++----------------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/lib/pages/article/doc/index.d.ts b/lib/pages/article/doc/index.d.ts
index 8bd62d93b..03aff3223 100644
--- a/lib/pages/article/doc/index.d.ts
+++ b/lib/pages/article/doc/index.d.ts
@@ -1,5 +1,6 @@
-/// <reference types="wechat-miniprogram" />
 /// <reference types="react" />
 import { EntityDict } from '../../../general-app-domain';
-declare const _default: (props: import("oak-frontend-base").ReactComponentProps<EntityDict, "articleMenu", true, WechatMiniprogram.Component.DataOption>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
+declare const _default: (props: import("oak-frontend-base").ReactComponentProps<EntityDict, "articleMenu", true, {
+    articleMenuId: string;
+}>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
 export default _default;
diff --git a/lib/pages/article/doc/index.js b/lib/pages/article/doc/index.js
index 3a80838b9..39ea11c6f 100644
--- a/lib/pages/article/doc/index.js
+++ b/lib/pages/article/doc/index.js
@@ -22,7 +22,7 @@ exports.default = OakComponent({
                 name: 1,
                 content: 1,
                 articleMenuId: 1,
-            }
+            },
         },
         extraFile$entity: {
             $entity: 'extraFile',
@@ -54,8 +54,8 @@ exports.default = OakComponent({
     isList: true,
     formData: function (_a) {
         var _this = this;
-        var rows = _a.data;
-        var articleMenus = this.getArticleMenus();
+        var rows = _a.data, props = _a.props;
+        var articleMenus = this.getArticleMenus(props.articleMenuId);
         var treeData = articleMenus === null || articleMenus === void 0 ? void 0 : articleMenus.map(function (articleMenu) {
             var _a, _b;
             return {
@@ -73,18 +73,15 @@ exports.default = OakComponent({
     },
     filters: [],
     lifetimes: {},
+    properties: {
+        articleMenuId: '',
+    },
     data: {
         selectedArticleId: '',
         openKeys: [],
         selectedKeys: [],
         treeData: [],
         parentId: '',
-        articleMenuId: '',
-        id: '',
-        name: '',
-        isArticle: false,
-        isChildren: false,
-        logo: '',
         breadcrumbItems: [],
     },
     methods: {
@@ -108,7 +105,7 @@ exports.default = OakComponent({
                             name: 1,
                             content: 1,
                             articleMenuId: 1,
-                        }
+                        },
                     },
                     extraFile$entity: {
                         $entity: 'extraFile',
@@ -133,9 +130,11 @@ exports.default = OakComponent({
                     },
                 },
                 filter: {
-                    parentId: parentId ? parentId : {
-                        $exists: false
-                    }
+                    parentId: parentId
+                        ? parentId
+                        : {
+                            $exists: false,
+                        },
                 },
                 sorter: [
                     {
@@ -172,7 +171,7 @@ exports.default = OakComponent({
                                             name: 1,
                                             content: 1,
                                             articleMenuId: 1,
-                                        }
+                                        },
                                     },
                                     extraFile$entity: {
                                         $entity: 'extraFile',
@@ -197,9 +196,11 @@ exports.default = OakComponent({
                                     },
                                 },
                                 filter: {
-                                    parentId: parentId ? parentId : {
-                                        $exists: false
-                                    }
+                                    parentId: parentId
+                                        ? parentId
+                                        : {
+                                            $exists: false,
+                                        },
                                 },
                                 sorter: [
                                     {
@@ -226,7 +227,7 @@ exports.default = OakComponent({
                     articleMenuId: 1,
                 },
                 filter: {
-                    articleMenuId: articleMenuId
+                    articleMenuId: articleMenuId,
                 },
                 sorter: [
                     {
@@ -252,7 +253,7 @@ exports.default = OakComponent({
                                     articleMenuId: 1,
                                 },
                                 filter: {
-                                    articleMenuId: articleMenuId
+                                    articleMenuId: articleMenuId,
                                 },
                                 sorter: [
                                     {