回退user accountName

lib/base-app-domain/User/Schema.d.ts

@@ -15,7 +15,6 @@ export type OpSchema = EntityShape & {
     nickname?: String<64> | null;
     password?: Text | null;
     refId?: ForeignKey<"user"> | null;
-    accountName?: String<32> | null;
     userState?: UserState | null;
 };
 export type OpAttr = keyof OpSchema;
@@ -24,7 +23,6 @@ export type Schema = EntityShape & {
     nickname?: String<64> | null;
     password?: Text | null;
     refId?: ForeignKey<"user"> | null;
-    accountName?: String<32> | null;
     userState?: UserState | null;
     ref?: Schema | null;
     oper$operator?: Array<Oper.Schema>;
@@ -52,7 +50,6 @@ type AttrFilter = {
     password: Q_StringValue;
     refId: Q_StringValue;
     ref: Filter;
-    accountName: Q_StringValue;
     userState: Q_EnumValue<UserState>;
     oper$operator: Oper.Filter & SubQueryPredicateMetadata;
     user$ref: Filter & SubQueryPredicateMetadata;
@@ -74,7 +71,6 @@ export type Projection = {
     password?: number;
     refId?: number;
     ref?: Projection;
-    accountName?: number;
     userState?: number;
     oper$operator?: Oper.Selection & {
         $entity: "oper";
@@ -135,8 +131,6 @@ export type SortAttr = {
     refId: number;
 } | {
     ref: SortAttr;
-} | {
-    accountName: number;
 } | {
     userState: number;
 } | {

lib/base-app-domain/User/Storage.js

@@ -23,30 +23,11 @@ exports.desc = {
             type: "ref",
             ref: "user"
         },
-        accountName: {
-            type: "varchar",
-            params: {
-                length: 32
-            }
-        },
         userState: {
             type: "enum",
             enumeration: ["normal", "merged"]
         }
     },
     actionType: "crud",
-    actions: Action_1.actions,
-    indexes: [
-        {
-            name: 'index_accountName',
-            attributes: [
-                {
-                    name: 'accountName',
-                },
-            ],
-            config: {
-                unique: true,
-            },
-        }
-    ]
+    actions: Action_1.actions
 };

lib/entities/User.d.ts

@@ -7,7 +7,6 @@ export interface Schema extends EntityShape {
     nickname?: String<64>;
     password?: Text;
     ref?: Schema;
-    accountName?: String<32>;
 }
 type UserAction = 'mergeTo';
 type UserState = 'normal' | 'merged';

lib/entities/User.js

@@ -8,19 +8,6 @@ exports.UserActionDef = {
     },
 };
 exports.entityDesc = {
-    indexes: [
-        {
-            name: 'index_accountName',
-            attributes: [
-                {
-                    name: 'accountName',
-                },
-            ],
-            config: {
-                unique: true,
-            },
-        },
-    ],
     locales: {
         zh_CN: {
             name: '用户',
@@ -30,7 +17,6 @@ exports.entityDesc = {
                 password: '密码',
                 ref: '指向用户',
                 userState: '状态',
-                accountName: '账号名',
             },
             action: {
                 mergeTo: '合并',

src/entities/User.ts

@@ -8,7 +8,6 @@ export interface Schema extends EntityShape {
     nickname?: String<64>;
     password?: Text;
     ref?: Schema;
-    accountName?: String<32>;
 };
 
 type UserAction = 'mergeTo';
@@ -31,19 +30,6 @@ export const entityDesc: EntityDesc<
         userState: UserState;
     }
 > = {
-    indexes: [
-        {
-            name: 'index_accountName',
-            attributes: [
-                {
-                    name: 'accountName',
-                },
-            ],
-            config: {
-                unique: true,
-            },
-        },
-    ],
     locales: {
         zh_CN: {
             name: '用户',
@@ -53,7 +39,6 @@ export const entityDesc: EntityDesc<
                 password: '密码',
                 ref: '指向用户',
                 userState: '状态',
-                accountName: '账号名',
             },
             action: {
                 mergeTo: '合并',