From 7f733c3ad3fd098a034609e3d7da3ab5c1b5881a Mon Sep 17 00:00:00 2001
From: xiawenlong <c8EEx7s8ZQdm2EzADfL6>
Date: Tue, 19 Oct 2021 14:48:08 +0800
Subject: [PATCH 1/2] fix language fie.

---
 module/api/control.php              |  4 ++--
 module/api/js/common.js             | 14 ++++++++---
 module/api/js/create.js             | 22 ++++++++++++++----
 module/api/js/edit.js               | 36 +++++++++++++++++++++--------
 module/api/lang/en.php              | 15 ++++++------
 module/api/view/edit.html.php       |  2 +-
 module/api/view/editstruct.html.php |  5 +++-
 7 files changed, 69 insertions(+), 29 deletions(-)

diff --git a/module/api/control.php b/module/api/control.php
index 430470416b..e42f72dc62 100755
--- a/module/api/control.php
+++ b/module/api/control.php
@@ -687,7 +687,7 @@ EOT;
         $versions = $this->api->getReleaseListByApi($libID);
         if(!empty($versions))
         {
-            $versionName = $version > 0 ? $versions[$version]->desc : $this->lang->api->defaultVersion;
+            $versionName = $version > 0 ? $versions[$version]->version : $this->lang->api->defaultVersion;
             $output      .= <<<EOT
 <div class='btn-group angle-btn'>
   <div class='btn-group'>
@@ -707,7 +707,7 @@ EOT;
             foreach($versions as $key => $item)
             {
                 $selected = $key == $version ? 'selected' : '';
-                $output   .= html::a(inlink('index', "libID=$libID&moduleID=0&apiID=0&version=0&release=$key"), $item->desc, '', "class='$selected' data-app='{$this->app->tab}'");
+                $output   .= html::a(inlink('index', "libID=$libID&moduleID=0&apiID=0&version=0&release=$key"), $item->version, '', "class='$selected' data-app='{$this->app->tab}'");
             }
             $output .= "</div></div></div></div></div>";
         }
diff --git a/module/api/js/common.js b/module/api/js/common.js
index 3f5ae83f31..d44b37b284 100644
--- a/module/api/js/common.js
+++ b/module/api/js/common.js
@@ -220,8 +220,9 @@ try {
         template: `
         <tr>
           <td class="w-300px">
-            <span v-for="item in value.sub" style="display: inline-block; width: 10px"></span>
-            <input type="text" :placeholder="langField" autocomplete="off" class="form-control" style="display: inline-block;width: auto" v-model="value.field">
+            <div :style="{'padding-left': 10 * value.sub + 'px'}">
+                <input type="text" :placeholder="langField" autocomplete="off" class="form-control" v-model="value.field">
+            </div>
           </td>
           <td class="w-100px">
               <select class="form-control" v-model="value.paramsType">
@@ -305,7 +306,7 @@ try {
         created() {
             console.log(this.showType, this.structType)
             this.current = [this.getInitField()]
-            if (this.attr) {
+            if (this.attr && this.attr.length > 0) {
                 const attr = [];
                 this.decodeParams(this.attr, attr)
                 this.current = attr
@@ -387,6 +388,13 @@ try {
                 }
                 this.current = this.params[this.structType];
                 console.log(this.current)
+            },
+            getPadding(sub) {
+                var padding = 0;
+                sub.forEach(item => {
+                    padding += 15;
+                })
+                return padding + 'px';
             }
         },
         template: `
diff --git a/module/api/js/create.js b/module/api/js/create.js
index bdbc7f17f7..9eda457a1e 100644
--- a/module/api/js/create.js
+++ b/module/api/js/create.js
@@ -6,7 +6,7 @@ var app = new Vue({
         body: [],
         params: "",
         response: "",
-        defaultHeader: { field: '', required: '', desc: '' },
+        defaultHeader: {field: '', required: '', desc: ''},
     },
     created() {
         this.header.push({...this.defaultHeader});
@@ -40,13 +40,25 @@ var app = new Vue({
             this.response = JSON.stringify(val);
         },
         setParams() {
+            const header = this.filterParams(this.header)
+            const body = this.filterParams(this.body)
+            const queryP = this.filterParams(this.queryP)
             const params = {
-                header: this.header,
-                params: this.body,
-                query: this.queryP,
+                header: header,
+                params: body,
+                query: queryP,
             }
             this.params = JSON.stringify(params);
         },
+        filterParams(data) {
+            const res = []
+            data.forEach(item => {
+                if (item.field && item.field.length > 0) {
+                    res.push(item)
+                }
+            })
+            return res
+        },
         del(data, key) {
             if (data.length <= 1) {
                 return;
@@ -55,7 +67,7 @@ var app = new Vue({
         },
         add(data, key, t) {
             if (t == "header" || t == 'query') {
-                data.splice(key+1, 0, this.defaultHeader);
+                data.splice(key + 1, 0, this.defaultHeader);
             }
         }
     }
diff --git a/module/api/js/edit.js b/module/api/js/edit.js
index de0f1f2e55..769b191a57 100644
--- a/module/api/js/edit.js
+++ b/module/api/js/edit.js
@@ -7,16 +7,18 @@ var app = new Vue({
         response: "",
         params: "",
         defaultHeader: [
-            { field: '', required: '', desc: '' }
+            {field: '', required: '', desc: ''}
         ],
+        attr: [],
         api
     },
     created() {
         this.header.push({...this.defaultHeader})
         this.queryP.push({...this.defaultHeader})
-        if (api) {
-            this.header = api.params.header
-            this.queryP = api.params.query
+        if(api) {
+            if(api.params.header && api.params.header.length > 0) this.header = api.params.header
+            if(api.params.query && api.params.query.length > 0) this.queryP = api.params.query
+            if(api.params.params && api.params.params.length > 0) this.attr = api.params.params
             this.setParams();
         }
     },
@@ -48,23 +50,37 @@ var app = new Vue({
             this.response = JSON.stringify(val)
         },
         setParams() {
+            const header = this.filterParams(this.header)
+            const body = this.filterParams(this.body)
+            const queryP = this.filterParams(this.queryP)
             const params = {
-                header: this.header,
-                params: this.body,
-                query: this.queryP,
+                header: header,
+                params: body,
+                query: queryP,
             }
             // console.log(params)
             this.params = JSON.stringify(params);
         },
+        filterParams(data) {
+            const res = []
+            if(data && data.length > 0) {
+                data.forEach(item => {
+                    if(item.field && item.field.length > 0) {
+                        res.push(item)
+                    }
+                })
+            }
+            return res
+        },
         del(data, key) {
-            if (data.length <= 1) {
+            if(data.length <= 1) {
                 return
             }
             data.splice(key, 1)
         },
         add(data, key, t) {
-            if (t == "header" || t == 'query') {
-                data.splice(key+1, 0, this.defaultHeader)
+            if(t == "header" || t == 'query') {
+                data.splice(key + 1, 0, this.defaultHeader)
             }
         }
     }
diff --git a/module/api/lang/en.php b/module/api/lang/en.php
index 2b2cbac4f3..3f175d1667 100644
--- a/module/api/lang/en.php
+++ b/module/api/lang/en.php
@@ -167,12 +167,6 @@ $lang->api->paramsTypeCustomOptions = array(
     'file' => 'file',
     'ref'  => 'ref',
 );
-$lang->api->structParamsOptons   = array_merge($lang->api->paramsTypeOptions, array('file' => 'file', 'ref' => 'ref'));
-$lang->api->allParamsTypeOptions = array_merge($lang->api->paramsTypeOptions, $lang->api->paramsTypeCustomOptions);
-$lang->api->requiredOptions      = array(0 => 'No', 1 => 'Yes');
-
-$lang->doclib       = new stdclass();
-$lang->doclib->name = 'Interface Library Name';
 
 $lang->api->position  = 'Position';
 $lang->api->startLine = "%s,%s";
@@ -186,6 +180,13 @@ $lang->api->data      = 'Data';
 $lang->api->noParam   = 'No parameters required if GET Debug';
 $lang->api->post      = 'Refer to page list if POST Debug';
 
+$lang->api->structParamsOptons   = array_merge($lang->api->paramsTypeOptions, array('file' => 'file', 'ref' => 'ref'));
+$lang->api->allParamsTypeOptions = array_merge($lang->api->paramsTypeOptions, $lang->api->paramsTypeCustomOptions);
+$lang->api->requiredOptions      = array(0 => 'No', 1 => 'Yes');
+
+$lang->doclib       = new stdclass();
+$lang->doclib->name = 'Interface Library Name';
+
 $lang->api->error = new stdclass();
 $lang->api->error->onlySelect = 'SQL interface only allow SELECT query.';
-$lang->api->error->disabled   = 'For security reasons, this feature is disabled. You can go to the config directory and modify the configuration item %s to open this function.';
+$lang->api->error->disabled   = 'For security reasons, this feature is disabled. You can go to the config directory and modify the configuration item %s to open this function.';
\ No newline at end of file
diff --git a/module/api/view/edit.html.php b/module/api/view/edit.html.php
index 45162f654e..69a8655274 100644
--- a/module/api/view/edit.html.php
+++ b/module/api/view/edit.html.php
@@ -187,7 +187,7 @@ js::set('api', $api);
             <tr>
               <th><?php echo $lang->api->params;?></th>
               <td colspan='2'>
-                <body-field @change="changeAttr" :attr="api.params.params"></body-field>
+                <body-field @change="changeAttr" :attr="attr"></body-field>
                 <input type="hidden" name="params" v-model="params">
               </td>
             </tr>
diff --git a/module/api/view/editstruct.html.php b/module/api/view/editstruct.html.php
index 0cc8792cb0..a07f81d335 100644
--- a/module/api/view/editstruct.html.php
+++ b/module/api/view/editstruct.html.php
@@ -32,7 +32,10 @@ js::set('struct', $struct);
   <div id="mainContent" class="main-content">
     <div class='center-block'>
       <div class='main-header'>
-        <h2><?php echo $lang->api->createStruct;?></h2>
+        <h2>
+            <?php echo $struct->name;?>
+            <small><?php echo $lang->arrow . ' ' . $lang->api->editStruct;?></small>
+        </h2>
       </div>
       <form class="load-indicator main-form form-ajax" id="dataform" method='post' enctype='multipart/form-data'>
         <table class='table table-form'>

From 0ea60016a7f8cf447393f94cd4383d0917139551 Mon Sep 17 00:00:00 2001
From: xiawenlong <c8EEx7s8ZQdm2EzADfL6>
Date: Tue, 19 Oct 2021 15:09:13 +0800
Subject: [PATCH 2/2] add permission.

---
 module/api/lang/en.php         | 1 +
 module/api/lang/zh-cn.php      | 1 +
 module/doc/model.php           | 2 +-
 module/group/lang/resource.php | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/module/api/lang/en.php b/module/api/lang/en.php
index 3f175d1667..f56e88cb6a 100644
--- a/module/api/lang/en.php
+++ b/module/api/lang/en.php
@@ -18,6 +18,7 @@ $lang->api->index            = 'Api Doc Home';
 $lang->api->editLib          = 'Edit Api Doc';
 $lang->api->deleteLib        = 'Delete Api Doc';
 $lang->api->publish          = 'Publish';
+$lang->api->editPublish      = 'Edit Publish';
 $lang->api->createLib        = 'Create Api Library';
 $lang->api->createApi        = 'Create Api';
 $lang->api->edit             = 'Edit';
diff --git a/module/api/lang/zh-cn.php b/module/api/lang/zh-cn.php
index 3018bb285d..16c13f782c 100755
--- a/module/api/lang/zh-cn.php
+++ b/module/api/lang/zh-cn.php
@@ -16,6 +16,7 @@ $lang->api->sql      = 'SQL查询接口';
 
 $lang->api->index            = '接口库主页';
 $lang->api->editLib          = '编辑接口库';
+$lang->api->editPublish      = '编辑版本';
 $lang->api->deleteLib        = '删除接口库';
 $lang->api->publish          = '发布接口';
 $lang->api->createLib        = '创建接口库';
diff --git a/module/doc/model.php b/module/doc/model.php
index b239d86ab3..fabfa09110 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -2203,7 +2203,7 @@ EOT;
         $moduleDocs = array();
         foreach($docs as $doc)
         {
-            if(!$this->checkPrivDoc($doc)) continue;
+            //if(!$this->checkPrivDoc($doc)) continue;
             if(!isset($moduleDocs[$doc->module])) $moduleDocs[$doc->module] = array();
             $moduleDocs[$doc->module][] = $doc;
         }
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index f8363bd2f5..1130de176d 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1390,6 +1390,7 @@ $lang->resource->api->createLib    = 'createLib';
 $lang->resource->api->editLib      = 'editLib';
 $lang->resource->api->deleteLib    = 'deleteLib';
 $lang->resource->api->publish      = 'publish';
+$lang->resource->api->editPublic   = 'editPublish';
 $lang->resource->api->struct       = 'struct';
 $lang->resource->api->createStruct = 'createStruct';
 $lang->resource->api->editStruct   = 'editStruct';