Merge branch 'dev' into test

src/pages/member/memberMaintain/addMember.tsx

@@ -90,7 +90,7 @@ const AddMember: React.FC<any> = props => {
     const { 
       memberTypeId, 
       roleId, 
-      levelId, 
+      level, 
       countryCodeId, 
       phone, 
       email, 
@@ -100,7 +100,6 @@ const AddMember: React.FC<any> = props => {
       statusName, 
       
       currentOuterStep, 
-      level, 
       outerVerifySteps, 
       validateId, 
       ...rest 
@@ -115,7 +114,7 @@ const AddMember: React.FC<any> = props => {
       PublicApi.postMemberMaintenanceAddmember({
         memberTypeId, 
         roleId, 
-        levelId, 
+        level, 
         countryCodeId, 
         phone, 
         email, 
@@ -143,7 +142,7 @@ const AddMember: React.FC<any> = props => {
         validateId, 
         memberTypeId, 
         roleId, 
-        levelId, 
+        level, 
         countryCodeId, 
         phone, 
         email, 
@@ -212,8 +211,8 @@ const AddMember: React.FC<any> = props => {
       }
       linkage.value('roleId', undefined);
       linkage.enum('roleId', []);
-      linkage.value('levelId', undefined);
-      linkage.enum('levelId', []);
+      linkage.value('level', undefined);
+      linkage.enum('level', []);
     });
 
     // 根据会员角色，查询其他注册资料
@@ -233,8 +232,8 @@ const AddMember: React.FC<any> = props => {
     
     // 手动触发改变的话重置等级下拉框
     onFieldInputChange$('*(memberTypeId,roleId)').subscribe(() => {
-      linkage.value('levelId', undefined);
-      linkage.enum('levelId', []);
+      linkage.value('level', undefined);
+      linkage.enum('level', []);
     });
 
     // 根据会员类型和角色，查询等级下拉
@@ -247,7 +246,7 @@ const AddMember: React.FC<any> = props => {
         const otherValue = formActions.getFieldState(otherName, state => state.value);
   
         if (selfValue && otherValue) {
-          linkage.loading('levelId');
+          linkage.loading('level');
   
           PublicApi.getMemberMaintenanceAddpageitemsLevel({
             memberTypeId: selfName == 'memberTypeId' ? selfValue : otherValue, 
@@ -257,11 +256,11 @@ const AddMember: React.FC<any> = props => {
           }).then(res => {
             if (res.code === 1000) {
               const { data = [] } = res;
-              const options = data.map(item => ({ label: item.levelTag, value: item.levelId }));
-              linkage.enum('levelId', options);
+              const options = data.map(item => ({ label: item.levelTag, value: item.level }));
+              linkage.enum('level', options);
             }
           }).finally(() => {
-            linkage.loaded('levelId');
+            linkage.loaded('level');
           });
         }
       }, 0);

src/pages/member/memberMaintain/schema/index.tsx

@@ -245,7 +245,7 @@ export const initDetailSchema = (props: any) => {
                   hasFeedback: true, 
                 },
               },
-              levelId: {
+              level: {
                 type: 'string',
                 required: true,
                 title: '会员等级',