From cdfa96bc879e961022f3bf28be9cd376d7600b88 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Fri, 21 Jan 2022 11:11:08 +0800
Subject: [PATCH 1/3] edit

---
 .../routes/menu-manager/components/index/index.component.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/routes/menu-manager/components/index/index.component.html b/src/app/routes/menu-manager/components/index/index.component.html
index 8f9787ff..d969cacd 100644
--- a/src/app/routes/menu-manager/components/index/index.component.html
+++ b/src/app/routes/menu-manager/components/index/index.component.html
@@ -10,10 +10,10 @@
       <button nz-button nzType="primary" [nzLoading]="service.http.loading"
         (click)="loadMemu(selectedPlatform.appId)">查询</button>
       <button nz-button (click)="resetSF()">重置</button>
-      <button nz-button (click)="delMenu(0)" [nzLoading]="service.http.loading">
+      <!--  <button nz-button (click)="delMenu(0)" [nzLoading]="service.http.loading">
         清空货主菜单
       </button>
-      <!--  <button nz-button (click)="delMenu(1)" [nzLoading]="service.http.loading">
+      <button nz-button (click)="delMenu(1)" [nzLoading]="service.http.loading">
         清空运营后台菜单
       </button> -->
     </div>

From 7c821be0503ee23354864a4ac47bbbb9b2c0907f Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Fri, 21 Jan 2022 11:17:29 +0800
Subject: [PATCH 2/3] edit

---
 .../components/btn-management/btn-management.component.ts   | 4 ++--
 src/assets/mocks/menu-data.json                             | 6 ------
 src/assets/mocks/platform/tms-obc-web.json                  | 6 ------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/app/routes/sys-setting/components/btn-management/btn-management.component.ts b/src/app/routes/sys-setting/components/btn-management/btn-management.component.ts
index 36c5e6a9..512ad7bc 100644
--- a/src/app/routes/sys-setting/components/btn-management/btn-management.component.ts
+++ b/src/app/routes/sys-setting/components/btn-management/btn-management.component.ts
@@ -37,11 +37,11 @@ export class BtnManagementComponent implements OnInit {
       title: '操作',
       buttons: [
         {
-          code: '编辑',
+          text: '编辑',
           click: item => this.roleAction(item, 2)
         },
         {
-          code: '删除',
+          text: '删除',
           click: item => this.deleteAction(item)
         },
       ]
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index fd49e41e..a059ea46 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -118,12 +118,6 @@
                 "link": "/supply-management/index",
                 "reuse": true
               },
-              {
-                "text": "货源管理",
-                "icon": "anticon anticon-dashboard",
-                "link": "/supply-management/index",
-                "hide": true
-              },
               {
                 "text": "货源详情",
                 "icon": "anticon anticon-dashboard",
diff --git a/src/assets/mocks/platform/tms-obc-web.json b/src/assets/mocks/platform/tms-obc-web.json
index 905d7c79..1716b49f 100644
--- a/src/assets/mocks/platform/tms-obc-web.json
+++ b/src/assets/mocks/platform/tms-obc-web.json
@@ -116,12 +116,6 @@
               "link": "/supply-management/index",
               "reuse": true
             },
-            {
-              "text": "货源管理",
-              "icon": "anticon anticon-dashboard",
-              "link": "/supply-management/index",
-              "hide": true
-            },
             {
               "text": "货源详情",
               "icon": "anticon anticon-dashboard",

From eed0749612bc70a951e1d2b23aad360407995893 Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Fri, 21 Jan 2022 11:28:50 +0800
Subject: [PATCH 3/3] edit

---
 .../components/index/menu-modal/menu-modal.component.html    | 3 +--
 .../components/index/menu-modal/menu-modal.component.ts      | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/routes/menu-manager/components/index/menu-modal/menu-modal.component.html b/src/app/routes/menu-manager/components/index/menu-modal/menu-modal.component.html
index d243c49b..31848fe4 100644
--- a/src/app/routes/menu-manager/components/index/menu-modal/menu-modal.component.html
+++ b/src/app/routes/menu-manager/components/index/menu-modal/menu-modal.component.html
@@ -4,6 +4,5 @@
 
 <div class="modal-footer">
     <button nz-button type="button" (click)="close()">{{ isDisabled ? '关闭' : '取消' }}</button>
-    <button nz-button type="button" nzType="primary" (click)="sure()" *ngIf="!isDisabled"
-        [disabled]="!sf?.valid">确定</button>
+    <button nz-button type="button" nzType="primary" (click)="sure()" *ngIf="!isDisabled">确定</button>
 </div>
\ No newline at end of file
diff --git a/src/app/routes/menu-manager/components/index/menu-modal/menu-modal.component.ts b/src/app/routes/menu-manager/components/index/menu-modal/menu-modal.component.ts
index 3d1b6f77..5ff57973 100644
--- a/src/app/routes/menu-manager/components/index/menu-modal/menu-modal.component.ts
+++ b/src/app/routes/menu-manager/components/index/menu-modal/menu-modal.component.ts
@@ -76,7 +76,6 @@ export class MenuModalComponent implements OnInit {
           title: '菜单路由',
           type: 'string',
           default: this.formData.link,
-          maxLength: 20,
           ui: {
             widget: this.isDisabled ? 'text' : 'string',
             placeholder: '请输入菜单路由'
@@ -125,6 +124,10 @@ export class MenuModalComponent implements OnInit {
   }
 
   sure() {
+    if (!this.sf.valid) {
+      this.service.msgSrv.warning('表单验证错误');
+      return;
+    }
     const params = {
       ...this.sf.value,
       ...this.params,