From f04942ddf6b88c0999ebedf53e2817d27896eb47 Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Sun, 9 Oct 2022 13:55:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E4=BA=A4=E6=9C=8D=E5=8A=A1=20?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=20hidden=20scanCode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../socials-provider-editer.component.html    | 98 +++++++++----------
 .../socials-provider.component.html           |  8 ++
 2 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider-editer/socials-provider-editer.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider-editer/socials-provider-editer.component.html
index 3cc0917e6..c2f80a1be 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider-editer/socials-provider-editer.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider-editer/socials-provider-editer.component.html
@@ -4,97 +4,91 @@
     <nz-form-item>
       <nz-form-label [nzMd]="6" nzFor="id">{{ 'mxk.text.id' | i18n }}</nz-form-label>
       <nz-form-control [nzMd]="18" nzErrorTip="The input is not valid id!">
-        <input [(ngModel)]="form.model.id" disabled="{{ isEdit }}" [ngModelOptions]="{ standalone: true }" nz-input name="id" id="id" />
+        <input [(ngModel)]="form.model.id" disabled="{{ isEdit }}" [ngModelOptions]="{ standalone: true }" nz-input
+          name="id" id="id" />
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
-      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="icon">{{ 'mxk.socialsproviders.icon' | i18n }}</nz-form-label>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="icon">{{ 'mxk.socialsproviders.icon' | i18n }}
+      </nz-form-label>
       <nz-form-control [nzSm]="18" [nzMd]="18" [nzXs]="36" [nzXl]="48" nzErrorTip="The input is not valid icon!">
         <input [(ngModel)]="form.model.icon" [ngModelOptions]="{ standalone: true }" nz-input name="icon" id="icon" />
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
-      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="provider">{{ 'mxk.socialsproviders.provider' | i18n }}</nz-form-label>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="provider">{{ 'mxk.socialsproviders.provider' | i18n }}
+      </nz-form-label>
       <nz-form-control [nzSm]="18" [nzMd]="18" [nzXs]="36" [nzXl]="48" nzErrorTip="The input is not valid provider!">
-        <input [(ngModel)]="form.model.provider" [ngModelOptions]="{ standalone: true }" nz-input name="provider" id="provider" />
+        <input [(ngModel)]="form.model.provider" [ngModelOptions]="{ standalone: true }" nz-input name="provider"
+          id="provider" />
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
-      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="providerName">{{ 'mxk.socialsproviders.providerName' | i18n }}</nz-form-label>
-      <nz-form-control [nzSm]="18" [nzMd]="18" [nzXs]="36" [nzXl]="48" nzErrorTip="The input is not valid providerName!">
-        <input
-          [(ngModel)]="form.model.providerName"
-          [ngModelOptions]="{ standalone: true }"
-          nz-input
-          name="providerName"
-          id="providerName"
-        />
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="providerName">{{ 'mxk.socialsproviders.providerName' |
+        i18n }}</nz-form-label>
+      <nz-form-control [nzSm]="18" [nzMd]="18" [nzXs]="36" [nzXl]="48"
+        nzErrorTip="The input is not valid providerName!">
+        <input [(ngModel)]="form.model.providerName" [ngModelOptions]="{ standalone: true }" nz-input
+          name="providerName" id="providerName" />
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
-      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="clientId">{{ 'mxk.socialsproviders.clientId' | i18n }}</nz-form-label>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="clientId">{{ 'mxk.socialsproviders.clientId' | i18n }}
+      </nz-form-label>
       <nz-form-control [nzSm]="18" [nzMd]="18" [nzXs]="36" [nzXl]="48" nzErrorTip="The input is not valid clientId!">
-        <input [(ngModel)]="form.model.clientId" [ngModelOptions]="{ standalone: true }" nz-input name="clientId" id="clientId" />
+        <input [(ngModel)]="form.model.clientId" [ngModelOptions]="{ standalone: true }" nz-input name="clientId"
+          id="clientId" />
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
-      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="clientSecret">{{ 'mxk.socialsproviders.clientSecret' | i18n }}</nz-form-label>
-      <nz-form-control [nzSm]="18" [nzMd]="18" [nzXs]="36" [nzXl]="48" nzErrorTip="The input is not valid clientSecret!">
-        <input
-          [(ngModel)]="form.model.clientSecret"
-          [ngModelOptions]="{ standalone: true }"
-          nz-input
-          name="clientSecret"
-          id="clientSecret"
-        />
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="clientSecret">{{ 'mxk.socialsproviders.clientSecret' |
+        i18n }}</nz-form-label>
+      <nz-form-control [nzSm]="18" [nzMd]="18" [nzXs]="36" [nzXl]="48"
+        nzErrorTip="The input is not valid clientSecret!">
+        <input [(ngModel)]="form.model.clientSecret" [ngModelOptions]="{ standalone: true }" nz-input
+          name="clientSecret" id="clientSecret" />
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="agentId">{{ 'mxk.socialsproviders.agentId' | i18n }}</nz-form-label>
       <nz-form-control [nzSm]="18" [nzMd]="18" [nzXs]="36" [nzXl]="48" nzErrorTip="The input is not valid agentId!">
-        <input [(ngModel)]="form.model.agentId" [ngModelOptions]="{ standalone: true }" nz-input name="agentId" id="agentId" />
+        <input [(ngModel)]="form.model.agentId" [ngModelOptions]="{ standalone: true }" nz-input name="agentId"
+          id="agentId" />
       </nz-form-control>
     </nz-form-item>
     <nz-form-item>
-      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="scanCode">{{ 'mxk.socialsproviders.scanCode' | i18n }}</nz-form-label>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="scanCode">{{ 'mxk.socialsproviders.scanCode' | i18n }}
+      </nz-form-label>
       <nz-form-control [nzSm]="18" [nzMd]="18" [nzXs]="36" [nzXl]="48" nzErrorTip="The input is not valid scanCode!">
         <nz-radio-group [(ngModel)]="form.model.scanCode" [ngModelOptions]="{ standalone: true }" nzButtonStyle="solid">
-          <label nz-radio-button nzValue="none">NONE</label>
-          <label nz-radio-button nzValue="http">HTTP</label>
-          <label nz-radio-button nzValue="https">HTTPS</label>
+          <label nz-radio-button nzValue="false">{{ 'mxk.text.no' | i18n }}</label>
+          <label nz-radio-button nzValue="true">{{ 'mxk.text.yes' | i18n }}</label>
         </nz-radio-group>
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item>
-      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="sortIndex">{{ 'mxk.text.sortIndex' | i18n }}</nz-form-label>
-      <nz-form-control [nzSm]="18" [nzMd]="18" [nzXs]="36" [nzXl]="48" nzErrorTip="The input is not valid sortIndex!">
-        <input [(ngModel)]="form.model.sortIndex" [ngModelOptions]="{ standalone: true }" nz-input name="sortIndex" id="sortIndex" />
-      </nz-form-control>
-    </nz-form-item>
     <nz-form-item>
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="hidden">{{ 'mxk.socialsproviders.hidden' | i18n }}</nz-form-label>
       <nz-form-control [nzSm]="14" [nzXs]="24" nzErrorTip="The input is not valid hidden!">
-        <nz-switch
-          [(ngModel)]="form.model.switch_hidden"
-          [ngModelOptions]="{ standalone: true }"
-          name="hidden"
-          [nzCheckedChildren]="checkedTemplate"
-          [nzUnCheckedChildren]="unCheckedTemplate"
-        ></nz-switch>
-        <ng-template #checkedTemplate><i nz-icon nzType="check"></i></ng-template>
-        <ng-template #unCheckedTemplate><i nz-icon nzType="close"></i></ng-template>
+        <nz-radio-group [(ngModel)]="form.model.hidden" [ngModelOptions]="{ standalone: true }" nzButtonStyle="solid">
+          <label nz-radio-button nzValue="false">{{ 'mxk.text.no' | i18n }}</label>
+          <label nz-radio-button nzValue="true">{{ 'mxk.text.yes' | i18n }}</label>
+        </nz-radio-group>
       </nz-form-control>
     </nz-form-item>
+    <nz-form-item>
+      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="sortIndex">{{ 'mxk.text.sortIndex' | i18n }}
+      </nz-form-label>
+      <nz-form-control [nzSm]="18" [nzMd]="18" [nzXs]="36" [nzXl]="48" nzErrorTip="The input is not valid sortIndex!">
+        <input [(ngModel)]="form.model.sortIndex" [ngModelOptions]="{ standalone: true }" nz-input name="sortIndex"
+          id="sortIndex" />
+      </nz-form-control>
+    </nz-form-item>
+
     <nz-form-item>
       <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="status">{{ 'mxk.text.status' | i18n }}</nz-form-label>
       <nz-form-control [nzSm]="14" [nzXs]="24" nzErrorTip="The input is not valid status!">
-        <nz-switch
-          [(ngModel)]="form.model.switch_status"
-          [ngModelOptions]="{ standalone: true }"
-          name="status"
-          [nzCheckedChildren]="checkedTemplate"
-          [nzUnCheckedChildren]="unCheckedTemplate"
-        ></nz-switch>
+        <nz-switch [(ngModel)]="form.model.switch_status" [ngModelOptions]="{ standalone: true }" name="status"
+          [nzCheckedChildren]="checkedTemplate" [nzUnCheckedChildren]="unCheckedTemplate"></nz-switch>
         <ng-template #checkedTemplate><i nz-icon nzType="check"></i></ng-template>
         <ng-template #unCheckedTemplate><i nz-icon nzType="close"></i></ng-template>
       </nz-form-control>
@@ -105,4 +99,4 @@
 <div *nzModalFooter>
   <button nz-button nzType="default" (click)="onClose($event)">{{ 'mxk.text.close' | i18n }}</button>
   <button nz-button nzType="primary" (click)="onSubmit($event)">{{ 'mxk.text.submit' | i18n }}</button>
-</div>
+</div>
\ No newline at end of file
diff --git a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider.component.html b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider.component.html
index 3542fe18c..4d42fe125 100644
--- a/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider.component.html
+++ b/maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/config/socials-provider/socials-provider.component.html
@@ -44,6 +44,9 @@
         <th nzAlign="center">{{ 'mxk.socialsproviders.provider' | i18n }}</th>
         <th nzAlign="center">{{ 'mxk.socialsproviders.providerName' | i18n }}</th>
         <th nzAlign="center">{{ 'mxk.text.sortIndex' | i18n }}</th>
+        <th nzAlign="center">{{ 'mxk.socialsproviders.hidden' | i18n }}</th>
+        <th nzAlign="center">{{ 'mxk.socialsproviders.scanCode' | i18n }}</th>
+
         <th nzAlign="center">{{ 'mxk.text.status' | i18n }}</th>
         <th nzAlign="center"><a>{{ 'mxk.text.action' | i18n }}</a></th>
       </tr>
@@ -59,6 +62,11 @@
         <td nzAlign="left"> {{ data.provider }}</td>
         <td nzAlign="left"> {{ data.providerName }}</td>
         <td nzAlign="center"> {{ data.sortIndex }}</td>
+        <td nzAlign="center"> <i *ngIf="data.hidden == 'true'" nz-icon nzType="check-circle" nzTheme="fill"
+            style="color: green"></i></td>
+        <td nzAlign="center"> <i *ngIf="data.scanCode == 'true'" nz-icon nzType="check-circle" nzTheme="fill"
+            style="color: green"></i></td>
+
         <td nzAlign="center"> <i *ngIf="data.status == 1" nz-icon nzType="check-circle" nzTheme="fill"
             style="color: green"></i></td>
         <td nzAlign="left" nzBreakWord="false">