userRelation的小bug

lib/components/common/empty/empty.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Empty: () => JSX.Element;
 export default Empty;

lib/components/common/empty/simple.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const Empty: () => JSX.Element;
 export default Empty;

lib/components/common/weChatLoginQrCode/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 interface QrCodeProps {
     id?: string;

lib/components/config/upsert/account/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Config } from '../../../../types/Config';
 export default function Account(props: {
     account: Required<Config>['Account'];

lib/components/config/upsert/web.pc.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/components/extraFile/display/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(): JSX.Element;

lib/components/extraFile/gallery/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/components/func/debugPanel/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/address/list/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/address/upsert/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/article/detail/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/article/list/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/article/preview/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/article/upsert/web.d.ts

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 import '@wangeditor/editor/dist/css/style.css';
 export default function render(this: any): JSX.Element;

lib/pages/login/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/mobile/login/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/mobile/me/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/pickers/area/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/platform/config/upsert/web.pc.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/platform/list/web.pc.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/platform/upsert/web.pc.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/token/me/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/user/manage/detail/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/user/manage/upsert/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/user/manage/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/user/manage/web.pc.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/user/search/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(): JSX.Element;

lib/pages/userEntityGrant/confirm/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(): JSX.Element;

lib/pages/userEntityGrant/detail/index.less

@@ -0,0 +1,74 @@
+/**  index.wxss  **/
+@import "../../../config/styles/mp/index.less";
+@import "../../../config/styles/mp/mixins.less";
+
+.page-body {
+  height: 100vh;
+  display: flex;
+  justify-content: center;
+  flex: 1;
+  flex-direction: column;
+  background-color: @primary-color;
+  box-sizing: border-box;
+  .safe-area-inset-bottom();
+}
+.qrcode_view {
+  display: flex;
+  flex-direction: column;
+  background-color: #fff;
+  margin: 0 @spacer-1;
+  padding: @spacer-1;
+  border-radius: 8px;
+  box-shadow: 0px 2px 1px -1px rgba(0,0,0,0.2),0px 1px 1px 0px rgba(0,0,0,0.14),0px 1px 3px 0px rgba(0,0,0,0.12);
+}
+.icon-view {
+  position: absolute;
+  right: 0;
+      width: 50rpx;
+      height: 50rpx;
+      display: flex;
+    align-items: center;
+    justify-content: center;
+      background: @bg-color-fade;
+      border-radius: 50%;
+}
+.icon-view2 {
+      width: 100rpx;
+      height: 100rpx;
+      display: flex;
+    align-items: center;
+    justify-content: center;
+      border-radius: 50%;
+}
+.image {
+  width: 400rpx;
+  height: 400rpx;
+  margin: @spacer-1 0rpx;
+  background-color: @bg-color-fade;
+}
+.row {
+  position: relative;
+  margin-bottom: @spacer-1;
+  display: flex;
+  flex: 1;
+  align-items: center;
+  justify-content: center;
+}
+.col {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  flex: 1;
+}
+.text {
+  color: @text-level-3-color;
+  font-size: 36rpx;
+}
+.tip {
+  color: @primary-color;
+  font-size: 30rpx;
+}
+.relation {
+  font-size: 60rpx;
+  font-weight: bolder;
+}

lib/pages/userEntityGrant/detail/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(): JSX.Element;

lib/pages/userEntityGrant/grant/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/userRelation/list/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/userRelation/list/web.pc.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/userRelation/manage/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/userRelation/onEntity/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/userRelation/onUser/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/userRelation/upsert/byMobile/index.js

@@ -55,7 +55,7 @@ exports.default = OakComponent({
                     switch (_a.label) {
                         case 0:
                             mobileValueReady = (0, validator_1.isMobile)(value);
-                            if (!mobileValueReady) return [3 /*break*/, 5];
+                            if (!mobileValueReady) return [3 /*break*/, 9];
                             return [4 /*yield*/, this.features.cache.refresh('mobile', {
                                     data: {
                                         id: 1,
@@ -70,28 +70,35 @@ exports.default = OakComponent({
                                 })];
                         case 1:
                             data = (_a.sent()).data;
-                            if (!(data.length > 0)) return [3 /*break*/, 2];
-                            this.cleanOperation();
-                            this.setId(data[0].id);
-                            return [3 /*break*/, 4];
+                            if (!(data.length > 0)) return [3 /*break*/, 4];
+                            return [4 /*yield*/, this.cleanOperation()];
                         case 2:
-                            this.cleanOperation();
-                            this.unsetId();
+                            _a.sent();
+                            return [4 /*yield*/, this.setId(data[0].id)];
+                        case 3:
+                            _a.sent();
+                            return [3 /*break*/, 8];
+                        case 4: return [4 /*yield*/, this.cleanOperation()];
+                        case 5:
+                            _a.sent();
+                            return [4 /*yield*/, this.unsetId()];
+                        case 6:
+                            _a.sent();
                             return [4 /*yield*/, this.addOperation({
                                     action: 'create',
                                     data: {
                                         mobile: value,
                                     }
                                 })];
-                        case 3:
+                        case 7:
                             _a.sent();
-                            _a.label = 4;
-                        case 4: return [3 /*break*/, 6];
-                        case 5:
+                            _a.label = 8;
+                        case 8: return [3 /*break*/, 10];
+                        case 9:
                             this.cleanOperation();
                             this.unsetId();
-                            _a.label = 6;
-                        case 6:
+                            _a.label = 10;
+                        case 10:
                             this.setState({
                                 mobileValueReady: mobileValueReady,
                                 mobileValue: value,

lib/pages/userRelation/upsert/byMobile/web.pc.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/userRelation/upsert/byUser/index.js

@@ -43,7 +43,16 @@ exports.default = OakComponent({
             });
         },
         onReset: function () {
-            this.cleanOperation();
+            return tslib_1.__awaiter(this, void 0, void 0, function () {
+                return tslib_1.__generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.cleanOperation()];
+                        case 1:
+                            _a.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            });
         }
     },
 });

lib/pages/userRelation/upsert/byUser/web.module.less

@@ -5,13 +5,4 @@
   box-shadow: 0 2px 3px #0000001a;
   border-radius: 3px;
   padding: 30px 32px;
-}
-.formContainer {
-    padding-top: 32px;
-    width: 676px;
-    margin: 0 auto;
-}
-.tip {
-  font-size: var(--oak-font-size-mark-small);
-  color: var(--oak-warning-color-7);
 }

lib/pages/userRelation/upsert/byUser/web.pc.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/userRelation/upsert/byUserEntityGrant/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/userRelation/upsert/byUserEntityGrant/web.module.less

@@ -1,13 +1,9 @@
 
 
-.formContainer {
-    padding-top: 32px;
-    width: 676px;
-    margin: 0 auto;
-}
-.pageWithPadding {
+
+.container {
   padding: 30px 32px;
   background: var(--oak-bg-color-container);
-  box-shadow: 0 2px 3px rgba(0, 0, 0, 0.1);
-  border-radius: 3px;
+  // box-shadow: 0 2px 3px rgba(0, 0, 0, 0.1);
+  // border-radius: 3px;
 }

lib/pages/userRelation/upsert/byUserEntityGrant/web.pc.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/userRelation/upsert/onUser/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/userRelation/upsert/onUser/web.module.less

@@ -2,15 +2,12 @@
 
 .container {
   background: var(--oak-bg-color-container);
-  box-shadow: 0 2px 3px #0000001a;
-  border-radius: 3px;
+  // box-shadow: 0 2px 3px #0000001a;
+  // border-radius: 3px;
   padding: 30px 32px;
 }
-.formContainer {
-    padding-top: 32px;
-    width: 676px;
-    margin: 0 auto;
-}
+
+
 .tip {
   font-size: var(--oak-font-size-mark-small);
   color: var(--oak-warning-color-7);

lib/pages/userRelation/upsert/onUser/web.pc.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/userRelation/upsert/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/userRelation/upsert/web.pc.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/wechatQrCode/scan/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

lib/pages/wechatUser/login/web.d.ts

@@ -1,2 +1 @@
-/// <reference types="react" />
 export default function render(this: any): JSX.Element;

src/pages/userRelation/upsert/byMobile/index.ts

@@ -50,12 +50,12 @@ export default OakComponent({
                     }
                 });
                 if (data.length > 0) {
-                    this.cleanOperation();
-                    this.setId(data[0].id);
+                    await this.cleanOperation();
+                    await this.setId(data[0].id);
                 }
                 else {
-                    this.cleanOperation();
-                    this.unsetId();
+                    await this.cleanOperation();
+                    await this.unsetId();
                     await this.addOperation({
                         action: 'create',
                         data: {

src/pages/userRelation/upsert/byUser/index.ts

@@ -21,8 +21,8 @@ export default OakComponent({
             await this.execute();
             this.navigateBack();
         },
-        onReset() {
-            this.cleanOperation();
+        async onReset() {
+            await this.cleanOperation();
         }
     },
 });