From 06c988be913c62dd923e2627e76e009df6497f9e Mon Sep 17 00:00:00 2001
From: hyt <958868763@qq.com>
Date: Wed, 15 May 2024 16:36:42 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=94=9F=E6=88=90=E7=9A=84?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=92=8C=E6=8C=89=E9=92=AE=E4=B8=8D=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/permission.js               |   10 +-
 src/views/applicationList/apiList/apiAdd.vue  | 1013 ++++++++++++-----
 .../buttonManagement/index.vue                |   12 +-
 .../menuManagement/index.vue                  |   67 +-
 4 files changed, 797 insertions(+), 305 deletions(-)

diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index d688fbb..0621828 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -106,7 +106,7 @@ const permission = {
                   name: 'masterDataEdit',
                   hidden: true,
                   meta: {
-                    title: '基本信息',
+                    title: '',
                     hidden: true
                   }
                 },
@@ -116,7 +116,7 @@ const permission = {
                   name: 'dataOrigin',
                   hidden: true,
                   meta: {
-                    title: '数据源',
+                    title: '',
                     hidden: true
                   }
                 },
@@ -126,7 +126,7 @@ const permission = {
                   name: 'displayInfo',
                   hidden: true,
                   meta: {
-                    title: '显示信息',
+                    title: '',
                     hidden: true
 
                   }
@@ -136,7 +136,7 @@ const permission = {
                   name: 'authorily',
                   component: () => import('@/views/masterDataOptions/authority'),
                   meta: {
-                    title: '配置权限',
+                    title: '',
                     hidden: true
                   }
                 },
@@ -145,7 +145,7 @@ const permission = {
                   name: 'distribute',
                   component: () => import('@/views/masterDataOptions/distribute'),
                   meta: {
-                    title: '分发设置',
+                    title: '',
                     hidden: true
                   }
                 }
diff --git a/src/views/applicationList/apiList/apiAdd.vue b/src/views/applicationList/apiList/apiAdd.vue
index ad2edf4..d6747b4 100644
--- a/src/views/applicationList/apiList/apiAdd.vue
+++ b/src/views/applicationList/apiList/apiAdd.vue
@@ -2,28 +2,28 @@
   <div class="wrap">
     <div class="nextbtn">
       <el-button
-          :disabled="active == 0"
-          type="primary"
-          @click="backActiveHandle"
-          icon="el-icon-back"
+        :disabled="active == 0"
+        type="primary"
+        @click="backActiveHandle"
+        icon="el-icon-back"
       >上一步
       </el-button
       >
       <el-button
-          :disabled="active == 2"
-          type="primary"
-          @click="nextActiveHanlde"
-          icon="el-icon-right"
+        :disabled="active == 2"
+        type="primary"
+        @click="nextActiveHanlde"
+        icon="el-icon-right"
       >下一步
       </el-button
       >
       <el-button type="" icon="el-icon-close" @click="backPageHandle">取消</el-button>
       <el-button
-          icon="el-icon-first-aid-kit"
-          :loading="commitLoading"
-          :disabled="active !== 2"
-          type="primary"
-          @click="commit"
+        icon="el-icon-first-aid-kit"
+        :loading="commitLoading"
+        :disabled="active !== 2"
+        type="primary"
+        @click="commit"
       >保存
       </el-button>
 
@@ -44,14 +44,14 @@
         <template v-if="active === 0">
           <div>
             <baseNewForm
-                refName="stepZeroform"
-                ref="stepZeroform"
-                :spanNumber="24"
-                :formRow="stepZeroformRow"
-                :ruleForm="stepZeroForm"
-                :isFunBtn="false"
-                @onSubmit="onSubmitHandle"
-                @onChangeRadio="onChangeRadio"
+              refName="stepZeroform"
+              ref="stepZeroform"
+              :spanNumber="24"
+              :formRow="stepZeroformRow"
+              :ruleForm="stepZeroForm"
+              :isFunBtn="false"
+              @onSubmit="onSubmitHandle"
+              @onChangeRadio="onChangeRadio"
             >
             </baseNewForm>
           </div>
@@ -59,13 +59,14 @@
         <template v-if="active === 1">
           <div>
             <baseNewForm
-                refName="stepOneform"
-                ref="stepOneform"
-                :spanNumber="24"
-                :formRow="stepOneformRow"
-                :ruleForm="stepOneForm"
-                :isFunBtn="false"
-                @onSubmit="onSubmitHandle"
+              refName="stepOneform"
+              ref="stepOneform"
+              :spanNumber="24"
+              :formRow="stepOneformRow"
+              :ruleForm="stepOneForm"
+              :isFunBtn="false"
+              @onSubmit="onSubmitHandle"
+              @onChangeRadio="stepOneChangeRadio"
             ></baseNewForm>
           </div>
         </template>
@@ -86,35 +87,35 @@
             <div class="left"></div>
             <div class="btn">
               <el-button
-                  type="primary"
-                  @click="jsonImportSwitch('headersTableInfo', false)"
+                type="primary"
+                @click="jsonImportSwitch('headersTableInfo', false)"
               >导入JSON
               </el-button
               >
             </div>
           </div>
           <baseTableForm
-              :showIndex="false"
-              :indexOperate="false"
-              :funWidth="150"
-              :funData="[{text:'删除',type:'dele',color:'#e47470'}]"
-              :tableInfo="headersTableInfo"
-              @onFunc="tableButtonHandle"
+            :showIndex="false"
+            :indexOperate="false"
+            :funWidth="150"
+            :funData="[{text:'删除',type:'dele',color:'#e47470'}]"
+            :tableInfo="headersTableInfo"
+            @onFunc="tableButtonHandle"
           >
             <template #parameterType="{ row }">
               <div>
                 <el-select
-                    class="w-100"
-                    v-model="row[0][row[1].id]"
-                    :clearable="true"
-                    placeholder="请选择"
-                    @change="fatherSelectChangeHandle(row)"
+                  class="w-100"
+                  v-model="row[0][row[1].id]"
+                  :clearable="true"
+                  placeholder="请选择"
+                  @change="fatherSelectChangeHandle(row)"
                 >
                   <el-option
-                      v-for="(el, index) in headerparameterTypeOptions"
-                      :key="el.id"
-                      :label="el.label"
-                      :value="el.id"
+                    v-for="(el, index) in headerparameterTypeOptions"
+                    :key="el.id"
+                    :label="el.label"
+                    :value="el.id"
                   >
                   </el-option>
                 </el-select>
@@ -122,19 +123,19 @@
             </template>
             <template #concreteType="{ row }">
               <el-select
-                  class="w-100"
-                  v-model="row[0][row[1].id]"
-                  :clearable="true"
-                  placeholder="请选择"
-                  @change="(val) => sonSelectChangeHandle(val, row)"
+                class="w-100"
+                v-model="row[0][row[1].id]"
+                :clearable="true"
+                placeholder="请选择"
+                @change="(val) => sonSelectChangeHandle(val, row)"
               >
                 <el-option
-                    v-for="(el, index) in concreteTypeOptions[
+                  v-for="(el, index) in concreteTypeOptions[
                   row[0]['parameterType']
                 ]"
-                    :key="el.id"
-                    :label="el.label"
-                    :value="el.id"
+                  :key="el.id"
+                  :label="el.label"
+                  :value="el.id"
                 >
                 </el-option>
               </el-select>
@@ -147,14 +148,14 @@
                 >
                 </baseCascader> -->
                 <el-cascader
-                    style="width: 100%"
-                    v-model="row[0][row[1].id]"
-                    ref="elCascader"
-                    :clearable="true"
-                    :show-all-levels="false"
-                    :options="authQueryOut"
-                    :props="selectprops"
-                    :disabled="false"
+                  style="width: 100%"
+                  v-model="row[0][row[1].id]"
+                  ref="elCascader"
+                  :clearable="true"
+                  :show-all-levels="false"
+                  :options="authQueryOut"
+                  :props="selectprops"
+                  :disabled="false"
                 ></el-cascader>
               </template>
               <template v-else>
@@ -164,9 +165,9 @@
           </baseTableForm>
           <div class="add">
             <el-link
-                type="primary"
-                @click="addTableData(headersTableInfo.tableData)"
-                :underline="false"
+              type="primary"
+              @click="addTableData(headersTableInfo.tableData)"
+              :underline="false"
             >+ 添加属性
             </el-link
             >
@@ -179,37 +180,37 @@
             <div class="left"></div>
             <div class="btn">
               <el-button
-                  type="primary"
-                  @click="jsonImportSwitch('queryTableInfo', true)"
+                type="primary"
+                @click="jsonImportSwitch('queryTableInfo', true)"
               >导入JSON
               </el-button
               >
             </div>
           </div>
           <baseTableForm
-              :showIndex="false"
-              :indexOperate="false"
-              :funWidth="150"
-              :funData="[{text:'删除',type:'dele',color:'#e47470'}]"
-              :tableInfo="queryTableInfo"
-              @newRow="queryTableAddHandle"
-              @onFunc="tableButtonHandle"
+            :showIndex="false"
+            :indexOperate="false"
+            :funWidth="150"
+            :funData="[{text:'删除',type:'dele',color:'#e47470'}]"
+            :tableInfo="queryTableInfo"
+            @newRow="queryTableAddHandle"
+            @onFunc="tableButtonHandle"
           >
             <template #parameterType="{ row }">
               <div>
                 <el-select
-                    class="w-100"
-                    v-model="row[0][row[1].id]"
-                    filterable
-                    :clearable="true"
-                    placeholder="请选择"
-                    @change="fatherSelectChangeHandle(row)"
+                  class="w-100"
+                  v-model="row[0][row[1].id]"
+                  filterable
+                  :clearable="true"
+                  placeholder="请选择"
+                  @change="fatherSelectChangeHandle(row)"
                 >
                   <el-option
-                      v-for="(el, index) in headerparameterTypeOptions"
-                      :key="el.id"
-                      :label="el.label"
-                      :value="el.id"
+                    v-for="(el, index) in headerparameterTypeOptions"
+                    :key="el.id"
+                    :label="el.label"
+                    :value="el.id"
                   >
                   </el-option>
                 </el-select>
@@ -217,20 +218,20 @@
             </template>
             <template #concreteType="{ row }">
               <el-select
-                  class="w-100"
-                  v-model="row[0][row[1].id]"
-                  filterable
-                  :clearable="true"
-                  placeholder="请选择"
-                  @change="(val) => sonSelectChangeHandle(val, row)"
+                class="w-100"
+                v-model="row[0][row[1].id]"
+                filterable
+                :clearable="true"
+                placeholder="请选择"
+                @change="(val) => sonSelectChangeHandle(val, row)"
               >
                 <el-option
-                    v-for="(el, index) in concreteTypeOptions[
+                  v-for="(el, index) in concreteTypeOptions[
                   row[0]['parameterType']
                 ]"
-                    :key="el.id"
-                    :label="el.label"
-                    :value="el.id"
+                  :key="el.id"
+                  :label="el.label"
+                  :value="el.id"
                 >
                 </el-option>
               </el-select>
@@ -243,14 +244,14 @@
                 >
                 </baseCascader> -->
                 <el-cascader
-                    style="width: 100%"
-                    v-model="row[0][row[1].id]"
-                    ref="elCascader"
-                    :clearable="true"
-                    :show-all-levels="false"
-                    :options="authQueryOut"
-                    :props="selectprops"
-                    :disabled="false"
+                  style="width: 100%"
+                  v-model="row[0][row[1].id]"
+                  ref="elCascader"
+                  :clearable="true"
+                  :show-all-levels="false"
+                  :options="authQueryOut"
+                  :props="selectprops"
+                  :disabled="false"
                 ></el-cascader>
               </template>
               <template v-else>
@@ -260,9 +261,9 @@
           </baseTableForm>
           <div class="add">
             <el-link
-                type="primary"
-                @click="addTableData(queryTableInfo.tableData)"
-                :underline="false"
+              type="primary"
+              @click="addTableData(queryTableInfo.tableData)"
+              :underline="false"
             >+ 添加属性
             </el-link>
           </div>
@@ -274,20 +275,20 @@
             <div class="left"></div>
             <div class="btn">
               <el-button
-                  type="primary"
-                  @click="jsonImportSwitch('bodyEntTableInfo', true,true)"
+                type="primary"
+                @click="jsonImportSwitch('bodyEntTableInfo', true,true)"
               >导入JSON
               </el-button
               >
             </div>
           </div>
           <baseTableForm
-              :showIndex="false"
-              :indexOperate="false"
-              :funWidth="funWidth"
-              :funData="funData"
-              :tableInfo="bodyEntTableInfo"
-              @onFunc="tableButtonHandle"
+            :showIndex="false"
+            :indexOperate="false"
+            :funWidth="funWidth"
+            :funData="funData"
+            :tableInfo="bodyEntTableInfo"
+            @onFunc="tableButtonHandle"
           >
             <template #parameterName="{row}">
               <div v-if="row[0]['first']" style="text-align: center;width: 100%">{{ row[0].parameterName }}</div>
@@ -296,36 +297,36 @@
             <template #parameterType="{ row }">
               <div v-if="row[0]['first']">
                 <el-select
-                    class="w-100"
-                    v-model="row[0][row[1].id]"
-                    filterable
-                    :clearable="true"
-                    placeholder="请选择"
-                    @change="fatherSelectChangeHandle(row)"
+                  class="w-100"
+                  v-model="row[0][row[1].id]"
+                  filterable
+                  :clearable="true"
+                  placeholder="请选择"
+                  @change="fatherSelectChangeHandle(row)"
                 >
                   <el-option
-                      v-for="(el, index) in bodyOptions"
-                      :key="el.id"
-                      :label="el.label"
-                      :value="el.id"
+                    v-for="(el, index) in bodyOptions"
+                    :key="el.id"
+                    :label="el.label"
+                    :value="el.id"
                   >
                   </el-option>
                 </el-select>
               </div>
               <div v-else>
                 <el-select
-                    class="w-100"
-                    v-model="row[0][row[1].id]"
-                    filterable
-                    :clearable="true"
-                    placeholder="请选择"
-                    @change="fatherSelectChangeHandle(row)"
+                  class="w-100"
+                  v-model="row[0][row[1].id]"
+                  filterable
+                  :clearable="true"
+                  placeholder="请选择"
+                  @change="fatherSelectChangeHandle(row)"
                 >
                   <el-option
-                      v-for="(el, index) in parameterTypeOptions"
-                      :key="el.id"
-                      :label="el.label"
-                      :value="el.id"
+                    v-for="(el, index) in parameterTypeOptions"
+                    :key="el.id"
+                    :label="el.label"
+                    :value="el.id"
                   >
                   </el-option>
                 </el-select>
@@ -333,20 +334,20 @@
             </template>
             <template #concreteType="{ row }">
               <el-select
-                  class="w-100"
-                  v-model="row[0][row[1].id]"
-                  filterable
-                  :clearable="true"
-                  placeholder="请选择"
-                  @change="(val) => sonSelectChangeHandle(val, row)"
+                class="w-100"
+                v-model="row[0][row[1].id]"
+                filterable
+                :clearable="true"
+                placeholder="请选择"
+                @change="(val) => sonSelectChangeHandle(val, row)"
               >
                 <el-option
-                    v-for="(el, index) in concreteTypeOptions[
+                  v-for="(el, index) in concreteTypeOptions[
                   row[0]['parameterType']
                 ]"
-                    :key="el.id"
-                    :label="el.label"
-                    :value="el.id"
+                  :key="el.id"
+                  :label="el.label"
+                  :value="el.id"
                 >
                 </el-option>
               </el-select>
@@ -359,14 +360,14 @@
                 >
                 </baseCascader> -->
                 <el-cascader
-                    style="width: 100%"
-                    v-model="row[0][row[1].id]"
-                    ref="elCascader"
-                    :clearable="true"
-                    :show-all-levels="false"
-                    :options="authQueryOut"
-                    :props="selectprops"
-                    :disabled="false"
+                  style="width: 100%"
+                  v-model="row[0][row[1].id]"
+                  ref="elCascader"
+                  :clearable="true"
+                  :show-all-levels="false"
+                  :options="authQueryOut"
+                  :props="selectprops"
+                  :disabled="false"
                 ></el-cascader>
               </template>
               <template v-else>
@@ -376,9 +377,9 @@
           </baseTableForm>
           <div class="add">
             <el-link
-                type="primary"
-                @click="addTableData(bodyEntTableInfo.tableData,true)"
-                :underline="false"
+              type="primary"
+              @click="addTableData(bodyEntTableInfo.tableData,true)"
+              :underline="false"
             >+ 添加属性
             </el-link
             >
@@ -391,36 +392,36 @@
             <div class="left"></div>
             <div class="btn">
               <el-button
-                  type="primary"
-                  @click="jsonImportSwitch('bodyExitTableInfo', true)"
+                type="primary"
+                @click="jsonImportSwitch('bodyExitTableInfo', true)"
               >导入JSON
               </el-button
               >
             </div>
           </div>
           <baseTableForm
-              :showIndex="false"
-              :indexOperate="false"
-              :funWidth="funWidth"
-              :funData="funData"
-              :tableInfo="bodyExitTableInfo"
-              @onFunc="tableButtonHandle"
+            :showIndex="false"
+            :indexOperate="false"
+            :funWidth="funWidth"
+            :funData="funData"
+            :tableInfo="bodyExitTableInfo"
+            @onFunc="tableButtonHandle"
           >
             <template #parameterType="{ row }">
               <div>
                 <el-select
-                    class="w-100"
-                    v-model="row[0][row[1].id]"
-                    filterable
-                    :clearable="true"
-                    placeholder="请选择"
-                    @change="fatherSelectChangeHandle(row)"
+                  class="w-100"
+                  v-model="row[0][row[1].id]"
+                  filterable
+                  :clearable="true"
+                  placeholder="请选择"
+                  @change="fatherSelectChangeHandle(row)"
                 >
                   <el-option
-                      v-for="(el, index) in bodyOutOptions"
-                      :key="el.id"
-                      :label="el.label"
-                      :value="el.id"
+                    v-for="(el, index) in bodyOutOptions"
+                    :key="el.id"
+                    :label="el.label"
+                    :value="el.id"
                   >
                   </el-option>
                 </el-select>
@@ -428,20 +429,20 @@
             </template>
             <template #concreteType="{ row }">
               <el-select
-                  class="w-100"
-                  v-model="row[0][row[1].id]"
-                  filterable
-                  :clearable="true"
-                  placeholder="请选择"
-                  @change="(val) => sonSelectChangeHandle(val, row)"
+                class="w-100"
+                v-model="row[0][row[1].id]"
+                filterable
+                :clearable="true"
+                placeholder="请选择"
+                @change="(val) => sonSelectChangeHandle(val, row)"
               >
                 <el-option
-                    v-for="(el, index) in concreteTypeOptions[
+                  v-for="(el, index) in concreteTypeOptions[
                   row[0]['parameterType']
                 ]"
-                    :key="el.id"
-                    :label="el.label"
-                    :value="el.id"
+                  :key="el.id"
+                  :label="el.label"
+                  :value="el.id"
                 >
                 </el-option>
               </el-select>
@@ -449,9 +450,9 @@
           </baseTableForm>
           <div class="add">
             <el-link
-                type="primary"
-                @click="addTableData(bodyExitTableInfo.tableData)"
-                :underline="false"
+              type="primary"
+              @click="addTableData(bodyExitTableInfo.tableData)"
+              :underline="false"
             >+ 添加属性
             </el-link
             >
@@ -467,12 +468,12 @@
       <template v-if="activeIndex === '6'">
         <div style="margin-top: 30px">
           <baseNewForm
-              refName="returnedFormName"
-              ref="returnedFormName"
-              :spanNumber="24"
-              :formRow="returnedFormRow"
-              :ruleForm="returnedForm"
-              :isFunBtn="false"
+            refName="returnedFormName"
+            ref="returnedFormName"
+            :spanNumber="24"
+            :formRow="returnedFormRow"
+            :ruleForm="returnedForm"
+            :isFunBtn="false"
           >
           </baseNewForm>
         </div>
@@ -482,20 +483,20 @@
 
     </div>
     <baseRightDialog
-        :dialogVisible="rightDialog"
-        title="JSON导入"
-        @handleClose="dialoghandleClose"
-        @handleConfirmClick="JSONCommit"
-        :commitLoading="importLoading"
+      :dialogVisible="rightDialog"
+      title="JSON导入"
+      @handleClose="dialoghandleClose"
+      @handleConfirmClick="JSONCommit"
+      :commitLoading="importLoading"
     >
       <div class="top" style="width: 90%; margin: 20px auto">
         <vue-json-editor
-            v-model="resultInfo"
-            :showBtns="false"
-            :mode="'code'"
-            @json-change="onJsonChange"
-            @json-save="onJsonSave"
-            @has-error="onError"
+          v-model="resultInfo"
+          :showBtns="false"
+          :mode="'code'"
+          @json-change="onJsonChange"
+          @json-save="onJsonSave"
+          @has-error="onError"
         />
       </div>
     </baseRightDialog>
@@ -616,6 +617,7 @@ export default {
       stepZeroForm: {
         needLogin: '1',
         enableAccessEntry: ['2']
+
       }, //步骤1表（数据）
       stepOneformRow: [
         {
@@ -685,13 +687,38 @@ export default {
               message: 'TPS'
             }
           ]
+        },
+        {
+          elCol: [
+            {
+              type: 'radio',
+              title: '是否扩展API',
+              maxlength: 200,
+              id: 'extensionApi',
+              pattern: '',
+              message: 'URL或协议不合法',
+              row: 24,
+              required: true,
+              options: [
+                {
+                  label: '是',
+                  id: '1'
+                },
+                {
+                  label: '否',
+                  id: '2'
+                }
+              ]
+            }
+          ]
         }
       ],//步骤2表
       stepOneForm: {
         requestCoding: '1',
         timeoutPeriod: 10000,
         currentLimiting: 100,
-        requestMethod: '1'
+        requestMethod: '1',
+        extensionApi: '1'
       }, //步骤2表（数据）
       stepThreeRadio: 1, //没用了（穿透配置）
       stepThreeRadioOptions: [
@@ -1121,6 +1148,231 @@ export default {
     }
   },
   methods: {
+    //当步骤二中的是否拓展api改变时如果为1则内部名称和方法名称需必填
+    stepOneChangeRadio(val, index, indexRow, row) {
+      console.log(row)
+      if (row.id === 'extensionApi') {
+        if (val == 1) {
+          this.stepOneformRow = [
+            {
+              elCol: [
+                {
+                  type: 'input',
+                  title: '目标地址',
+                  maxlength: 200,
+                  id: 'destinationAddress',
+                  pattern: '',
+                  message: 'URL或协议不合法',
+                  row: 24,
+                  required: true
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'select',
+                  title: '请求编码',
+                  id: 'requestCoding',
+                  row: 24,
+                  required: true,
+                  options: []
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'select',
+                  title: '请求方法',
+                  id: 'requestMethod',
+                  row: 24,
+                  required: true,
+                  options: []
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'num',
+                  title: '超出时间',
+                  id: 'timeoutPeriod',
+                  row: 24,
+                  min: 1,
+                  max: 600000,
+                  maxlength: 50,
+                  required: true,
+                  message: 'ms'
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'num',
+                  title: '限流',
+                  maxlength: 50,
+                  id: 'currentLimiting',
+                  min: 1,
+                  row: 24,
+                  max: 1000,
+                  required: true,
+                  message: 'TPS'
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'radio',
+                  title: '是否扩展API',
+                  maxlength: 200,
+                  id: 'extensionApi',
+                  pattern: '',
+                  message: 'URL或协议不合法',
+                  row: 24,
+                  required: true,
+                  options: [
+                    {
+                      label: '是',
+                      id: '1'
+                    },
+                    {
+                      label: '否',
+                      id: '2'
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'input',
+                  title: '内部bean名称',
+                  maxlength: 200,
+                  id: 'beanName',
+                  pattern: '',
+                  message: 'URL或协议不合法',
+                  row: 24,
+                  required: true
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'input',
+                  title: '方法名称',
+                  maxlength: 200,
+                  id: 'funName',
+                  pattern: '',
+                  message: 'URL或协议不合法',
+                  row: 24,
+                  required: true
+                }
+              ]
+            }
+          ]
+        } else {
+          this.stepOneformRow = [
+            {
+              elCol: [
+                {
+                  type: 'input',
+                  title: '目标地址',
+                  maxlength: 200,
+                  id: 'destinationAddress',
+                  pattern: '',
+                  message: 'URL或协议不合法',
+                  row: 24,
+                  required: true
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'select',
+                  title: '请求编码',
+                  id: 'requestCoding',
+                  row: 24,
+                  required: true,
+                  options: []
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'select',
+                  title: '请求方法',
+                  id: 'requestMethod',
+                  row: 24,
+                  required: true,
+                  options: []
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'num',
+                  title: '超出时间',
+                  id: 'timeoutPeriod',
+                  row: 24,
+                  min: 1,
+                  max: 600000,
+                  maxlength: 50,
+                  required: true,
+                  message: 'ms'
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'num',
+                  title: '限流',
+                  maxlength: 50,
+                  id: 'currentLimiting',
+                  min: 1,
+                  row: 24,
+                  max: 1000,
+                  required: true,
+                  message: 'TPS'
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'radio',
+                  title: '是否扩展API',
+                  maxlength: 200,
+                  id: 'extensionApi',
+                  pattern: '',
+                  message: 'URL或协议不合法',
+                  row: 24,
+                  required: true,
+                  options: [
+                    {
+                      label: '是',
+                      id: '1'
+                    },
+                    {
+                      label: '否',
+                      id: '2'
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      }
+    },
     // 选项卡点击事件
     handleSelect(key, keyPath) {
       this.activeIndex = key
@@ -1263,10 +1515,10 @@ export default {
     // 子下拉框改变处理
     sonSelectChangeHandle(val, row) {
       if (
-          val != 'Object' &&
-          val != 'ObjectCom' &&
-          val != 'Map' &&
-          row[0].children
+        val != 'Object' &&
+        val != 'ObjectCom' &&
+        val != 'Map' &&
+        row[0].children
       ) {
         this.$delete(row[0], 'children')
       }
@@ -1280,12 +1532,12 @@ export default {
     async getEditInfo() {
       console.log(this.$route.query.apiId, 'id')
       const res = await getApiModuleApi(
-          {
-            tl: 'sysApplicationService',
-            as: 'application',
-            dj: 'getAppApi'
-          },
-          { id: this.$route.query.apiId }
+        {
+          tl: 'sysApplicationService',
+          as: 'application',
+          dj: 'getAppApi'
+        },
+        { id: this.$route.query.apiId }
       )
       if (res.status == 200) {
         let obj0 = {}
@@ -1323,8 +1575,231 @@ export default {
         obj1['requestMethod'] = res.attribute.requestMethod
         obj1['timeoutPeriod'] = res.attribute.timeoutPeriod
         obj1['currentLimiting'] = res.attribute.currentLimiting
+        obj1['extensionApi'] = res.attribute.extensionApi
+        obj1['funName'] = res.attribute.funName
+        obj1['beanName'] = res.attribute.beanName
         this.stepZeroForm = obj0
         this.stepOneForm = obj1
+        //这里和stepOneChangeRadio方法一个道理 需要判断是否必填
+        if (this.stepOneForm.extensionApi == 1) {
+          this.stepOneformRow = [
+            {
+              elCol: [
+                {
+                  type: 'input',
+                  title: '目标地址',
+                  maxlength: 200,
+                  id: 'destinationAddress',
+                  pattern: '',
+                  message: 'URL或协议不合法',
+                  row: 24,
+                  required: true
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'select',
+                  title: '请求编码',
+                  id: 'requestCoding',
+                  row: 24,
+                  required: true,
+                  options: []
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'select',
+                  title: '请求方法',
+                  id: 'requestMethod',
+                  row: 24,
+                  required: true,
+                  options: []
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'num',
+                  title: '超出时间',
+                  id: 'timeoutPeriod',
+                  row: 24,
+                  min: 1,
+                  max: 600000,
+                  maxlength: 50,
+                  required: true,
+                  message: 'ms'
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'num',
+                  title: '限流',
+                  maxlength: 50,
+                  id: 'currentLimiting',
+                  min: 1,
+                  row: 24,
+                  max: 1000,
+                  required: true,
+                  message: 'TPS'
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'radio',
+                  title: '是否扩展API',
+                  maxlength: 200,
+                  id: 'extensionApi',
+                  pattern: '',
+                  message: 'URL或协议不合法',
+                  row: 24,
+                  required: true,
+                  options: [
+                    {
+                      label: '是',
+                      id: '1'
+                    },
+                    {
+                      label: '否',
+                      id: '2'
+                    }
+                  ]
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'input',
+                  title: '内部bean名称',
+                  maxlength: 200,
+                  id: 'beanName',
+                  pattern: '',
+                  message: 'URL或协议不合法',
+                  row: 24,
+                  required: true
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'input',
+                  title: '方法名称',
+                  maxlength: 200,
+                  id: 'funName',
+                  pattern: '',
+                  message: 'URL或协议不合法',
+                  row: 24,
+                  required: true
+                }
+              ]
+            }
+          ]
+        } else {
+          this.stepOneformRow = [
+            {
+              elCol: [
+                {
+                  type: 'input',
+                  title: '目标地址',
+                  maxlength: 200,
+                  id: 'destinationAddress',
+                  pattern: '',
+                  message: 'URL或协议不合法',
+                  row: 24,
+                  required: true
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'select',
+                  title: '请求编码',
+                  id: 'requestCoding',
+                  row: 24,
+                  required: true,
+                  options: []
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'select',
+                  title: '请求方法',
+                  id: 'requestMethod',
+                  row: 24,
+                  required: true,
+                  options: []
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'num',
+                  title: '超出时间',
+                  id: 'timeoutPeriod',
+                  row: 24,
+                  min: 1,
+                  max: 600000,
+                  maxlength: 50,
+                  required: true,
+                  message: 'ms'
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'num',
+                  title: '限流',
+                  maxlength: 50,
+                  id: 'currentLimiting',
+                  min: 1,
+                  row: 24,
+                  max: 1000,
+                  required: true,
+                  message: 'TPS'
+                }
+              ]
+            },
+            {
+              elCol: [
+                {
+                  type: 'radio',
+                  title: '是否扩展API',
+                  maxlength: 200,
+                  id: 'extensionApi',
+                  pattern: '',
+                  message: 'URL或协议不合法',
+                  row: 24,
+                  required: true,
+                  options: [
+                    {
+                      label: '是',
+                      id: '1'
+                    },
+                    {
+                      label: '否',
+                      id: '2'
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
         this.$set(this.returnedForm, 'returnSuccessField', res.attribute.returnSuccessField)
         this.$set(this.returnedForm, 'returnSuccessValue', res.attribute.returnSuccessValue)
         this.$set(this.returnedForm, 'returnMsg', res.attribute.returnMsg)
@@ -1344,15 +1819,15 @@ export default {
     },
     async initRequestCoding() {
       const res = await getApiModuleApi(
-          {
-            tl: 'generalServiceImpl',
-            as: 'dictionaryshop',
-            dj: 'selectDictionaryshop'
-          },
-          {
-            tab_name: 'sys_app_api',
-            column_name: 'request_coding'
-          }
+        {
+          tl: 'generalServiceImpl',
+          as: 'dictionaryshop',
+          dj: 'selectDictionaryshop'
+        },
+        {
+          tab_name: 'sys_app_api',
+          column_name: 'request_coding'
+        }
       )
       if (res.status == 200) {
         res.attribute.forEach((item) => {
@@ -1365,15 +1840,15 @@ export default {
     },
     async initRequestMethod() {
       const res = await getApiModuleApi(
-          {
-            tl: 'generalServiceImpl',
-            as: 'dictionaryshop',
-            dj: 'selectDictionaryshop'
-          },
-          {
-            tab_name: 'sys_app_api',
-            column_name: 'request_method'
-          }
+        {
+          tl: 'generalServiceImpl',
+          as: 'dictionaryshop',
+          dj: 'selectDictionaryshop'
+        },
+        {
+          tab_name: 'sys_app_api',
+          column_name: 'request_method'
+        }
       )
       if (res.status == 200) {
         res.attribute.forEach((item) => {
@@ -1420,12 +1895,12 @@ export default {
       if (this.$route.query.add) {
         console.log(obj)
         const res = await getApiModuleApi(
-            {
-              tl: 'sysApplicationService',
-              as: 'application',
-              dj: 'saveApi'
-            },
-            obj
+          {
+            tl: 'sysApplicationService',
+            as: 'application',
+            dj: 'saveApi'
+          },
+          obj
         )
         if (res.status == 200) {
           this.$message({
@@ -1437,12 +1912,12 @@ export default {
       } else {
         obj['id'] = this.$route.query.apiId
         const res = await getApiModuleApi(
-            {
-              tl: 'sysApplicationService',
-              as: 'application',
-              dj: 'updateApi'
-            },
-            obj
+          {
+            tl: 'sysApplicationService',
+            as: 'application',
+            dj: 'updateApi'
+          },
+          obj
         )
         if (res.status == 200) {
           this.$message({
@@ -1484,17 +1959,17 @@ export default {
     tableButtonHandle(row, item, data) {
       if (item.type === 'dele') {
         this.$confirm('确认删除？')
-            .then(() => {
-              this.idWatch(data, row.id)
-            })
-            .catch(() => {
-            })
+          .then(() => {
+            this.idWatch(data, row.id)
+          })
+          .catch(() => {
+          })
       } else if (item.type === 'addattr') {
         console.log(row)
         if (
-            row.concreteType != 'Object' &&
-            row.concreteType != 'Map' &&
-            row.concreteType != 'ObjectCom'
+          row.concreteType != 'Object' &&
+          row.concreteType != 'Map' &&
+          row.concreteType != 'ObjectCom'
         ) {
           this.$notify({
             title: '添加失败',
@@ -1637,34 +2112,34 @@ export default {
     },
     clearTableData() {
       this.queryTableInfo.tableData = this.queryTableInfo.tableData.filter(
-          (item) => {
-            return item.parameterType != 'authport'
-          }
+        (item) => {
+          return item.parameterType != 'authport'
+        }
       )
       this.bodyEntTableInfo.tableData = this.bodyEntTableInfo.tableData.filter(
-          (item) => {
-            return item.parameterType != 'authport'
-          }
+        (item) => {
+          return item.parameterType != 'authport'
+        }
       )
       this.bodyExitTableInfo.tableData =
-          this.bodyExitTableInfo.tableData.filter((item) => {
-            return item.parameterType != 'authport'
-          })
+        this.bodyExitTableInfo.tableData.filter((item) => {
+          return item.parameterType != 'authport'
+        })
       this.headersTableInfo.tableData = this.headersTableInfo.tableData.filter(
-          (item) => {
-            return item.parameterType != 'authport'
-          }
+        (item) => {
+          return item.parameterType != 'authport'
+        }
       )
     },
     //点击下一步如果有认证接口则请求
     async getAuthInfo(id) {
       const res = await getApiModuleApi(
-          {
-            tl: 'sysApplicationService',
-            as: 'application',
-            dj: 'getAppApi'
-          },
-          { id }
+        {
+          tl: 'sysApplicationService',
+          as: 'application',
+          dj: 'getAppApi'
+        },
+        { id }
       )
       console.log(res)
       if (res.status == 200) {
diff --git a/src/views/systemMaintenance/buttonManagement/index.vue b/src/views/systemMaintenance/buttonManagement/index.vue
index c753507..39df0d2 100644
--- a/src/views/systemMaintenance/buttonManagement/index.vue
+++ b/src/views/systemMaintenance/buttonManagement/index.vue
@@ -45,7 +45,7 @@
 
 <script>
 import baseTable from '@/components/base/baseTable'
-import baseLayout from "@/components/base/baseNewLayout"
+import baseLayout from '@/components/base/baseNewLayout'
 import baseDialog from '@/components/base/BaseNewDialog/index.vue'
 import baseTree from '@/components/base/BaseMenuTree/index.vue'
 import baseForm from '@/components/base/baseNewForm/index.vue'
@@ -106,7 +106,9 @@ export default {
         pageSize: 20,
         menuId: '',
         pageNum: 1
-      }
+      },
+      radioRow: {},//当前选中行
+      clickTreeRow: {}//当前选中树
     }
   },
   computed: {
@@ -132,6 +134,7 @@ export default {
     },
     // 树状图点击事件
     handleNodeClick(data) {
+      this.clickTreeRow = data
       this.pageModel.menuId = data.id
       this.pageModel.pageNum = 1
       this.RefreshTable()
@@ -155,6 +158,7 @@ export default {
     radioChange(val) {
       this.radioIndex = val.index
       this.radioID = val.id
+      this.radioRow = val
     },
     async getTableData() {
       this.tabLoading = true
@@ -222,6 +226,10 @@ export default {
           this.$vmNews('请选择一条数据')
           return
         }
+        if(this.clickTreeRow.formId){
+          this.$vmNews("系统自动生成的按钮无法删除")
+          return
+        }
         this.$confirm('确定删除吗？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
diff --git a/src/views/systemMaintenance/menuManagement/index.vue b/src/views/systemMaintenance/menuManagement/index.vue
index ebd8c9c..4b7bc7b 100644
--- a/src/views/systemMaintenance/menuManagement/index.vue
+++ b/src/views/systemMaintenance/menuManagement/index.vue
@@ -8,17 +8,20 @@
       <div slot="main" flex style="height:100%">
         <div style="width: 100%;border-right:1px solid #dfe6ec;height:100%;overflow: auto;">
           <base-tree ref="baseTree" :isCenter="false" :isSaveBtn="false" :Allshow="false" :expandAll="true"
-                     :showCheckbox="false" :menuData="menuData" @handleNodeClick="formClick">
+                     :showCheckbox="false" :menuData="menuData" @handleNodeClick="formClick"
+          >
           </base-tree>
         </div>
 
       </div>
     </base-layout>
     <base-layout title="菜单树编辑区" :defaultButtonSwitch="false" :buttonList="buttonList" @onFuncBtn="getFuncBtn"
-                 style="flex:1;">
+                 style="flex:1;"
+    >
       <div slot="main" style="padding:0 12px;height:300px">
         <base-form ref="customForm" :formRow="formRow" :isFunBtn="isFunBtn" @elDialogClick="elDialogClick"
-                   :formdata="ruleForm" @onSubmit="getSubmit">
+                   :formdata="ruleForm" @onSubmit="getSubmit"
+        >
         </base-form>
       </div>
     </base-layout>
@@ -29,15 +32,15 @@
 
 <script>
 import router from '@/router'
-import baseLayout from "@/components/base/baseNewLayout"
-import baseForm from "@/components/base/baseNewForm/index.vue"
-import baseTree from "@/components/base/BaseMenuTree/index.vue"
-import baseTreeclick from "@/components/base/baseTreeClick/index.vue"
-import baseDialog from "@/components/base/BaseNewDialog"
-import baseOrganization from "@/components/base/baseOrganization"
-import configData from "./configData";
+import baseLayout from '@/components/base/baseNewLayout'
+import baseForm from '@/components/base/baseNewForm/index.vue'
+import baseTree from '@/components/base/BaseMenuTree/index.vue'
+import baseTreeclick from '@/components/base/baseTreeClick/index.vue'
+import baseDialog from '@/components/base/BaseNewDialog'
+import baseOrganization from '@/components/base/baseOrganization'
+import configData from './configData'
 import {
-  GetOrganTree,
+  GetOrganTree
 } from '@/api/apis/organization'
 import {
   GetMenuTree,
@@ -46,6 +49,7 @@ import {
   MenuDelData
 } from '@/api/apis/menuManage'
 import { authApi } from '@/api/apis/auth'
+
 export default {
   components: {
     baseLayout,
@@ -75,7 +79,7 @@ export default {
           menuName: '删除节点',
           icon: 'el-icon-delete',
           type: 'danger'
-        },
+        }
       ],
       delId: '',
       menuData: [],
@@ -83,6 +87,7 @@ export default {
       rules: {},
       formRow: configData.formRow,
       isFunBtn: true,
+      clickTree: {}//当前点击树
 
     }
   },
@@ -98,7 +103,7 @@ export default {
     },
     // 获得树状图
     async getMenuData() {
-      let res = await authApi('sysMenuConfigService','','queryEntityTree','',{})
+      let res = await authApi('sysMenuConfigService', '', 'queryEntityTree', '', {})
       if (res.status == 200) {
         let arr = res.attribute[0]
         this.menuData = res.attribute
@@ -109,8 +114,8 @@ export default {
 
       if (btnEven.menuName == '新增根节点') {
         let newRuleForm = {
-          parentMenuName: "",
-          parentMenuId: 0,
+          parentMenuName: '',
+          parentMenuId: 0
         }
         this.$nextTick(() => {
           this.$refs.customForm.resetForm('ruleForm')
@@ -126,14 +131,17 @@ export default {
           parentMenuName: this.ruleForm.menuName,
           parentMenuId: this.ruleForm.id
         }
-        console.log(newRuleForm,'newRuleForm')
+        console.log(newRuleForm, 'newRuleForm')
         this.$nextTick(() => {
           this.$refs.customForm.resetForm('ruleForm')
           this.$refs.customForm.choiceAssignment(newRuleForm)
         })
       }
       if (btnEven.menuName == '删除节点') {
-
+        if(this.clickTree.formId){
+          this.$vmNews("系统自动生成的菜单不允许删除")
+          return
+        }
         this.$confirm('确认删除该菜单吗?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -144,15 +152,15 @@ export default {
           this.$message({
             type: 'info',
             message: '已取消删除'
-          });
-        });
+          })
+        })
       }
     },
     async menuDel() {
       let params = {
         id: this.delId
       }
-      let res = await authApi('sysMenuConfigService','','deleteEntity','',params)
+      let res = await authApi('sysMenuConfigService', '', 'deleteEntity', '', params)
       if (res.status == 200) {
         this.$vmNews('删除成功', 'success')
         this.ruleForm = {}
@@ -165,9 +173,9 @@ export default {
       let params = {
         id: id
       }
-      let res = await authApi('sysMenuConfigService','','getEntity','',params)
+      let res = await authApi('sysMenuConfigService', '', 'getEntity', '', params)
       if (res.status == 200) {
-        console.log(res,'res')
+        console.log(res, 'res')
         this.ruleForm = res.attribute
         this.$nextTick(() => {
           this.$refs.customForm.choiceAssignment(res.attribute)
@@ -179,10 +187,10 @@ export default {
         ...data
       }
       let res
-      if(params.id){
-        res = await authApi("sysMenuConfigService","","updateEntity","",params)
-      }else{
-        res = await authApi("sysMenuConfigService","","saveEntity","",params)
+      if (params.id) {
+        res = await authApi('sysMenuConfigService', '', 'updateEntity', '', params)
+      } else {
+        res = await authApi('sysMenuConfigService', '', 'saveEntity', '', params)
       }
       if (res.status == 200) {
         this.$vmNews('保存成功', 'success')
@@ -204,7 +212,7 @@ export default {
       this.$refs.baseOrganization.dialogVisible = true
     },
     handleConfirmClick(val) {
-      console.log(val, "val");
+      console.log(val, 'val')
       this.ruleForm.parentMenuName = val.label
       this.ruleForm.parentMenuId = val.id
       this.$refs.customForm.incomingParameters(this.ruleForm)
@@ -212,9 +220,10 @@ export default {
     },
     formClick(data) {
       this.delId = data.id
+      this.clickTree = data
       this.getDetail(data.id)
-    },
-  },
+    }
+  }
 }
 </script>