Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

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>

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"
+    <button nz-button type="button" nzType="primary" (click)="sure()" *ngIf="!isDisabled">确定</button>
-        [disabled]="!sf?.valid">确定</button>
 </div>

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,

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)
         },
       ]

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",

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",