@nocobase/plugin-users 0.19.0-alpha.9 → 0.20.0-alpha.2

package/dist/client/PasswordField.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const PasswordField: React.FC;

package/dist/client/RoleUsersManager.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const RoleUsersManager: React.FC;

package/dist/client/UserRolesField.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const UserRolesField: React.FC;

package/dist/client/UsersManagement.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const UsersManagement: React.FC;

package/dist/client/hooks.d.ts

@@ -0,0 +1,5 @@
+export declare const useFilterActionProps: () => {
+    options: any;
+    onSubmit(values: any): void;
+    onReset(): void;
+};

package/dist/client/index.d.ts

@@ -1,5 +1,5 @@
 import { Plugin } from '@nocobase/client';
-export declare class PluginUsersClient extends Plugin {
+declare class PluginUsersClient extends Plugin {
     load(): Promise<void>;
 }
 export default PluginUsersClient;

package/dist/client/index.js

@@ -1 +1 @@
-(function(e,n){typeof exports=="object"&&typeof module!="undefined"?n(exports,require("@nocobase/client")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client"],n):(e=typeof globalThis!="undefined"?globalThis:e||self,n(e["@nocobase/plugin-users"]={},e["@nocobase/client"]))})(this,function(e,n){"use strict";var d=(e,n,i)=>new Promise((u,l)=>{var c=s=>{try{t(i.next(s))}catch(o){l(o)}},f=s=>{try{t(i.throw(s))}catch(o){l(o)}},t=s=>s.done?u(s.value):Promise.resolve(s.value).then(c,f);t((i=i.apply(e,n)).next())});class i extends n.Plugin{load(){return d(this,null,function*(){})}}e.PluginUsersClient=i,e.default=i,Object.defineProperties(e,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});
+(function(r,e){typeof exports=="object"&&typeof module!="undefined"?e(exports,require("@nocobase/client"),require("react/jsx-runtime"),require("react"),require("antd"),require("@formily/react"),require("react-i18next"),require("@nocobase/plugin-acl/client")):typeof define=="function"&&define.amd?define(["exports","@nocobase/client","react/jsx-runtime","react","antd","@formily/react","react-i18next","@nocobase/plugin-acl/client"],e):(r=typeof globalThis!="undefined"?globalThis:r||self,e(r["@nocobase/plugin-users"]={},r["@nocobase/client"],r.jsxRuntime,r.react,r.antd,r["@formily/react"],r["react-i18next"],r["@nocobase/plugin-acl"]))})(this,function(r,e,t,l,m,v,g,x){"use strict";var K=Object.defineProperty,E=Object.defineProperties;var j=Object.getOwnPropertyDescriptors;var w=Object.getOwnPropertySymbols;var N=Object.prototype.hasOwnProperty,L=Object.prototype.propertyIsEnumerable;var S=(r,e,t)=>e in r?K(r,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):r[e]=t,f=(r,e)=>{for(var t in e||(e={}))N.call(e,t)&&S(r,t,e[t]);if(w)for(var t of w(e))L.call(e,t)&&S(r,t,e[t]);return r},F=(r,e)=>E(r,j(e));var h=(r,e,t)=>new Promise((l,m)=>{var v=u=>{try{x(t.next(u))}catch(A){m(A)}},g=u=>{try{x(t.throw(u))}catch(A){m(A)}},x=u=>u.done?l(u.value):Promise.resolve(u.value).then(v,g);x((t=t.apply(r,e)).next())});const u={name:"users",fields:[{name:"id",type:"bigInt",autoIncrement:!0,primaryKey:!0,allowNull:!1,uiSchema:{type:"number",title:'{{t("ID")}}',"x-component":"InputNumber","x-read-pretty":!0},interface:"id"},{interface:"input",type:"string",name:"nickname",uiSchema:{type:"string",title:'{{t("Nickname")}}',"x-component":"Input"}},{interface:"input",type:"string",name:"username",unique:!0,uiSchema:{type:"string",title:'{{t("Username")}}',"x-component":"Input","x-validator":{username:!0},required:!0}},{interface:"email",type:"string",name:"email",unique:!0,uiSchema:{type:"string",title:'{{t("Email")}}',"x-component":"Input","x-validator":"email",required:!0}},{interface:"phone",type:"string",name:"phone",unique:!0,uiSchema:{type:"string",title:'{{t("Phone")}}',"x-component":"Input","x-validator":"phone",required:!0}},{interface:"password",type:"password",name:"password",hidden:!0,uiSchema:{type:"string",title:'{{t("Password")}}',"x-component":"Password"}},{interface:"m2m",type:"belongsToMany",name:"roles",target:"roles",foreignKey:"userId",otherKey:"roleName",onDelete:"CASCADE",sourceKey:"id",targetKey:"name",through:"rolesUsers",uiSchema:{type:"array",title:'{{t("Roles")}}',"x-component":"AssociationField","x-component-props":{multiple:!0,fieldNames:{label:"title",value:"name"}}}}]},A={type:"object",properties:{block1:{type:"void","x-decorator":"ResourceActionProvider","x-decorator-props":{collection:u,resourceName:"users",request:{resource:"users",action:"list",params:{pageSize:50,appends:[]}}},properties:{actions:{type:"void","x-component":"ActionBar","x-component-props":{style:{marginBottom:16}},properties:{filter:{type:"void",title:'{{ t("Filter") }}',"x-action":"filter","x-component":"Filter.Action","x-component-props":{icon:"FilterOutlined",useProps:"{{ useFilterActionProps }}"},"x-align":"left"},delete:{type:"void",title:'{{ t("Delete") }}',"x-component":"Action","x-component-props":{useAction:"{{ cm.useBulkDestroyAction }}",confirm:{title:"{{t('Delete users')}}",content:"{{t('Are you sure you want to delete it?')}}"},icon:"DeleteOutlined"}},create:{type:"void",title:'{{t("Add new")}}',"x-component":"Action","x-component-props":{type:"primary",icon:"PlusOutlined"},properties:{drawer:{type:"void","x-component":"Action.Drawer","x-decorator":"Form",title:'{{t("Add user")}}',properties:{nickname:{"x-component":"CollectionField","x-decorator":"FormItem"},username:{"x-component":"CollectionField","x-decorator":"FormItem"},email:{title:'{{t("Email")}}',"x-component":"Input","x-validator":"email","x-decorator":"FormItem",required:!1},phone:{title:'{{t("Phone")}}',"x-component":"Input","x-validator":"phone","x-decorator":"FormItem",required:!1},password:{"x-component":"CollectionField","x-decorator":"FormItem",required:!0},roles:{"x-component":"CollectionField","x-collection-field":"users.roles","x-decorator":"FormItem"},footer:{type:"void","x-component":"Action.Drawer.Footer",properties:{cancel:{title:'{{t("Cancel")}}',"x-component":"Action","x-component-props":{useAction:"{{ cm.useCancelAction }}"}},submit:{title:'{{t("Submit")}}',"x-component":"Action","x-component-props":{type:"primary",useAction:"{{ cm.useCreateAction }}"}}}}}}}}}},table:{type:"void","x-uid":"input","x-component":"Table.Void","x-component-props":{rowKey:"id",rowSelection:{type:"checkbox"},useDataSource:"{{ cm.useDataSourceFromRAC }}"},properties:{column1:{type:"void","x-decorator":"Table.Column.Decorator","x-component":"Table.Column",properties:{nickname:{type:"number","x-component":"CollectionField","x-read-pretty":!0}}},column2:{type:"void","x-decorator":"Table.Column.Decorator","x-component":"Table.Column",properties:{username:{type:"string","x-component":"CollectionField","x-read-pretty":!0}}},column3:{type:"void","x-decorator":"Table.Column.Decorator","x-component":"Table.Column",properties:{email:{type:"string","x-component":"CollectionField","x-read-pretty":!0}}},column4:{type:"void","x-decorator":"Table.Column.Decorator","x-component":"Table.Column",title:'{{t("Roles")}}',properties:{roles:{type:"array","x-component":"UserRolesField"}}},column5:{type:"void",title:'{{t("Actions")}}',"x-component":"Table.Column",properties:{actions:{type:"void","x-component":"Space","x-component-props":{split:"|"},properties:{update:{type:"void",title:'{{t("Edit profile")}}',"x-decorator":"ACLActionProvider","x-acl-action":"users:update","x-component":"Action.Link","x-component-props":{type:"primary"},properties:{drawer:{type:"void","x-component":"Action.Drawer","x-decorator":"Form","x-decorator-props":{useValues:s=>{const o=e.useRecord(),i=e.useRequest(()=>Promise.resolve({data:o}),F(f({},s),{manual:!0})),n=e.useActionContext();return l.useEffect(()=>{n.visible&&i.run()},[n.visible]),i}},title:'{{t("Edit profile")}}',properties:{nickname:{"x-component":"CollectionField","x-decorator":"FormItem"},username:{"x-component":"CollectionField","x-decorator":"FormItem"},email:{title:'{{t("Email")}}',"x-component":"Input","x-validator":"email","x-decorator":"FormItem",required:!1},phone:{title:'{{t("Phone")}}',"x-component":"Input","x-validator":"phone","x-decorator":"FormItem",required:!1},roles:{"x-component":"CollectionField","x-decorator":"FormItem","x-collection-field":"users.roles"},footer:{type:"void","x-component":"Action.Drawer.Footer",properties:{cancel:{title:'{{t("Cancel")}}',"x-component":"Action","x-component-props":{useAction:"{{ cm.useCancelAction }}"}},submit:{title:'{{t("Submit")}}',"x-component":"Action","x-component-props":{type:"primary",useAction:"{{ cm.useUpdateAction }}"}}}}}}}},changePassword:{type:"void",title:'{{t("Change password")}}',"x-decorator":"ACLActionProvider","x-acl-action":"users:update","x-component":"Action.Link","x-component-props":{type:"primary"},properties:{drawer:{type:"void","x-component":"Action.Drawer","x-decorator":"Form",title:'{{t("Change password")}}',properties:{password:{"x-component":"CollectionField","x-component-props":{component:"PasswordField"},"x-decorator":"FormItem",required:!0},footer:{type:"void","x-component":"Action.Drawer.Footer",properties:{cancel:{title:'{{t("Cancel")}}',"x-component":"Action","x-component-props":{useAction:"{{ cm.useCancelAction }}"}},submit:{title:'{{t("Submit")}}',"x-component":"Action","x-component-props":{type:"primary",useAction:"{{ cm.useUpdateAction }}"}}}}}}}},delete:{type:"void",title:'{{ t("Delete") }}',"x-acl-action":"users:destroy","x-action":"destroy","x-decorator":"ACLActionProvider","x-component":"Action.Link","x-component-props":{confirm:{title:"{{t('Delete')}}",content:"{{t('Are you sure you want to delete it?')}}"},useAction:"{{cm.useDestroyAction}}"}}}}}}}}}}}},D={type:"void",properties:{actions:{type:"void","x-component":"ActionBar","x-component-props":{style:{marginBottom:16}},properties:{filter:{type:"void",title:'{{ t("Filter") }}',"x-action":"filter","x-component":"Filter.Action","x-component-props":{icon:"FilterOutlined",useProps:"{{ useFilterActionProps }}"},"x-align":"left"},actions:{type:"void","x-component":"Space",properties:{remove:{type:"void",title:'{{t("Remove")}}',"x-component":"Action","x-component-props":{icon:"MinusOutlined",confirm:{title:"{{t('Remove')}}",content:"{{t('Are you sure you want to remove these users?')}}"},style:{marginRight:8},useAction:"{{ useBulkRemoveUsers }}"}},create:{type:"void",title:'{{t("Add users")}}',"x-component":"Action","x-component-props":{type:"primary",icon:"PlusOutlined"},properties:{drawer:{type:"void","x-component":"Action.Drawer","x-decorator":"FormV2",title:'{{t("Add users")}}',properties:{resource:{type:"void","x-decorator":"FormItem","x-component":"RoleUsersProvider",properties:{actions:{type:"void","x-component":"ActionBar","x-component-props":{style:{marginBottom:16}},properties:{filter:{type:"void",title:'{{ t("Filter") }}',default:{$and:[{username:{$includes:""}},{nickname:{$includes:""}}]},"x-action":"filter","x-component":"Filter.Action","x-component-props":{icon:"FilterOutlined",useProps:"{{ useFilterActionProps }}"},"x-align":"left"}}},table:{type:"void","x-component":"Table.Void","x-component-props":{rowKey:"id",rowSelection:{type:"checkbox",onChange:"{{ handleSelectRoleUsers }}"},useDataSource:"{{ cm.useDataSourceFromRAC }}"},properties:{username:{type:"void","x-decorator":"Table.Column.Decorator","x-component":"Table.Column",properties:{username:{type:"string","x-component":"CollectionField","x-read-pretty":!0}}},nickname:{type:"void","x-decorator":"Table.Column.Decorator","x-component":"Table.Column",properties:{nickname:{type:"string","x-component":"CollectionField","x-read-pretty":!0}}},phone:{type:"void","x-decorator":"Table.Column.Decorator","x-component":"Table.Column",properties:{phone:{type:"string","x-component":"CollectionField","x-read-pretty":!0}}},email:{type:"void","x-decorator":"Table.Column.Decorator","x-component":"Table.Column",properties:{email:{type:"string","x-component":"CollectionField","x-read-pretty":!0}}}}}}},footer:{type:"void","x-component":"Action.Drawer.Footer",properties:{cancel:{title:'{{t("Cancel")}}',"x-component":"Action","x-component-props":{useAction:"{{ cm.useCancelAction }}"}},submit:{title:'{{t("Submit")}}',"x-component":"Action","x-component-props":{type:"primary",useAction:"{{ useAddRoleUsers }}"}}}}}}}}}}}},table:{type:"void","x-component":"Table.Void","x-component-props":{rowKey:"id",rowSelection:{type:"checkbox"},useDataSource:"{{ cm.useDataSourceFromRAC }}"},properties:{username:{type:"void",title:'{{t("Username")}}',"x-decorator":"Table.Column.Decorator","x-component":"Table.Column",properties:{username:{type:"string","x-component":"CollectionField","x-read-pretty":!0}}},nickname:{type:"void",title:'{{t("Nickname")}}',"x-decorator":"Table.Column.Decorator","x-component":"Table.Column",properties:{nickname:{type:"string","x-component":"CollectionField","x-read-pretty":!0}}},actions:{type:"void",title:'{{t("Actions")}}',"x-component":"Table.Column",properties:{actions:{type:"void","x-component":"Space","x-component-props":{split:"|"},properties:{remove:{type:"void",title:'{{ t("Remove") }}',"x-component":"Action.Link","x-component-props":{confirm:{title:"{{t('Remove user')}}",content:"{{t('Are you sure you want to remove it?')}}"},useAction:"{{ useRemoveUser }}"}}}}}}}}}};function C(){return g.useTranslation(["users","client"],{nsMode:"fallback"})}const P=()=>{const{t:s}=C();return(v.useField().value||[]).map(i=>t.jsx(m.Tag,{children:v.Schema.compile(i.title,{t:s})},i.name))},b=()=>{var n,c;const s=l.useContext(e.CollectionContext),o=e.useFilterFieldOptions(s.fields),i=e.useResourceActionContext();return e.useFilterFieldProps({options:o,params:((c=(n=i.state)==null?void 0:n.params)==null?void 0:c[0])||i.params,service:i})},T=(s=10)=>{const o="ABCDEFGHIJKLMNOPQRSTUVWXYZ",i="abcdefghijklmnopqrstuvwxyz",n="0123456789",c="!#$%^&*-_+=",y=o+i+n+c,p=new Uint32Array(s);crypto.getRandomValues(p);let a="";a+=o.charAt(p[0]%o.length),a+=i.charAt(p[1]%i.length),a+=n.charAt(p[2]%n.length),a+=c.charAt(p[3]%c.length);for(let d=4;d<s;d++){const V=p[d]%y.length;a+=y.charAt(V)}return a=a[0]+a.slice(1).split("").sort(()=>Math.random()-.5).join(""),a},I=()=>{const{t:s}=C(),o=v.useField(),[i,n]=l.useState(!1),c=e.useActionContext();return l.useEffect(()=>{c.visible||o.reset()},[o,c.visible]),t.jsxs(m.Row,{gutter:10,children:[t.jsx(m.Col,{span:18,children:t.jsx(e.Password,{checkStrength:!0,visibilityToggle:{visible:i,onVisibleChange:n},value:o.value,onChange:y=>o.setValue(y.target.value)})}),t.jsx(m.Col,{span:4,children:t.jsx(m.Button,{onClick:()=>{o.setValue(T()),n(!0)},children:s("Random password")})})]})},U=()=>{const{t:s}=C(),o=e.useSchemaComponentContext();return t.jsx(e.SchemaComponentContext.Provider,{value:F(f({},o),{designable:!1}),children:t.jsx(m.Card,{children:t.jsx(e.SchemaComponent,{schema:A,scope:{t:s,useFilterActionProps:b},components:{UserRolesField:P,PasswordField:I}})})})},R=()=>{const s=e.useAPIClient(),{role:o}=l.useContext(x.RolesManagerContext),i=e.useRecord(),{refresh:n}=e.useResourceActionContext();return{run(){return h(this,null,function*(){yield s.resource("roles.users",o==null?void 0:o.name).remove({values:[i.id]}),n()})}}},k=()=>{const{t:s}=C(),{message:o}=m.App.useApp(),i=e.useAPIClient(),{state:n,setState:c,refresh:y}=e.useResourceActionContext(),{role:p}=l.useContext(x.RolesManagerContext);return{run(){return h(this,null,function*(){const d=n==null?void 0:n.selectedRowKeys;if(!(d!=null&&d.length)){o.warning(s("Please select users"));return}yield i.resource("roles.users",p==null?void 0:p.name).remove({values:d}),c==null||c({selectedRowKeys:[]}),y()})}}},q=s=>{const{role:o}=l.useContext(x.RolesManagerContext);return t.jsx(e.ResourceActionProvider,{collection:u,request:{resource:"users",action:"listExcludeRole",params:{roleName:o==null?void 0:o.name}},children:s.children})},M=()=>{const{t:s}=C(),{role:o}=l.useContext(x.RolesManagerContext),i=e.useRequest({resource:"roles.users",resourceOf:o==null?void 0:o.name,action:"list"},{ready:!!o,refreshDeps:[o]}),n=l.useRef([]),c=(p,a)=>{n.current=a},y=()=>{const p=e.useAPIClient(),{setVisible:a}=e.useActionContext(),{refresh:d}=e.useResourceActionContext();return{run(){return h(this,null,function*(){yield p.resource("roles.users",o==null?void 0:o.name).add({values:n.current.map(B=>B.id)}),n.current=[],a(!1),d()})}}};return t.jsx(e.ResourceActionContext.Provider,{value:f({},i),children:t.jsx(e.CollectionProvider_deprecated,{collection:u,children:t.jsx(e.SchemaComponent,{schema:D,components:{RoleUsersProvider:q},scope:{useBulkRemoveUsers:k,useRemoveUser:R,handleSelectRoleUsers:c,useAddRoleUsers:y,useFilterActionProps:b,t:s}})})})};class O extends e.Plugin{load(){return h(this,null,function*(){this.app.pluginSettingsManager.add("users-permissions",{title:e.tval("Users & Permissions",{ns:"users"}),icon:"TeamOutlined"}),this.app.pluginSettingsManager.add("users-permissions.users",{title:e.tval("Users"),icon:"UserOutlined",Component:U,aclSnippet:"pm.users"}),this.app.pm.get(x).rolesManager.add("users",{title:e.tval("Users"),Component:M})})}}r.default=O,Object.defineProperties(r,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}})});

package/dist/client/locale.d.ts

@@ -0,0 +1 @@
+export declare function useUsersTranslation(): import("react-i18next").UseTranslationResponse<("users" | "client")[], undefined>;

package/dist/client/schemas/users.d.ts

@@ -0,0 +1,165 @@
+import { ISchema } from '@formily/react';
+export declare const userCollection: {
+    name: string;
+    fields: ({
+        name: string;
+        type: string;
+        autoIncrement: boolean;
+        primaryKey: boolean;
+        allowNull: boolean;
+        uiSchema: {
+            type: string;
+            title: string;
+            'x-component': string;
+            'x-read-pretty': boolean;
+            'x-validator'?: undefined;
+            required?: undefined;
+            'x-component-props'?: undefined;
+        };
+        interface: string;
+        unique?: undefined;
+        hidden?: undefined;
+        target?: undefined;
+        foreignKey?: undefined;
+        otherKey?: undefined;
+        onDelete?: undefined;
+        sourceKey?: undefined;
+        targetKey?: undefined;
+        through?: undefined;
+    } | {
+        interface: string;
+        type: string;
+        name: string;
+        uiSchema: {
+            type: string;
+            title: string;
+            'x-component': string;
+            'x-read-pretty'?: undefined;
+            'x-validator'?: undefined;
+            required?: undefined;
+            'x-component-props'?: undefined;
+        };
+        autoIncrement?: undefined;
+        primaryKey?: undefined;
+        allowNull?: undefined;
+        unique?: undefined;
+        hidden?: undefined;
+        target?: undefined;
+        foreignKey?: undefined;
+        otherKey?: undefined;
+        onDelete?: undefined;
+        sourceKey?: undefined;
+        targetKey?: undefined;
+        through?: undefined;
+    } | {
+        interface: string;
+        type: string;
+        name: string;
+        unique: boolean;
+        uiSchema: {
+            type: string;
+            title: string;
+            'x-component': string;
+            'x-validator': {
+                username: boolean;
+            };
+            required: boolean;
+            'x-read-pretty'?: undefined;
+            'x-component-props'?: undefined;
+        };
+        autoIncrement?: undefined;
+        primaryKey?: undefined;
+        allowNull?: undefined;
+        hidden?: undefined;
+        target?: undefined;
+        foreignKey?: undefined;
+        otherKey?: undefined;
+        onDelete?: undefined;
+        sourceKey?: undefined;
+        targetKey?: undefined;
+        through?: undefined;
+    } | {
+        interface: string;
+        type: string;
+        name: string;
+        unique: boolean;
+        uiSchema: {
+            type: string;
+            title: string;
+            'x-component': string;
+            'x-validator': string;
+            required: boolean;
+            'x-read-pretty'?: undefined;
+            'x-component-props'?: undefined;
+        };
+        autoIncrement?: undefined;
+        primaryKey?: undefined;
+        allowNull?: undefined;
+        hidden?: undefined;
+        target?: undefined;
+        foreignKey?: undefined;
+        otherKey?: undefined;
+        onDelete?: undefined;
+        sourceKey?: undefined;
+        targetKey?: undefined;
+        through?: undefined;
+    } | {
+        interface: string;
+        type: string;
+        name: string;
+        hidden: boolean;
+        uiSchema: {
+            type: string;
+            title: string;
+            'x-component': string;
+            'x-read-pretty'?: undefined;
+            'x-validator'?: undefined;
+            required?: undefined;
+            'x-component-props'?: undefined;
+        };
+        autoIncrement?: undefined;
+        primaryKey?: undefined;
+        allowNull?: undefined;
+        unique?: undefined;
+        target?: undefined;
+        foreignKey?: undefined;
+        otherKey?: undefined;
+        onDelete?: undefined;
+        sourceKey?: undefined;
+        targetKey?: undefined;
+        through?: undefined;
+    } | {
+        interface: string;
+        type: string;
+        name: string;
+        target: string;
+        foreignKey: string;
+        otherKey: string;
+        onDelete: string;
+        sourceKey: string;
+        targetKey: string;
+        through: string;
+        uiSchema: {
+            type: string;
+            title: string;
+            'x-component': string;
+            'x-component-props': {
+                multiple: boolean;
+                fieldNames: {
+                    label: string;
+                    value: string;
+                };
+            };
+            'x-read-pretty'?: undefined;
+            'x-validator'?: undefined;
+            required?: undefined;
+        };
+        autoIncrement?: undefined;
+        primaryKey?: undefined;
+        allowNull?: undefined;
+        unique?: undefined;
+        hidden?: undefined;
+    })[];
+};
+export declare const usersSchema: ISchema;
+export declare const roleUsersSchema: ISchema;

package/dist/client/utils.d.ts

@@ -0,0 +1 @@
+export declare const generatePassword: (length?: number) => string;

package/dist/externalVersion.js

@@ -1,7 +1,14 @@
 module.exports = {
-  "@nocobase/client": "0.19.0-alpha.9",
-  "@nocobase/database": "0.19.0-alpha.9",
-  "@nocobase/server": "0.19.0-alpha.9",
-  "@nocobase/utils": "0.19.0-alpha.9",
-  "@nocobase/actions": "0.19.0-alpha.9"
+  "react": "18.2.0",
+  "antd": "5.12.8",
+  "@nocobase/client": "0.20.0-alpha.2",
+  "@formily/react": "2.3.0",
+  "@formily/core": "2.3.0",
+  "@nocobase/plugin-acl": "0.20.0-alpha.2",
+  "react-i18next": "11.18.6",
+  "@nocobase/database": "0.20.0-alpha.2",
+  "@nocobase/server": "0.20.0-alpha.2",
+  "@nocobase/utils": "0.20.0-alpha.2",
+  "@nocobase/cache": "0.20.0-alpha.2",
+  "@nocobase/actions": "0.20.0-alpha.2"
 };

package/dist/locale/en-US.json

@@ -0,0 +1,7 @@
+{
+  "Users & Permissions": "Users & Permissions",
+  "Add users": "Add users",
+  "Remove user": "Remove user",
+  "Are you sure you want to remove it?": "Are you sure you want to remove it?",
+  "Random password": "Random password"
+}

package/dist/locale/zh-CN.json

@@ -0,0 +1,7 @@
+{
+  "Users & Permissions": "用户和权限",
+  "Add users": "添加用户",
+  "Remove user": "移除用户",
+  "Are you sure you want to remove it?": "你确定要移除吗？",
+  "Random password": "随机密码"
+}

package/dist/server/actions/users.d.ts

@@ -1,2 +1,3 @@
 import { Context, Next } from '@nocobase/actions';
 export declare function updateProfile(ctx: Context, next: Next): Promise<void>;
+export declare const listExcludeRole: (ctx: Context, next: Next) => Promise<void>;

package/dist/server/actions/users.js

@@ -17,9 +17,11 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var users_exports = {};
 __export(users_exports, {
+  listExcludeRole: () => listExcludeRole,
   updateProfile: () => updateProfile
 });
 module.exports = __toCommonJS(users_exports);
+var import_actions = require("@nocobase/actions");
 async function updateProfile(ctx, next) {
   const { values } = ctx.action.params;
   const { currentUser } = ctx.state;
@@ -34,7 +36,39 @@ async function updateProfile(ctx, next) {
   ctx.body = result;
   await next();
 }
+const listExcludeRole = async (ctx, next) => {
+  const { roleName, page = import_actions.DEFAULT_PAGE, pageSize = import_actions.DEFAULT_PER_PAGE } = ctx.action.params;
+  const repo = ctx.db.getRepository("users");
+  const users = await repo.find({
+    fields: ["id"],
+    filter: {
+      "roles.name": roleName
+    }
+  });
+  const userIds = users.map((user) => user.id);
+  const [rows, count] = await repo.findAndCount({
+    context: ctx,
+    offset: (page - 1) * pageSize,
+    limit: pageSize,
+    // Ensure memberIds is not empty to resolve strange issue:
+    // notIn: [] will be translated to "WHERE id IS NULL"
+    filter: userIds.length ? {
+      id: {
+        $notIn: userIds
+      }
+    } : {}
+  });
+  ctx.body = {
+    count,
+    rows,
+    page: Number(page),
+    pageSize: Number(pageSize),
+    totalPage: Math.ceil(count / pageSize)
+  };
+  await next();
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  listExcludeRole,
   updateProfile
 });

package/dist/server/server.js

@@ -58,6 +58,27 @@ class PluginUsersServer extends import_server.Plugin {
         };
       }
     });
+    this.db.on("field.afterAdd", ({ collection, field }) => {
+      if (field.options.interface === "createdBy") {
+        collection.setField("createdById", {
+          type: "context",
+          dataType: "bigInt",
+          dataIndex: "state.currentUser.id",
+          createOnly: true,
+          visible: true,
+          index: true
+        });
+      }
+      if (field.options.interface === "updatedBy") {
+        collection.setField("updatedById", {
+          type: "context",
+          dataType: "bigInt",
+          dataIndex: "state.currentUser.id",
+          visible: true,
+          index: true
+        });
+      }
+    });
     this.db.on("afterDefineCollection", (collection) => {
       const { createdBy, updatedBy } = collection.options;
       if (createdBy === true) {
@@ -111,6 +132,10 @@ class PluginUsersServer extends import_server.Plugin {
     });
     const loggedInActions = ["updateProfile"];
     loggedInActions.forEach((action) => this.app.acl.allow("users", action, "loggedIn"));
+    this.app.acl.registerSnippet({
+      name: `pm.${this.name}.*`,
+      actions: ["users:listExcludeRole", "users:list"]
+    });
   }
   async load() {
     await this.importCollections((0, import_path.resolve)(__dirname, "collections"));
@@ -121,6 +146,16 @@ class PluginUsersServer extends import_server.Plugin {
         plugin: this
       }
     });
+    this.app.resourcer.use(async (ctx, next) => {
+      await next();
+      const { associatedName, resourceName, actionName, values } = ctx.action.params;
+      const cache = ctx.app.cache;
+      if (associatedName === "roles" && resourceName === "users" && ["add", "remove", "set"].includes(actionName) && (values == null ? void 0 : values.length)) {
+        for (const userId of values) {
+          await cache.del(`roles:${userId}`);
+        }
+      }
+    });
   }
   getInstallingData(options = {}) {
     var _a;

package/package.json

@@ -2,9 +2,9 @@
   "name": "@nocobase/plugin-users",
   "displayName": "Users",
   "displayName.zh-CN": "用户",
-  "description": "Provides a basic user model, as well as createdBy and updatedBy fields..",
+  "description": "Provides basic user model, as well as created by and updated by fields.",
   "description.zh-CN": "提供了基础的用户模型，以及创建人和最后更新人字段。",
-  "version": "0.19.0-alpha.9",
+  "version": "0.20.0-alpha.2",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/plugins/users",
@@ -24,7 +24,7 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "975f9c58a1995df6a8d7a4d191a0dc4a9769ebc5",
+  "gitHead": "6fb885dfc3554e4b0f29e9a7a1eecbbe85d0eebb",
   "keywords": [
     "Users & permissions"
   ]