From dc4b91df0ba349fa944c419ee01f43606e50d0ec Mon Sep 17 00:00:00 2001 From: baozhoutao Date: Wed, 15 Jan 2025 15:27:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20@steedos/service-core-objects=20?= =?UTF-8?q?=E4=B8=8D=E4=BE=9D=E8=B5=96meteor=20package=20loader=20#7120?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/metadata-api/steedos-config.yml | 1 - packages/objectql/src/types/object.ts | 2 +- packages/plugin-company/.env | 3 - packages/plugin-company/.gitignore | 17 -- packages/plugin-company/.npmignore | 2 - .../plugin-company/.vscode/extensions.json | 5 - packages/plugin-company/.vscode/settings.json | 11 - packages/plugin-company/LICENSE.txt | 203 ------------------ packages/plugin-company/README.md | 25 --- packages/plugin-company/index.js | 1 - packages/plugin-company/nodemon.json | 13 -- packages/plugin-company/package.json | 21 -- packages/plugin-company/package.service.js | 75 ------- packages/plugin-company/plugin.config.yml | 4 - packages/plugin-company/server.js | 17 -- .../plugin-company/src/enterprise.app.yml | 11 - .../src/flow_positions.object.yml | 7 - .../plugin-company/src/flow_roles.object.yml | 7 - packages/plugin-company/src/flows.object.yml | 7 - packages/plugin-company/src/forms.object.yml | 7 - .../src/instance_number_rules.object.yml | 7 - .../plugin-company/src/instances.object.yml | 6 - .../src/instances_statistic.object.yml | 7 - .../src/organizations.object.yml | 11 - .../src/space_user_signs.object.yml | 7 - .../plugin-company/src/space_users.object.yml | 8 - packages/plugin-company/steedos-config.yml | 31 --- packages/standard-objects/admin.app.yml | 9 +- .../workflow/flow_positions.object.yml | 9 +- .../workflow/flow_roles.object.yml | 9 +- .../workflow/flows.object.yml | 4 + .../workflow/forms.object.yml | 9 +- .../workflow/instance_number_rules.object.yml | 9 +- .../workflow/instances.object.yml | 8 +- .../workflow/instances_statistic.object.yml | 9 +- .../workflow/space_user_signs.object.yml | 9 +- services/service-core-objects/README.md | 64 ++++++ .../space_users.en.objectTranslation.yml | 0 .../space_users.zh-CN.objectTranslation.yml | 0 .../spaces.en/spaces.en.objectTranslation.yml | 0 .../spaces.zh-CN.objectTranslation.yml | 0 .../users.en/users.en.objectTranslation.yml | 0 .../users.zh-CN.objectTranslation.yml | 0 .../clear_login_tokens.button.button.js | 0 .../buttons/clear_login_tokens.button.yml | 0 .../space_users/buttons/disable.button.js | 0 .../space_users/buttons/disable.button.yml | 0 .../space_users/buttons/enable.button.js | 0 .../space_users/buttons/enable.button.yml | 0 .../space_users/buttons/import.button.js | 0 .../space_users/buttons/import.button.yml | 0 .../buttons/invite_space_users.button.js | 0 .../buttons/invite_space_users.button.yml | 0 .../space_users/buttons/invite_user.button.js | 0 .../buttons/invite_user.button.yml | 0 .../space_users/buttons/lockout.button.js | 0 .../space_users/buttons/lockout.button.yml | 0 .../space_users/buttons/setPassword.button.js | 0 .../buttons/setPassword.button.yml | 0 .../buttons/standard_delete.button.js | 0 .../buttons/standard_delete.button.yml | 0 .../buttons/standard_delete_many.button.js | 0 .../buttons/standard_delete_many.button.yml | 0 .../buttons/standard_edit.button.js | 0 .../buttons/standard_edit.button.yml | 0 .../buttons/standard_new.button.js | 0 .../buttons/standard_new.button.yml | 0 .../space_users/buttons/unlock.button.js | 0 .../space_users/buttons/unlock.button.yml | 0 .../buttons/verify_email.button.js | 0 .../buttons/verify_email.button.yml | 0 .../buttons/verify_mobile.button.js | 0 .../buttons/verify_mobile.button.yml | 0 .../space_users/fields/avatar.field.yml | 0 .../space_users/fields/company_id.field.yml | 7 + .../space_users/fields/company_ids.field.yml | 2 + .../space_users/fields/email.field.yml | 0 .../fields/email_notification.field.yml | 0 .../fields/email_verified.field.yml | 0 .../objects/space_users/fields/hr.field.yml | 0 .../space_users/fields/invite_state.field.yml | 0 .../space_users/fields/is_customer.field.yml | 0 .../space_users/fields/is_supplier.field.yml | 0 .../space_users/fields/last_logon.field.yml | 0 .../space_users/fields/locale.field.yml | 0 .../space_users/fields/manager.field.yml | 0 .../space_users/fields/mobile.field.yml | 0 .../fields/mobile_verified.field.yml | 0 .../objects/space_users/fields/name.field.yml | 0 .../space_users/fields/organization.field.yml | 0 .../fields/organizations.field.yml | 0 .../fields/organizations_parents.field.yml | 0 .../space_users/fields/password.field.yml | 0 .../fields/password_expired.field.yml | 0 .../space_users/fields/position.field.yml | 0 .../space_users/fields/profile.field.yml | 0 .../fields/sms_notification.field.yml | 0 .../space_users/fields/sort_no.field.yml | 0 .../objects/space_users/fields/user.field.yml | 0 .../fields/user_accepted.field.yml | 0 .../space_users/fields/username.field.yml | 0 .../space_users/fields/work_phone.field.yml | 0 .../objects/space_users/fields/zoom.field.yml | 0 .../space_users/listviews/all.listview.yml | 0 .../listviews/customer.istview-4721.yml | 0 .../listviews/disabled.listview.yml | 0 .../listviews/supplier.listview-4721.yml | 0 .../permissions/admin.permission.yml | 0 .../permissions/customer.permission.yml | 0 .../organization_admin.permission.yml | 0 .../permissions/supplier.permission.yml | 0 .../permissions/user.permission.yml | 0 .../space_users/space_users.object.yml | 0 .../buttons/invite_space_users.button.js | 0 .../buttons/invite_space_users.button.yml | 0 .../spaces/buttons/standard_new.button.js | 0 .../spaces/buttons/standard_new.button.yml | 0 .../objects/spaces/buttons/upgrade.button.js | 0 .../objects/spaces/buttons/upgrade.button.yml | 0 .../objects/spaces/fields/admins.field.yml | 0 .../objects/spaces/fields/balance.field.yml | 0 .../fields/billing.remaining_months.field.yml | 0 .../spaces/fields/company_id.field.yml | 0 .../spaces/fields/company_ids.field.yml | 0 .../fields/default_organization.field.yml | 0 .../spaces/fields/default_profile.field.yml | 0 .../spaces/fields/enable_register.field.yml | 0 .../objects/spaces/fields/features.field.yml | 0 .../objects/spaces/fields/name.field.yml | 0 .../objects/spaces/fields/owner.field.yml | 0 .../objects/spaces/fields/services.field.yml | 0 .../objects/spaces/listviews/all.listview.yml | 0 .../spaces/permissions/admin.permission.yml | 0 .../spaces/permissions/guest.permission.yml | 0 .../spaces/permissions/user.permission.yml | 0 .../default/objects/spaces/spaces.object.yml | 0 .../objects/users/fields/avatar.field.yml | 0 .../objects/users/fields/company_id.field.yml | 0 .../users/fields/company_ids.field.yml | 0 .../objects/users/fields/email.field.yml | 0 .../users/fields/email_notification.field.yml | 0 .../users/fields/is_cloudadmin.field.yml | 0 .../objects/users/fields/is_deleted.field.yml | 0 .../objects/users/fields/last_logon.field.yml | 0 .../objects/users/fields/locale.field.yml | 0 .../objects/users/fields/lockout.field.yml | 0 .../login_failed_lockout_time.field.yml | 0 .../fields/login_failed_number.field.yml | 0 .../objects/users/fields/mobile.field.yml | 0 .../objects/users/fields/name.field.yml | 0 .../users/fields/password_expired.field.yml | 0 .../fields/primary_email_verified.field.yml | 0 .../objects/users/fields/steedos_id.field.yml | 0 .../objects/users/fields/username.field.yml | 0 .../objects/users/fields/utcOffset.field.yml | 0 .../objects/users/listviews/all.listview.yml | 0 .../users/permissions/admin.permission.yml | 0 .../users/permissions/guest.permission.yml | 0 .../users/permissions/user.permission.yml | 0 .../default/objects/users/users.object.yml | 0 .../main/default/triggers/company.trigger.js | 0 .../default/triggers/organizations.trigger.js | 0 .../main/default/triggers/space_users.core.js | 15 +- .../default/triggers/space_users.trigger.js | 0 .../main/default/triggers/spaces.trigger.js | 0 .../main/default/triggers/users.trigger.js | 0 .../main/default/util/password.js | 48 +++++ services/service-core-objects/package.json | 20 ++ .../service-core-objects/package.service.js | 189 ++++++++++++++++ .../src/actions/index.js | 0 .../src/actions/upsetOrganizations.js | 0 .../src/actions/upsetSpaceUsers.js | 0 .../src/methods/getOrgByGroupId.js | 0 .../src/methods/index.js | 0 .../src/methods/upsetOrg.js | 0 .../src/methods/upsetOrgs.js | 0 .../src/methods/upsetSpaceUser.js | 0 .../src/methods/upsetSpaceUsers.js | 0 .../src/methods/upsetUser.js | 0 .../src/triggers/index.js | 11 + .../src/triggers/space_users_trigger.js | 0 .../public/tailwind/tailwind-steedos.css | 8 + services/service-steedos-server/index.js | 2 +- services/service-steedos-server/package.json | 1 - .../company.en.objectTranslation.yml | 50 ----- .../company.zh-CN.objectTranslation.yml | 50 ----- .../logs.en/logs.en.objectTranslation.yml | 23 -- .../logs.zh-CN.objectTranslation.yml | 23 -- .../notifications.en.objectTranslation.yml | 43 ---- .../notifications.zh-CN.objectTranslation.yml | 43 ---- .../organizations.en.objectTranslation.yml | 64 ------ .../organizations.zh-CN.objectTranslation.yml | 64 ------ .../settings.en.objectTranslation.yml | 38 ---- .../settings.zh-CN.objectTranslation.yml | 39 ---- .../organizations/fields/company_id.field.yml | 3 + .../fields/company_ids.field.yml | 2 + .../organizations/fields/is_company.field.yml | 4 +- .../space_users/fields/company_id.field.yml | 20 -- services/standard-space/package.service.js | 8 +- services/standard-space/src/triggers/index.js | 7 +- 200 files changed, 418 insertions(+), 1021 deletions(-) delete mode 100644 packages/plugin-company/.env delete mode 100644 packages/plugin-company/.gitignore delete mode 100644 packages/plugin-company/.npmignore delete mode 100644 packages/plugin-company/.vscode/extensions.json delete mode 100644 packages/plugin-company/.vscode/settings.json delete mode 100644 packages/plugin-company/LICENSE.txt delete mode 100644 packages/plugin-company/README.md delete mode 100644 packages/plugin-company/index.js delete mode 100644 packages/plugin-company/nodemon.json delete mode 100644 packages/plugin-company/package.json delete mode 100644 packages/plugin-company/package.service.js delete mode 100644 packages/plugin-company/plugin.config.yml delete mode 100644 packages/plugin-company/server.js delete mode 100644 packages/plugin-company/src/enterprise.app.yml delete mode 100644 packages/plugin-company/src/flow_positions.object.yml delete mode 100644 packages/plugin-company/src/flow_roles.object.yml delete mode 100644 packages/plugin-company/src/flows.object.yml delete mode 100644 packages/plugin-company/src/forms.object.yml delete mode 100644 packages/plugin-company/src/instance_number_rules.object.yml delete mode 100644 packages/plugin-company/src/instances.object.yml delete mode 100644 packages/plugin-company/src/instances_statistic.object.yml delete mode 100644 packages/plugin-company/src/organizations.object.yml delete mode 100644 packages/plugin-company/src/space_user_signs.object.yml delete mode 100644 packages/plugin-company/src/space_users.object.yml delete mode 100644 packages/plugin-company/steedos-config.yml create mode 100644 services/service-core-objects/README.md rename services/{standard-space => service-core-objects}/main/default/objectTranslations/space_users.en/space_users.en.objectTranslation.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objectTranslations/space_users.zh-CN/space_users.zh-CN.objectTranslation.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objectTranslations/spaces.en/spaces.en.objectTranslation.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objectTranslations/spaces.zh-CN/spaces.zh-CN.objectTranslation.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objectTranslations/users.en/users.en.objectTranslation.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objectTranslations/users.zh-CN/users.zh-CN.objectTranslation.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/clear_login_tokens.button.button.js (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/clear_login_tokens.button.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/disable.button.js (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/disable.button.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/enable.button.js (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/enable.button.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/import.button.js (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/import.button.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/invite_space_users.button.js (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/invite_space_users.button.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/invite_user.button.js (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/invite_user.button.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/lockout.button.js (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/lockout.button.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/setPassword.button.js (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/setPassword.button.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/standard_delete.button.js (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/standard_delete.button.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/standard_delete_many.button.js (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/standard_delete_many.button.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/standard_edit.button.js (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/standard_edit.button.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/standard_new.button.js (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/standard_new.button.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/unlock.button.js (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/unlock.button.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/verify_email.button.js (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/verify_email.button.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/verify_mobile.button.js (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/buttons/verify_mobile.button.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/avatar.field.yml (100%) create mode 100644 services/service-core-objects/main/default/objects/space_users/fields/company_id.field.yml rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/company_ids.field.yml (89%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/email.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/email_notification.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/email_verified.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/hr.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/invite_state.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/is_customer.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/is_supplier.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/last_logon.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/locale.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/manager.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/mobile.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/mobile_verified.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/name.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/organization.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/organizations.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/organizations_parents.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/password.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/password_expired.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/position.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/profile.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/sms_notification.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/sort_no.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/user.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/user_accepted.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/username.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/work_phone.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/fields/zoom.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/listviews/all.listview.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/listviews/customer.istview-4721.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/listviews/disabled.listview.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/listviews/supplier.listview-4721.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/permissions/admin.permission.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/permissions/customer.permission.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/permissions/organization_admin.permission.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/permissions/supplier.permission.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/permissions/user.permission.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/space_users/space_users.object.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/buttons/invite_space_users.button.js (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/buttons/invite_space_users.button.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/buttons/standard_new.button.js (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/buttons/standard_new.button.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/buttons/upgrade.button.js (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/buttons/upgrade.button.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/fields/admins.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/fields/balance.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/fields/billing.remaining_months.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/fields/company_id.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/fields/company_ids.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/fields/default_organization.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/fields/default_profile.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/fields/enable_register.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/fields/features.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/fields/name.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/fields/owner.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/fields/services.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/listviews/all.listview.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/permissions/admin.permission.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/permissions/guest.permission.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/permissions/user.permission.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/spaces/spaces.object.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/fields/avatar.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/fields/company_id.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/fields/company_ids.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/fields/email.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/fields/email_notification.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/fields/is_cloudadmin.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/fields/is_deleted.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/fields/last_logon.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/fields/locale.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/fields/lockout.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/fields/login_failed_lockout_time.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/fields/login_failed_number.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/fields/mobile.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/fields/name.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/fields/password_expired.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/fields/primary_email_verified.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/fields/steedos_id.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/fields/username.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/fields/utcOffset.field.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/listviews/all.listview.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/permissions/admin.permission.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/permissions/guest.permission.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/permissions/user.permission.yml (100%) rename services/{standard-space => service-core-objects}/main/default/objects/users/users.object.yml (100%) rename services/{standard-space => service-core-objects}/main/default/triggers/company.trigger.js (100%) rename services/{standard-space => service-core-objects}/main/default/triggers/organizations.trigger.js (100%) rename services/{standard-space => service-core-objects}/main/default/triggers/space_users.core.js (90%) rename services/{standard-space => service-core-objects}/main/default/triggers/space_users.trigger.js (100%) rename services/{standard-space => service-core-objects}/main/default/triggers/spaces.trigger.js (100%) rename services/{standard-space => service-core-objects}/main/default/triggers/users.trigger.js (100%) create mode 100644 services/service-core-objects/main/default/util/password.js create mode 100644 services/service-core-objects/package.json create mode 100644 services/service-core-objects/package.service.js rename services/{standard-space => service-core-objects}/src/actions/index.js (100%) rename services/{standard-space => service-core-objects}/src/actions/upsetOrganizations.js (100%) rename services/{standard-space => service-core-objects}/src/actions/upsetSpaceUsers.js (100%) rename services/{standard-space => service-core-objects}/src/methods/getOrgByGroupId.js (100%) rename services/{standard-space => service-core-objects}/src/methods/index.js (100%) rename services/{standard-space => service-core-objects}/src/methods/upsetOrg.js (100%) rename services/{standard-space => service-core-objects}/src/methods/upsetOrgs.js (100%) rename services/{standard-space => service-core-objects}/src/methods/upsetSpaceUser.js (100%) rename services/{standard-space => service-core-objects}/src/methods/upsetSpaceUsers.js (100%) rename services/{standard-space => service-core-objects}/src/methods/upsetUser.js (100%) create mode 100644 services/service-core-objects/src/triggers/index.js rename services/{standard-space => service-core-objects}/src/triggers/space_users_trigger.js (100%) delete mode 100644 services/standard-space/main/default/objectTranslations/company.en/company.en.objectTranslation.yml delete mode 100644 services/standard-space/main/default/objectTranslations/company.zh-CN/company.zh-CN.objectTranslation.yml delete mode 100644 services/standard-space/main/default/objectTranslations/logs.en/logs.en.objectTranslation.yml delete mode 100644 services/standard-space/main/default/objectTranslations/logs.zh-CN/logs.zh-CN.objectTranslation.yml delete mode 100644 services/standard-space/main/default/objectTranslations/notifications.en/notifications.en.objectTranslation.yml delete mode 100644 services/standard-space/main/default/objectTranslations/notifications.zh-CN/notifications.zh-CN.objectTranslation.yml delete mode 100644 services/standard-space/main/default/objectTranslations/organizations.en/organizations.en.objectTranslation.yml delete mode 100644 services/standard-space/main/default/objectTranslations/organizations.zh-CN/organizations.zh-CN.objectTranslation.yml delete mode 100644 services/standard-space/main/default/objectTranslations/settings.en/settings.en.objectTranslation.yml delete mode 100644 services/standard-space/main/default/objectTranslations/settings.zh-CN/settings.zh-CN.objectTranslation.yml delete mode 100644 services/standard-space/main/default/objects/space_users/fields/company_id.field.yml diff --git a/packages/metadata-api/steedos-config.yml b/packages/metadata-api/steedos-config.yml index 8ea120818b..c4562ce54a 100644 --- a/packages/metadata-api/steedos-config.yml +++ b/packages/metadata-api/steedos-config.yml @@ -13,7 +13,6 @@ public: folder: "./storage" plugins: - "@steedos/accounts" - - "@steedos/plugin-company" tenant: enable_register: true enable_forget_password: false diff --git a/packages/objectql/src/types/object.ts b/packages/objectql/src/types/object.ts index c156f8b961..114fdad98a 100644 --- a/packages/objectql/src/types/object.ts +++ b/packages/objectql/src/types/object.ts @@ -922,7 +922,7 @@ export class SteedosObjectType extends SteedosObjectProperties { * 获取mongodb collection * @returns mongoCollection */ - private async getCollection(){ + async getCollection(){ if (this.datasource.driver === SteedosDatabaseDriverType.Mongo || this.datasource.driver === SteedosDatabaseDriverType.MeteorMongo) { const adapter = this.datasource.adapter; await adapter.connect() diff --git a/packages/plugin-company/.env b/packages/plugin-company/.env deleted file mode 100644 index 73c080e9c1..0000000000 --- a/packages/plugin-company/.env +++ /dev/null @@ -1,3 +0,0 @@ -MONGO_URL=mongodb://127.0.0.1:27017/steedos -PORT=5000 -ROOT_URL=http://127.0.0.1:5000 \ No newline at end of file diff --git a/packages/plugin-company/.gitignore b/packages/plugin-company/.gitignore deleted file mode 100644 index b5ad1f61de..0000000000 --- a/packages/plugin-company/.gitignore +++ /dev/null @@ -1,17 +0,0 @@ -**/.DS_Store -**/.idea - -**/node_modules -**/package-lock.json - -**/npm-error.log -**/yarn-error.log -**/lerna-debug.log - -**/lib - -**/.vscode/launch.* - -.DS_Store - -storage/** \ No newline at end of file diff --git a/packages/plugin-company/.npmignore b/packages/plugin-company/.npmignore deleted file mode 100644 index fb0dba7bd4..0000000000 --- a/packages/plugin-company/.npmignore +++ /dev/null @@ -1,2 +0,0 @@ -test -tsconfig.json \ No newline at end of file diff --git a/packages/plugin-company/.vscode/extensions.json b/packages/plugin-company/.vscode/extensions.json deleted file mode 100644 index 5a638d6eb2..0000000000 --- a/packages/plugin-company/.vscode/extensions.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "recommendations": [ - "redhat.vscode-yaml", "mongodb.mongodb-vscode" - ] -} \ No newline at end of file diff --git a/packages/plugin-company/.vscode/settings.json b/packages/plugin-company/.vscode/settings.json deleted file mode 100644 index 759216e475..0000000000 --- a/packages/plugin-company/.vscode/settings.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "yaml.completion": true, - "yaml.customTags": [ - "tag:yaml.org,2002:js/function" - ], - "yaml.schemas": { - "https://steedos.github.io/steedos-platform/packages/schemas/app/schema.json": "/*.app.yml", - "https://steedos.github.io/steedos-platform/packages/schemas/object/schema.json": "/*.object.yml", - "https://steedos.github.io/steedos-platform/packages/schemas/dashboard/schema.json": "/*.dashboard.yml" - } -} \ No newline at end of file diff --git a/packages/plugin-company/LICENSE.txt b/packages/plugin-company/LICENSE.txt deleted file mode 100644 index c352b453ee..0000000000 --- a/packages/plugin-company/LICENSE.txt +++ /dev/null @@ -1,203 +0,0 @@ -Copyright 2001-present Steedos, Inc. - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "{}" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright {yyyy} {name of copyright owner} - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. \ No newline at end of file diff --git a/packages/plugin-company/README.md b/packages/plugin-company/README.md deleted file mode 100644 index 8972db8760..0000000000 --- a/packages/plugin-company/README.md +++ /dev/null @@ -1,25 +0,0 @@ -### 安装 yarn -``` -npm i yarn -g -``` - -### 国内建议使用npm淘宝镜像 -``` -npm config set registry http://registry.npm.taobao.org/ -``` - -### 使用yarn安装依赖包 -``` -yarn -``` - -### 启动服务器 -``` -yarn start -``` - -### 了解更多 -- [开发文档](https://www.steedos.com/developer/) - -## 功能说明 -- 企业版插件，定义企业版开放的内核字段 diff --git a/packages/plugin-company/index.js b/packages/plugin-company/index.js deleted file mode 100644 index daf9f87a30..0000000000 --- a/packages/plugin-company/index.js +++ /dev/null @@ -1 +0,0 @@ -exports.init = function ({ app }) {} \ No newline at end of file diff --git a/packages/plugin-company/nodemon.json b/packages/plugin-company/nodemon.json deleted file mode 100644 index 931743983f..0000000000 --- a/packages/plugin-company/nodemon.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "restartable": "rs", - "ignore": [ - ".git", - "node_modules/**/node_modules" - ], - "verbose": true, - "env": { - "NODE_ENV": "development" - }, - "ext": "js,json,yml", - "delay": "3000" - } \ No newline at end of file diff --git a/packages/plugin-company/package.json b/packages/plugin-company/package.json deleted file mode 100644 index 49594f4102..0000000000 --- a/packages/plugin-company/package.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "name": "@steedos/plugin-company", - "private": false, - "version": "3.0.0-beta.2", - "description": "Enterprise plugin for steedos", - "main": "index.js", - "repository": { - "type": "git", - "url": "git+https://github.com/steedos/object-server.git" - }, - "author": "", - "license": "ISC", - "bugs": { - "url": "https://github.com/steedos/object-server/issues" - }, - "homepage": "https://github.com/steedos/object-server#readme", - "publishConfig": { - "access": "public" - }, - "gitHead": "72fa51bda8ff714d5fdb933bf0a45ea4cb82df74" -} diff --git a/packages/plugin-company/package.service.js b/packages/plugin-company/package.service.js deleted file mode 100644 index 1552417078..0000000000 --- a/packages/plugin-company/package.service.js +++ /dev/null @@ -1,75 +0,0 @@ -/* - * @Author: baozhoutao@steedos.com - * @Date: 2022-03-28 09:35:34 - * @LastEditors: sunhaolin@hotoa.com - * @LastEditTime: 2022-12-09 13:24:35 - * @Description: - */ -"use strict"; -const project = require('./package.json'); -const packageName = project.name; -const packageLoader = require('@steedos/service-meteor-package-loader'); -const init = require('.').init; -/** - * @typedef {import('moleculer').Context} Context Moleculer's Context - * 软件包服务启动后也需要抛出事件。 - */ -module.exports = { - name: packageName, - namespace: "steedos", - mixins: [packageLoader], - /** - * Settings - */ - settings: { - packageInfo: { - path: __dirname, - } - }, - - /** - * Dependencies - */ - dependencies: ['~packages-standard-objects', '~packages-@steedos/standard-space'], - - /** - * Actions - */ - actions: { - - }, - - /** - * Events - */ - events: { - - }, - - /** - * Methods - */ - methods: { - }, - - /** - * Service created lifecycle event handler - */ - async created() { - - }, - - /** - * Service started lifecycle event handler - */ - async started() { - - }, - - /** - * Service stopped lifecycle event handler - */ - async stopped() { - - } -}; diff --git a/packages/plugin-company/plugin.config.yml b/packages/plugin-company/plugin.config.yml deleted file mode 100644 index 5e441b655d..0000000000 --- a/packages/plugin-company/plugin.config.yml +++ /dev/null @@ -1,4 +0,0 @@ -datasources: - default: - objectFiles: - - ./src/** \ No newline at end of file diff --git a/packages/plugin-company/server.js b/packages/plugin-company/server.js deleted file mode 100644 index fc43965e1f..0000000000 --- a/packages/plugin-company/server.js +++ /dev/null @@ -1,17 +0,0 @@ -require('dotenv-flow').config(); - -var server = require('@steedos/meteor-bundle-runner'); -var steedos = require('@steedos/core') - -server.Fiber(function () { - try { - server.Profile.run("Server startup", function () { - server.loadServerBundles(); - steedos.init(); - server.callStartupHooks(); - server.runMain(); - }) - } catch (error) { - console.error(error.stack) - } -}).run() diff --git a/packages/plugin-company/src/enterprise.app.yml b/packages/plugin-company/src/enterprise.app.yml deleted file mode 100644 index 6212e71b99..0000000000 --- a/packages/plugin-company/src/enterprise.app.yml +++ /dev/null @@ -1,11 +0,0 @@ -_id: enterprise -name: 企业版插件 -is_creator: false -admin_menus: - - _id: company - name: Division - permission_sets: - - admin - object_name: company - parent: menu_users - sort: 12 diff --git a/packages/plugin-company/src/flow_positions.object.yml b/packages/plugin-company/src/flow_positions.object.yml deleted file mode 100644 index d85cb15474..0000000000 --- a/packages/plugin-company/src/flow_positions.object.yml +++ /dev/null @@ -1,7 +0,0 @@ -extend: flow_positions -fields: - company_id: - required: false - omit: false - hidden: false - visible_on: "{{true}}" \ No newline at end of file diff --git a/packages/plugin-company/src/flow_roles.object.yml b/packages/plugin-company/src/flow_roles.object.yml deleted file mode 100644 index cdf8fb56a2..0000000000 --- a/packages/plugin-company/src/flow_roles.object.yml +++ /dev/null @@ -1,7 +0,0 @@ -extend: flow_roles -fields: - company_id: - required: false - omit: false - hidden: false - visible_on: "{{true}}" \ No newline at end of file diff --git a/packages/plugin-company/src/flows.object.yml b/packages/plugin-company/src/flows.object.yml deleted file mode 100644 index 918bb48995..0000000000 --- a/packages/plugin-company/src/flows.object.yml +++ /dev/null @@ -1,7 +0,0 @@ -extend: flows -fields: - company_id: - required: false - omit: false - hidden: false - visible_on: "{{true}}" \ No newline at end of file diff --git a/packages/plugin-company/src/forms.object.yml b/packages/plugin-company/src/forms.object.yml deleted file mode 100644 index 6eff334ed4..0000000000 --- a/packages/plugin-company/src/forms.object.yml +++ /dev/null @@ -1,7 +0,0 @@ -extend: forms -fields: - company_id: - required: false - omit: false - hidden: false - visible_on: "{{true}}" \ No newline at end of file diff --git a/packages/plugin-company/src/instance_number_rules.object.yml b/packages/plugin-company/src/instance_number_rules.object.yml deleted file mode 100644 index aee431afa9..0000000000 --- a/packages/plugin-company/src/instance_number_rules.object.yml +++ /dev/null @@ -1,7 +0,0 @@ -extend: instance_number_rules -fields: - company_id: - required: false - omit: false - hidden: false - visible_on: "{{true}}" \ No newline at end of file diff --git a/packages/plugin-company/src/instances.object.yml b/packages/plugin-company/src/instances.object.yml deleted file mode 100644 index 64d21574ae..0000000000 --- a/packages/plugin-company/src/instances.object.yml +++ /dev/null @@ -1,6 +0,0 @@ -extend: instances -fields: - company_id: - required: false - omit: false - hidden: false \ No newline at end of file diff --git a/packages/plugin-company/src/instances_statistic.object.yml b/packages/plugin-company/src/instances_statistic.object.yml deleted file mode 100644 index 94f696157d..0000000000 --- a/packages/plugin-company/src/instances_statistic.object.yml +++ /dev/null @@ -1,7 +0,0 @@ -extend: instances_statistic -fields: - company_id: - required: false - omit: false - hidden: false - visible_on: "{{true}}" \ No newline at end of file diff --git a/packages/plugin-company/src/organizations.object.yml b/packages/plugin-company/src/organizations.object.yml deleted file mode 100644 index 478187bcbc..0000000000 --- a/packages/plugin-company/src/organizations.object.yml +++ /dev/null @@ -1,11 +0,0 @@ -extend: organizations -fields: - company_id: - readonly: true - visible_on: "{{global.mode ==='read' ? true : false}}" - hidden: false - company_ids: - omit: true - hidden: true - is_company: - hidden: false diff --git a/packages/plugin-company/src/space_user_signs.object.yml b/packages/plugin-company/src/space_user_signs.object.yml deleted file mode 100644 index 8d1b307343..0000000000 --- a/packages/plugin-company/src/space_user_signs.object.yml +++ /dev/null @@ -1,7 +0,0 @@ -extend: space_user_signs -fields: - company_id: - required: false - omit: false - hidden: false - visible_on: "{{true}}" diff --git a/packages/plugin-company/src/space_users.object.yml b/packages/plugin-company/src/space_users.object.yml deleted file mode 100644 index bab599441f..0000000000 --- a/packages/plugin-company/src/space_users.object.yml +++ /dev/null @@ -1,8 +0,0 @@ -extend: space_users -fields: - company_id: - hidden: false - company_ids: - readonly: true - visible_on: "{{global.mode ==='read' ? true : false}}" - hidden: false diff --git a/packages/plugin-company/steedos-config.yml b/packages/plugin-company/steedos-config.yml deleted file mode 100644 index 47674899fa..0000000000 --- a/packages/plugin-company/steedos-config.yml +++ /dev/null @@ -1,31 +0,0 @@ -datasources: - default: - connection: - url: ${MONGO_URL} - objectFiles: - - "./src/**" -public: - cfs: - store: "local" - local: - folder: "./storage" -email: - host: - port: 465 - username: - password: - secure: true - from: -tenant: - _id: - name: 华炎魔方 - logo_url: - background_url: - enable_register: true - enable_forget_password: false - enable_create_tenant: true - enable_password_login: true - enable_bind_email: false - enable_bind_mobile: false -plugins: - - "@steedos/accounts" \ No newline at end of file diff --git a/packages/standard-objects/admin.app.yml b/packages/standard-objects/admin.app.yml index b321a2661b..7ac4af908b 100644 --- a/packages/standard-objects/admin.app.yml +++ b/packages/standard-objects/admin.app.yml @@ -264,4 +264,11 @@ admin_menus: permission_sets: - admin object_name: workflow_outbound_messages - parent: workflow_actions \ No newline at end of file + parent: workflow_actions + - _id: company + name: Division + permission_sets: + - admin + object_name: company + parent: menu_users + sort: 12 \ No newline at end of file diff --git a/packages/standard-objects/workflow/flow_positions.object.yml b/packages/standard-objects/workflow/flow_positions.object.yml index a3bf6a684b..a096d4cf2f 100644 --- a/packages/standard-objects/workflow/flow_positions.object.yml +++ b/packages/standard-objects/workflow/flow_positions.object.yml @@ -30,10 +30,11 @@ fields: required: true name: org filterable: true - # company_id: - # required: false - # omit: false - # hidden: false + company_id: + required: false + omit: false + hidden: false + visible_on: "{{true}}" list_views: all: filter_scope: space diff --git a/packages/standard-objects/workflow/flow_roles.object.yml b/packages/standard-objects/workflow/flow_roles.object.yml index b2a5c96903..9b8d1888f3 100644 --- a/packages/standard-objects/workflow/flow_roles.object.yml +++ b/packages/standard-objects/workflow/flow_roles.object.yml @@ -19,10 +19,11 @@ fields: searchable: true name: api_name filterable: true - # company_id: - # required: false - # omit: false - # hidden: false + company_id: + required: false + omit: false + hidden: false + visible_on: "{{true}}" list_views: all: filter_scope: space diff --git a/packages/standard-objects/workflow/flows.object.yml b/packages/standard-objects/workflow/flows.object.yml index 010175403d..b4f0d1595f 100644 --- a/packages/standard-objects/workflow/flows.object.yml +++ b/packages/standard-objects/workflow/flows.object.yml @@ -78,6 +78,10 @@ fields: name: help_text company_id: label: Main Division + required: false + omit: false + hidden: false + visible_on: "{{true}}" created_by: label: Created by sort_no: 9999 diff --git a/packages/standard-objects/workflow/forms.object.yml b/packages/standard-objects/workflow/forms.object.yml index ca920616cd..1130f97ad8 100644 --- a/packages/standard-objects/workflow/forms.object.yml +++ b/packages/standard-objects/workflow/forms.object.yml @@ -206,10 +206,11 @@ fields: name: current.fields.$.visibleOn amis: visibleOn: ${!!_master.record.object_name} - # company_id: - # required: false - # omit: false - # hidden: false + company_id: + required: false + omit: false + hidden: false + visible_on: "{{true}}" list_views: all: label: All Forms diff --git a/packages/standard-objects/workflow/instance_number_rules.object.yml b/packages/standard-objects/workflow/instance_number_rules.object.yml index ece3b29df8..eacc6fcdf6 100644 --- a/packages/standard-objects/workflow/instance_number_rules.object.yml +++ b/packages/standard-objects/workflow/instance_number_rules.object.yml @@ -36,10 +36,11 @@ fields: name: rules searchable: true filterable: true - # company_id: - # required: false - # omit: false - # hidden: false + company_id: + required: false + omit: false + hidden: false + visible_on: "{{true}}" list_views: all: filter_scope: space diff --git a/packages/standard-objects/workflow/instances.object.yml b/packages/standard-objects/workflow/instances.object.yml index 3614ec2384..cbe8e579e3 100644 --- a/packages/standard-objects/workflow/instances.object.yml +++ b/packages/standard-objects/workflow/instances.object.yml @@ -207,10 +207,10 @@ fields: # type: '[text]' # hidden: true # name: record_ids.$.ids - # company_id: - # required: false - # omit: false - # hidden: false + company_id: + required: false + omit: false + hidden: false current_step_name: label: Current Step Name type: text diff --git a/packages/standard-objects/workflow/instances_statistic.object.yml b/packages/standard-objects/workflow/instances_statistic.object.yml index 7219248d15..e1159bdd7e 100644 --- a/packages/standard-objects/workflow/instances_statistic.object.yml +++ b/packages/standard-objects/workflow/instances_statistic.object.yml @@ -68,10 +68,11 @@ fields: defaultValue: [] name: owner_organizations filterable: true - # company_id: - # required: false - # omit: false - # hidden: false + company_id: + required: false + omit: false + hidden: false + visible_on: "{{true}}" list_views: all: label: All diff --git a/packages/standard-objects/workflow/space_user_signs.object.yml b/packages/standard-objects/workflow/space_user_signs.object.yml index 607b0fb597..875114b59b 100644 --- a/packages/standard-objects/workflow/space_user_signs.object.yml +++ b/packages/standard-objects/workflow/space_user_signs.object.yml @@ -18,10 +18,11 @@ fields: type: avatar label: Sign name: sign - # company_id: - # required: false - # omit: false - # hidden: false + company_id: + required: false + omit: false + hidden: false + visible_on: "{{true}}" list_views: all: filter_scope: space diff --git a/services/service-core-objects/README.md b/services/service-core-objects/README.md new file mode 100644 index 0000000000..4103d50d83 --- /dev/null +++ b/services/service-core-objects/README.md @@ -0,0 +1,64 @@ +# @steedos/standard-space + +### 服务名称 `~packages-@steedos/standard-space` + +## actions + +### 全量同步组织 + +名称: `upsetOrganizations` + +参数(JSON) +- `organizations`: 需要同步的数据, `idFieldName` 指定的key不可以为空 +- `spaceInfo`: 同步到此工作区 +- `idFieldName`: 需要同步的数据中唯一键的字段名称 +- `parentFieldName`: 需要同步的数据中父级ID的字段名称 + +示例 +``` +this.broker.call('~packages-@steedos/standard-space.upsetOrganizations', { + organizations: [{ + qywx_id: "1", + name: "组织1" + },{ + qywx_id: "2", + name: "组织1", + qywx_pid: "1" + }], + spaceInfo: { + _id: "spaceId", + name: "spaceName" + }, + idFieldName: "qywx_id", + parentFieldName: "qywx_pid" +}) +``` + +### 全量同步用户 + +名称: `upsetSpaceUsers` + +参数(JSON) +- `spaceUsers`: 需要同步的数据, `idFieldName` 指定的key不可以为空, `organizations` 不可为空 +- `spaceInfo`: 同步到此工作区 +- `idFieldName`: 需要同步的数据中唯一键的字段名称 +- `orgIdFieldName`: organizations 数据中id的字段名称, 如上例中的 `qywx_id` + +示例 +``` +this.broker.call('~packages-@steedos/standard-space.upsetSpaceUsers', { + spaceUsers: [{ + name: "user1", + organizations: ['1'] + },{ + name: "user2", + organizations: ['2'] + }], + spaceInfo: { + _id: "spaceId", + name: "spaceName" + }, + idFieldName: "qywx_id", + orgIdFieldName: "qywx_id" +}) +``` \ No newline at end of file diff --git a/services/standard-space/main/default/objectTranslations/space_users.en/space_users.en.objectTranslation.yml b/services/service-core-objects/main/default/objectTranslations/space_users.en/space_users.en.objectTranslation.yml similarity index 100% rename from services/standard-space/main/default/objectTranslations/space_users.en/space_users.en.objectTranslation.yml rename to services/service-core-objects/main/default/objectTranslations/space_users.en/space_users.en.objectTranslation.yml diff --git a/services/standard-space/main/default/objectTranslations/space_users.zh-CN/space_users.zh-CN.objectTranslation.yml b/services/service-core-objects/main/default/objectTranslations/space_users.zh-CN/space_users.zh-CN.objectTranslation.yml similarity index 100% rename from services/standard-space/main/default/objectTranslations/space_users.zh-CN/space_users.zh-CN.objectTranslation.yml rename to services/service-core-objects/main/default/objectTranslations/space_users.zh-CN/space_users.zh-CN.objectTranslation.yml diff --git a/services/standard-space/main/default/objectTranslations/spaces.en/spaces.en.objectTranslation.yml b/services/service-core-objects/main/default/objectTranslations/spaces.en/spaces.en.objectTranslation.yml similarity index 100% rename from services/standard-space/main/default/objectTranslations/spaces.en/spaces.en.objectTranslation.yml rename to services/service-core-objects/main/default/objectTranslations/spaces.en/spaces.en.objectTranslation.yml diff --git a/services/standard-space/main/default/objectTranslations/spaces.zh-CN/spaces.zh-CN.objectTranslation.yml b/services/service-core-objects/main/default/objectTranslations/spaces.zh-CN/spaces.zh-CN.objectTranslation.yml similarity index 100% rename from services/standard-space/main/default/objectTranslations/spaces.zh-CN/spaces.zh-CN.objectTranslation.yml rename to services/service-core-objects/main/default/objectTranslations/spaces.zh-CN/spaces.zh-CN.objectTranslation.yml diff --git a/services/standard-space/main/default/objectTranslations/users.en/users.en.objectTranslation.yml b/services/service-core-objects/main/default/objectTranslations/users.en/users.en.objectTranslation.yml similarity index 100% rename from services/standard-space/main/default/objectTranslations/users.en/users.en.objectTranslation.yml rename to services/service-core-objects/main/default/objectTranslations/users.en/users.en.objectTranslation.yml diff --git a/services/standard-space/main/default/objectTranslations/users.zh-CN/users.zh-CN.objectTranslation.yml b/services/service-core-objects/main/default/objectTranslations/users.zh-CN/users.zh-CN.objectTranslation.yml similarity index 100% rename from services/standard-space/main/default/objectTranslations/users.zh-CN/users.zh-CN.objectTranslation.yml rename to services/service-core-objects/main/default/objectTranslations/users.zh-CN/users.zh-CN.objectTranslation.yml diff --git a/services/standard-space/main/default/objects/space_users/buttons/clear_login_tokens.button.button.js b/services/service-core-objects/main/default/objects/space_users/buttons/clear_login_tokens.button.button.js similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/clear_login_tokens.button.button.js rename to services/service-core-objects/main/default/objects/space_users/buttons/clear_login_tokens.button.button.js diff --git a/services/standard-space/main/default/objects/space_users/buttons/clear_login_tokens.button.yml b/services/service-core-objects/main/default/objects/space_users/buttons/clear_login_tokens.button.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/clear_login_tokens.button.yml rename to services/service-core-objects/main/default/objects/space_users/buttons/clear_login_tokens.button.yml diff --git a/services/standard-space/main/default/objects/space_users/buttons/disable.button.js b/services/service-core-objects/main/default/objects/space_users/buttons/disable.button.js similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/disable.button.js rename to services/service-core-objects/main/default/objects/space_users/buttons/disable.button.js diff --git a/services/standard-space/main/default/objects/space_users/buttons/disable.button.yml b/services/service-core-objects/main/default/objects/space_users/buttons/disable.button.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/disable.button.yml rename to services/service-core-objects/main/default/objects/space_users/buttons/disable.button.yml diff --git a/services/standard-space/main/default/objects/space_users/buttons/enable.button.js b/services/service-core-objects/main/default/objects/space_users/buttons/enable.button.js similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/enable.button.js rename to services/service-core-objects/main/default/objects/space_users/buttons/enable.button.js diff --git a/services/standard-space/main/default/objects/space_users/buttons/enable.button.yml b/services/service-core-objects/main/default/objects/space_users/buttons/enable.button.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/enable.button.yml rename to services/service-core-objects/main/default/objects/space_users/buttons/enable.button.yml diff --git a/services/standard-space/main/default/objects/space_users/buttons/import.button.js b/services/service-core-objects/main/default/objects/space_users/buttons/import.button.js similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/import.button.js rename to services/service-core-objects/main/default/objects/space_users/buttons/import.button.js diff --git a/services/standard-space/main/default/objects/space_users/buttons/import.button.yml b/services/service-core-objects/main/default/objects/space_users/buttons/import.button.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/import.button.yml rename to services/service-core-objects/main/default/objects/space_users/buttons/import.button.yml diff --git a/services/standard-space/main/default/objects/space_users/buttons/invite_space_users.button.js b/services/service-core-objects/main/default/objects/space_users/buttons/invite_space_users.button.js similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/invite_space_users.button.js rename to services/service-core-objects/main/default/objects/space_users/buttons/invite_space_users.button.js diff --git a/services/standard-space/main/default/objects/space_users/buttons/invite_space_users.button.yml b/services/service-core-objects/main/default/objects/space_users/buttons/invite_space_users.button.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/invite_space_users.button.yml rename to services/service-core-objects/main/default/objects/space_users/buttons/invite_space_users.button.yml diff --git a/services/standard-space/main/default/objects/space_users/buttons/invite_user.button.js b/services/service-core-objects/main/default/objects/space_users/buttons/invite_user.button.js similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/invite_user.button.js rename to services/service-core-objects/main/default/objects/space_users/buttons/invite_user.button.js diff --git a/services/standard-space/main/default/objects/space_users/buttons/invite_user.button.yml b/services/service-core-objects/main/default/objects/space_users/buttons/invite_user.button.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/invite_user.button.yml rename to services/service-core-objects/main/default/objects/space_users/buttons/invite_user.button.yml diff --git a/services/standard-space/main/default/objects/space_users/buttons/lockout.button.js b/services/service-core-objects/main/default/objects/space_users/buttons/lockout.button.js similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/lockout.button.js rename to services/service-core-objects/main/default/objects/space_users/buttons/lockout.button.js diff --git a/services/standard-space/main/default/objects/space_users/buttons/lockout.button.yml b/services/service-core-objects/main/default/objects/space_users/buttons/lockout.button.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/lockout.button.yml rename to services/service-core-objects/main/default/objects/space_users/buttons/lockout.button.yml diff --git a/services/standard-space/main/default/objects/space_users/buttons/setPassword.button.js b/services/service-core-objects/main/default/objects/space_users/buttons/setPassword.button.js similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/setPassword.button.js rename to services/service-core-objects/main/default/objects/space_users/buttons/setPassword.button.js diff --git a/services/standard-space/main/default/objects/space_users/buttons/setPassword.button.yml b/services/service-core-objects/main/default/objects/space_users/buttons/setPassword.button.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/setPassword.button.yml rename to services/service-core-objects/main/default/objects/space_users/buttons/setPassword.button.yml diff --git a/services/standard-space/main/default/objects/space_users/buttons/standard_delete.button.js b/services/service-core-objects/main/default/objects/space_users/buttons/standard_delete.button.js similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/standard_delete.button.js rename to services/service-core-objects/main/default/objects/space_users/buttons/standard_delete.button.js diff --git a/services/standard-space/main/default/objects/space_users/buttons/standard_delete.button.yml b/services/service-core-objects/main/default/objects/space_users/buttons/standard_delete.button.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/standard_delete.button.yml rename to services/service-core-objects/main/default/objects/space_users/buttons/standard_delete.button.yml diff --git a/services/standard-space/main/default/objects/space_users/buttons/standard_delete_many.button.js b/services/service-core-objects/main/default/objects/space_users/buttons/standard_delete_many.button.js similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/standard_delete_many.button.js rename to services/service-core-objects/main/default/objects/space_users/buttons/standard_delete_many.button.js diff --git a/services/standard-space/main/default/objects/space_users/buttons/standard_delete_many.button.yml b/services/service-core-objects/main/default/objects/space_users/buttons/standard_delete_many.button.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/standard_delete_many.button.yml rename to services/service-core-objects/main/default/objects/space_users/buttons/standard_delete_many.button.yml diff --git a/services/standard-space/main/default/objects/space_users/buttons/standard_edit.button.js b/services/service-core-objects/main/default/objects/space_users/buttons/standard_edit.button.js similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/standard_edit.button.js rename to services/service-core-objects/main/default/objects/space_users/buttons/standard_edit.button.js diff --git a/services/standard-space/main/default/objects/space_users/buttons/standard_edit.button.yml b/services/service-core-objects/main/default/objects/space_users/buttons/standard_edit.button.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/standard_edit.button.yml rename to services/service-core-objects/main/default/objects/space_users/buttons/standard_edit.button.yml diff --git a/services/standard-space/main/default/objects/space_users/buttons/standard_new.button.js b/services/service-core-objects/main/default/objects/space_users/buttons/standard_new.button.js similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/standard_new.button.js rename to services/service-core-objects/main/default/objects/space_users/buttons/standard_new.button.js diff --git a/services/standard-space/main/default/objects/space_users/buttons/standard_new.button.yml b/services/service-core-objects/main/default/objects/space_users/buttons/standard_new.button.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/standard_new.button.yml rename to services/service-core-objects/main/default/objects/space_users/buttons/standard_new.button.yml diff --git a/services/standard-space/main/default/objects/space_users/buttons/unlock.button.js b/services/service-core-objects/main/default/objects/space_users/buttons/unlock.button.js similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/unlock.button.js rename to services/service-core-objects/main/default/objects/space_users/buttons/unlock.button.js diff --git a/services/standard-space/main/default/objects/space_users/buttons/unlock.button.yml b/services/service-core-objects/main/default/objects/space_users/buttons/unlock.button.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/unlock.button.yml rename to services/service-core-objects/main/default/objects/space_users/buttons/unlock.button.yml diff --git a/services/standard-space/main/default/objects/space_users/buttons/verify_email.button.js b/services/service-core-objects/main/default/objects/space_users/buttons/verify_email.button.js similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/verify_email.button.js rename to services/service-core-objects/main/default/objects/space_users/buttons/verify_email.button.js diff --git a/services/standard-space/main/default/objects/space_users/buttons/verify_email.button.yml b/services/service-core-objects/main/default/objects/space_users/buttons/verify_email.button.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/verify_email.button.yml rename to services/service-core-objects/main/default/objects/space_users/buttons/verify_email.button.yml diff --git a/services/standard-space/main/default/objects/space_users/buttons/verify_mobile.button.js b/services/service-core-objects/main/default/objects/space_users/buttons/verify_mobile.button.js similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/verify_mobile.button.js rename to services/service-core-objects/main/default/objects/space_users/buttons/verify_mobile.button.js diff --git a/services/standard-space/main/default/objects/space_users/buttons/verify_mobile.button.yml b/services/service-core-objects/main/default/objects/space_users/buttons/verify_mobile.button.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/buttons/verify_mobile.button.yml rename to services/service-core-objects/main/default/objects/space_users/buttons/verify_mobile.button.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/avatar.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/avatar.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/avatar.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/avatar.field.yml diff --git a/services/service-core-objects/main/default/objects/space_users/fields/company_id.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/company_id.field.yml new file mode 100644 index 0000000000..8538b07cfc --- /dev/null +++ b/services/service-core-objects/main/default/objects/space_users/fields/company_id.field.yml @@ -0,0 +1,7 @@ +name: company_id +label: Main Division +type: lookup +visible_on: '{{global.mode ===''read'' ? true : false}}' +readonly: true +hidden: false +sort_no: 200 diff --git a/services/standard-space/main/default/objects/space_users/fields/company_ids.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/company_ids.field.yml similarity index 89% rename from services/standard-space/main/default/objects/space_users/fields/company_ids.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/company_ids.field.yml index c65190c9b4..637c52edd3 100644 --- a/services/standard-space/main/default/objects/space_users/fields/company_ids.field.yml +++ b/services/service-core-objects/main/default/objects/space_users/fields/company_ids.field.yml @@ -6,6 +6,8 @@ multiple: true index: true readonly: true filterable: true +visible_on: "{{global.mode ==='read' ? true : false}}" +hidden: false defaultValue: ! |- function anonymous( ) { diff --git a/services/standard-space/main/default/objects/space_users/fields/email.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/email.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/email.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/email.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/email_notification.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/email_notification.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/email_notification.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/email_notification.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/email_verified.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/email_verified.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/email_verified.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/email_verified.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/hr.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/hr.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/hr.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/hr.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/invite_state.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/invite_state.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/invite_state.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/invite_state.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/is_customer.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/is_customer.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/is_customer.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/is_customer.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/is_supplier.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/is_supplier.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/is_supplier.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/is_supplier.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/last_logon.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/last_logon.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/last_logon.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/last_logon.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/locale.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/locale.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/locale.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/locale.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/manager.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/manager.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/manager.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/manager.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/mobile.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/mobile.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/mobile.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/mobile.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/mobile_verified.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/mobile_verified.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/mobile_verified.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/mobile_verified.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/name.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/name.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/name.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/name.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/organization.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/organization.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/organization.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/organization.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/organizations.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/organizations.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/organizations.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/organizations.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/organizations_parents.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/organizations_parents.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/organizations_parents.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/organizations_parents.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/password.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/password.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/password.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/password.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/password_expired.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/password_expired.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/password_expired.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/password_expired.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/position.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/position.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/position.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/position.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/profile.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/profile.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/profile.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/profile.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/sms_notification.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/sms_notification.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/sms_notification.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/sms_notification.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/sort_no.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/sort_no.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/sort_no.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/sort_no.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/user.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/user.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/user.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/user.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/user_accepted.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/user_accepted.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/user_accepted.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/user_accepted.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/username.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/username.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/username.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/username.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/work_phone.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/work_phone.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/work_phone.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/work_phone.field.yml diff --git a/services/standard-space/main/default/objects/space_users/fields/zoom.field.yml b/services/service-core-objects/main/default/objects/space_users/fields/zoom.field.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/fields/zoom.field.yml rename to services/service-core-objects/main/default/objects/space_users/fields/zoom.field.yml diff --git a/services/standard-space/main/default/objects/space_users/listviews/all.listview.yml b/services/service-core-objects/main/default/objects/space_users/listviews/all.listview.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/listviews/all.listview.yml rename to services/service-core-objects/main/default/objects/space_users/listviews/all.listview.yml diff --git a/services/standard-space/main/default/objects/space_users/listviews/customer.istview-4721.yml b/services/service-core-objects/main/default/objects/space_users/listviews/customer.istview-4721.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/listviews/customer.istview-4721.yml rename to services/service-core-objects/main/default/objects/space_users/listviews/customer.istview-4721.yml diff --git a/services/standard-space/main/default/objects/space_users/listviews/disabled.listview.yml b/services/service-core-objects/main/default/objects/space_users/listviews/disabled.listview.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/listviews/disabled.listview.yml rename to services/service-core-objects/main/default/objects/space_users/listviews/disabled.listview.yml diff --git a/services/standard-space/main/default/objects/space_users/listviews/supplier.listview-4721.yml b/services/service-core-objects/main/default/objects/space_users/listviews/supplier.listview-4721.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/listviews/supplier.listview-4721.yml rename to services/service-core-objects/main/default/objects/space_users/listviews/supplier.listview-4721.yml diff --git a/services/standard-space/main/default/objects/space_users/permissions/admin.permission.yml b/services/service-core-objects/main/default/objects/space_users/permissions/admin.permission.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/permissions/admin.permission.yml rename to services/service-core-objects/main/default/objects/space_users/permissions/admin.permission.yml diff --git a/services/standard-space/main/default/objects/space_users/permissions/customer.permission.yml b/services/service-core-objects/main/default/objects/space_users/permissions/customer.permission.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/permissions/customer.permission.yml rename to services/service-core-objects/main/default/objects/space_users/permissions/customer.permission.yml diff --git a/services/standard-space/main/default/objects/space_users/permissions/organization_admin.permission.yml b/services/service-core-objects/main/default/objects/space_users/permissions/organization_admin.permission.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/permissions/organization_admin.permission.yml rename to services/service-core-objects/main/default/objects/space_users/permissions/organization_admin.permission.yml diff --git a/services/standard-space/main/default/objects/space_users/permissions/supplier.permission.yml b/services/service-core-objects/main/default/objects/space_users/permissions/supplier.permission.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/permissions/supplier.permission.yml rename to services/service-core-objects/main/default/objects/space_users/permissions/supplier.permission.yml diff --git a/services/standard-space/main/default/objects/space_users/permissions/user.permission.yml b/services/service-core-objects/main/default/objects/space_users/permissions/user.permission.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/permissions/user.permission.yml rename to services/service-core-objects/main/default/objects/space_users/permissions/user.permission.yml diff --git a/services/standard-space/main/default/objects/space_users/space_users.object.yml b/services/service-core-objects/main/default/objects/space_users/space_users.object.yml similarity index 100% rename from services/standard-space/main/default/objects/space_users/space_users.object.yml rename to services/service-core-objects/main/default/objects/space_users/space_users.object.yml diff --git a/services/standard-space/main/default/objects/spaces/buttons/invite_space_users.button.js b/services/service-core-objects/main/default/objects/spaces/buttons/invite_space_users.button.js similarity index 100% rename from services/standard-space/main/default/objects/spaces/buttons/invite_space_users.button.js rename to services/service-core-objects/main/default/objects/spaces/buttons/invite_space_users.button.js diff --git a/services/standard-space/main/default/objects/spaces/buttons/invite_space_users.button.yml b/services/service-core-objects/main/default/objects/spaces/buttons/invite_space_users.button.yml similarity index 100% rename from services/standard-space/main/default/objects/spaces/buttons/invite_space_users.button.yml rename to services/service-core-objects/main/default/objects/spaces/buttons/invite_space_users.button.yml diff --git a/services/standard-space/main/default/objects/spaces/buttons/standard_new.button.js b/services/service-core-objects/main/default/objects/spaces/buttons/standard_new.button.js similarity index 100% rename from services/standard-space/main/default/objects/spaces/buttons/standard_new.button.js rename to services/service-core-objects/main/default/objects/spaces/buttons/standard_new.button.js diff --git a/services/standard-space/main/default/objects/spaces/buttons/standard_new.button.yml b/services/service-core-objects/main/default/objects/spaces/buttons/standard_new.button.yml similarity index 100% rename from services/standard-space/main/default/objects/spaces/buttons/standard_new.button.yml rename to services/service-core-objects/main/default/objects/spaces/buttons/standard_new.button.yml diff --git a/services/standard-space/main/default/objects/spaces/buttons/upgrade.button.js b/services/service-core-objects/main/default/objects/spaces/buttons/upgrade.button.js similarity index 100% rename from services/standard-space/main/default/objects/spaces/buttons/upgrade.button.js rename to services/service-core-objects/main/default/objects/spaces/buttons/upgrade.button.js diff --git a/services/standard-space/main/default/objects/spaces/buttons/upgrade.button.yml b/services/service-core-objects/main/default/objects/spaces/buttons/upgrade.button.yml similarity index 100% rename from services/standard-space/main/default/objects/spaces/buttons/upgrade.button.yml rename to services/service-core-objects/main/default/objects/spaces/buttons/upgrade.button.yml diff --git a/services/standard-space/main/default/objects/spaces/fields/admins.field.yml b/services/service-core-objects/main/default/objects/spaces/fields/admins.field.yml similarity index 100% rename from services/standard-space/main/default/objects/spaces/fields/admins.field.yml rename to services/service-core-objects/main/default/objects/spaces/fields/admins.field.yml diff --git a/services/standard-space/main/default/objects/spaces/fields/balance.field.yml b/services/service-core-objects/main/default/objects/spaces/fields/balance.field.yml similarity index 100% rename from services/standard-space/main/default/objects/spaces/fields/balance.field.yml rename to services/service-core-objects/main/default/objects/spaces/fields/balance.field.yml diff --git a/services/standard-space/main/default/objects/spaces/fields/billing.remaining_months.field.yml b/services/service-core-objects/main/default/objects/spaces/fields/billing.remaining_months.field.yml similarity index 100% rename from services/standard-space/main/default/objects/spaces/fields/billing.remaining_months.field.yml rename to services/service-core-objects/main/default/objects/spaces/fields/billing.remaining_months.field.yml diff --git a/services/standard-space/main/default/objects/spaces/fields/company_id.field.yml b/services/service-core-objects/main/default/objects/spaces/fields/company_id.field.yml similarity index 100% rename from services/standard-space/main/default/objects/spaces/fields/company_id.field.yml rename to services/service-core-objects/main/default/objects/spaces/fields/company_id.field.yml diff --git a/services/standard-space/main/default/objects/spaces/fields/company_ids.field.yml b/services/service-core-objects/main/default/objects/spaces/fields/company_ids.field.yml similarity index 100% rename from services/standard-space/main/default/objects/spaces/fields/company_ids.field.yml rename to services/service-core-objects/main/default/objects/spaces/fields/company_ids.field.yml diff --git a/services/standard-space/main/default/objects/spaces/fields/default_organization.field.yml b/services/service-core-objects/main/default/objects/spaces/fields/default_organization.field.yml similarity index 100% rename from services/standard-space/main/default/objects/spaces/fields/default_organization.field.yml rename to services/service-core-objects/main/default/objects/spaces/fields/default_organization.field.yml diff --git a/services/standard-space/main/default/objects/spaces/fields/default_profile.field.yml b/services/service-core-objects/main/default/objects/spaces/fields/default_profile.field.yml similarity index 100% rename from services/standard-space/main/default/objects/spaces/fields/default_profile.field.yml rename to services/service-core-objects/main/default/objects/spaces/fields/default_profile.field.yml diff --git a/services/standard-space/main/default/objects/spaces/fields/enable_register.field.yml b/services/service-core-objects/main/default/objects/spaces/fields/enable_register.field.yml similarity index 100% rename from services/standard-space/main/default/objects/spaces/fields/enable_register.field.yml rename to services/service-core-objects/main/default/objects/spaces/fields/enable_register.field.yml diff --git a/services/standard-space/main/default/objects/spaces/fields/features.field.yml b/services/service-core-objects/main/default/objects/spaces/fields/features.field.yml similarity index 100% rename from services/standard-space/main/default/objects/spaces/fields/features.field.yml rename to services/service-core-objects/main/default/objects/spaces/fields/features.field.yml diff --git a/services/standard-space/main/default/objects/spaces/fields/name.field.yml b/services/service-core-objects/main/default/objects/spaces/fields/name.field.yml similarity index 100% rename from services/standard-space/main/default/objects/spaces/fields/name.field.yml rename to services/service-core-objects/main/default/objects/spaces/fields/name.field.yml diff --git a/services/standard-space/main/default/objects/spaces/fields/owner.field.yml b/services/service-core-objects/main/default/objects/spaces/fields/owner.field.yml similarity index 100% rename from services/standard-space/main/default/objects/spaces/fields/owner.field.yml rename to services/service-core-objects/main/default/objects/spaces/fields/owner.field.yml diff --git a/services/standard-space/main/default/objects/spaces/fields/services.field.yml b/services/service-core-objects/main/default/objects/spaces/fields/services.field.yml similarity index 100% rename from services/standard-space/main/default/objects/spaces/fields/services.field.yml rename to services/service-core-objects/main/default/objects/spaces/fields/services.field.yml diff --git a/services/standard-space/main/default/objects/spaces/listviews/all.listview.yml b/services/service-core-objects/main/default/objects/spaces/listviews/all.listview.yml similarity index 100% rename from services/standard-space/main/default/objects/spaces/listviews/all.listview.yml rename to services/service-core-objects/main/default/objects/spaces/listviews/all.listview.yml diff --git a/services/standard-space/main/default/objects/spaces/permissions/admin.permission.yml b/services/service-core-objects/main/default/objects/spaces/permissions/admin.permission.yml similarity index 100% rename from services/standard-space/main/default/objects/spaces/permissions/admin.permission.yml rename to services/service-core-objects/main/default/objects/spaces/permissions/admin.permission.yml diff --git a/services/standard-space/main/default/objects/spaces/permissions/guest.permission.yml b/services/service-core-objects/main/default/objects/spaces/permissions/guest.permission.yml similarity index 100% rename from services/standard-space/main/default/objects/spaces/permissions/guest.permission.yml rename to services/service-core-objects/main/default/objects/spaces/permissions/guest.permission.yml diff --git a/services/standard-space/main/default/objects/spaces/permissions/user.permission.yml b/services/service-core-objects/main/default/objects/spaces/permissions/user.permission.yml similarity index 100% rename from services/standard-space/main/default/objects/spaces/permissions/user.permission.yml rename to services/service-core-objects/main/default/objects/spaces/permissions/user.permission.yml diff --git a/services/standard-space/main/default/objects/spaces/spaces.object.yml b/services/service-core-objects/main/default/objects/spaces/spaces.object.yml similarity index 100% rename from services/standard-space/main/default/objects/spaces/spaces.object.yml rename to services/service-core-objects/main/default/objects/spaces/spaces.object.yml diff --git a/services/standard-space/main/default/objects/users/fields/avatar.field.yml b/services/service-core-objects/main/default/objects/users/fields/avatar.field.yml similarity index 100% rename from services/standard-space/main/default/objects/users/fields/avatar.field.yml rename to services/service-core-objects/main/default/objects/users/fields/avatar.field.yml diff --git a/services/standard-space/main/default/objects/users/fields/company_id.field.yml b/services/service-core-objects/main/default/objects/users/fields/company_id.field.yml similarity index 100% rename from services/standard-space/main/default/objects/users/fields/company_id.field.yml rename to services/service-core-objects/main/default/objects/users/fields/company_id.field.yml diff --git a/services/standard-space/main/default/objects/users/fields/company_ids.field.yml b/services/service-core-objects/main/default/objects/users/fields/company_ids.field.yml similarity index 100% rename from services/standard-space/main/default/objects/users/fields/company_ids.field.yml rename to services/service-core-objects/main/default/objects/users/fields/company_ids.field.yml diff --git a/services/standard-space/main/default/objects/users/fields/email.field.yml b/services/service-core-objects/main/default/objects/users/fields/email.field.yml similarity index 100% rename from services/standard-space/main/default/objects/users/fields/email.field.yml rename to services/service-core-objects/main/default/objects/users/fields/email.field.yml diff --git a/services/standard-space/main/default/objects/users/fields/email_notification.field.yml b/services/service-core-objects/main/default/objects/users/fields/email_notification.field.yml similarity index 100% rename from services/standard-space/main/default/objects/users/fields/email_notification.field.yml rename to services/service-core-objects/main/default/objects/users/fields/email_notification.field.yml diff --git a/services/standard-space/main/default/objects/users/fields/is_cloudadmin.field.yml b/services/service-core-objects/main/default/objects/users/fields/is_cloudadmin.field.yml similarity index 100% rename from services/standard-space/main/default/objects/users/fields/is_cloudadmin.field.yml rename to services/service-core-objects/main/default/objects/users/fields/is_cloudadmin.field.yml diff --git a/services/standard-space/main/default/objects/users/fields/is_deleted.field.yml b/services/service-core-objects/main/default/objects/users/fields/is_deleted.field.yml similarity index 100% rename from services/standard-space/main/default/objects/users/fields/is_deleted.field.yml rename to services/service-core-objects/main/default/objects/users/fields/is_deleted.field.yml diff --git a/services/standard-space/main/default/objects/users/fields/last_logon.field.yml b/services/service-core-objects/main/default/objects/users/fields/last_logon.field.yml similarity index 100% rename from services/standard-space/main/default/objects/users/fields/last_logon.field.yml rename to services/service-core-objects/main/default/objects/users/fields/last_logon.field.yml diff --git a/services/standard-space/main/default/objects/users/fields/locale.field.yml b/services/service-core-objects/main/default/objects/users/fields/locale.field.yml similarity index 100% rename from services/standard-space/main/default/objects/users/fields/locale.field.yml rename to services/service-core-objects/main/default/objects/users/fields/locale.field.yml diff --git a/services/standard-space/main/default/objects/users/fields/lockout.field.yml b/services/service-core-objects/main/default/objects/users/fields/lockout.field.yml similarity index 100% rename from services/standard-space/main/default/objects/users/fields/lockout.field.yml rename to services/service-core-objects/main/default/objects/users/fields/lockout.field.yml diff --git a/services/standard-space/main/default/objects/users/fields/login_failed_lockout_time.field.yml b/services/service-core-objects/main/default/objects/users/fields/login_failed_lockout_time.field.yml similarity index 100% rename from services/standard-space/main/default/objects/users/fields/login_failed_lockout_time.field.yml rename to services/service-core-objects/main/default/objects/users/fields/login_failed_lockout_time.field.yml diff --git a/services/standard-space/main/default/objects/users/fields/login_failed_number.field.yml b/services/service-core-objects/main/default/objects/users/fields/login_failed_number.field.yml similarity index 100% rename from services/standard-space/main/default/objects/users/fields/login_failed_number.field.yml rename to services/service-core-objects/main/default/objects/users/fields/login_failed_number.field.yml diff --git a/services/standard-space/main/default/objects/users/fields/mobile.field.yml b/services/service-core-objects/main/default/objects/users/fields/mobile.field.yml similarity index 100% rename from services/standard-space/main/default/objects/users/fields/mobile.field.yml rename to services/service-core-objects/main/default/objects/users/fields/mobile.field.yml diff --git a/services/standard-space/main/default/objects/users/fields/name.field.yml b/services/service-core-objects/main/default/objects/users/fields/name.field.yml similarity index 100% rename from services/standard-space/main/default/objects/users/fields/name.field.yml rename to services/service-core-objects/main/default/objects/users/fields/name.field.yml diff --git a/services/standard-space/main/default/objects/users/fields/password_expired.field.yml b/services/service-core-objects/main/default/objects/users/fields/password_expired.field.yml similarity index 100% rename from services/standard-space/main/default/objects/users/fields/password_expired.field.yml rename to services/service-core-objects/main/default/objects/users/fields/password_expired.field.yml diff --git a/services/standard-space/main/default/objects/users/fields/primary_email_verified.field.yml b/services/service-core-objects/main/default/objects/users/fields/primary_email_verified.field.yml similarity index 100% rename from services/standard-space/main/default/objects/users/fields/primary_email_verified.field.yml rename to services/service-core-objects/main/default/objects/users/fields/primary_email_verified.field.yml diff --git a/services/standard-space/main/default/objects/users/fields/steedos_id.field.yml b/services/service-core-objects/main/default/objects/users/fields/steedos_id.field.yml similarity index 100% rename from services/standard-space/main/default/objects/users/fields/steedos_id.field.yml rename to services/service-core-objects/main/default/objects/users/fields/steedos_id.field.yml diff --git a/services/standard-space/main/default/objects/users/fields/username.field.yml b/services/service-core-objects/main/default/objects/users/fields/username.field.yml similarity index 100% rename from services/standard-space/main/default/objects/users/fields/username.field.yml rename to services/service-core-objects/main/default/objects/users/fields/username.field.yml diff --git a/services/standard-space/main/default/objects/users/fields/utcOffset.field.yml b/services/service-core-objects/main/default/objects/users/fields/utcOffset.field.yml similarity index 100% rename from services/standard-space/main/default/objects/users/fields/utcOffset.field.yml rename to services/service-core-objects/main/default/objects/users/fields/utcOffset.field.yml diff --git a/services/standard-space/main/default/objects/users/listviews/all.listview.yml b/services/service-core-objects/main/default/objects/users/listviews/all.listview.yml similarity index 100% rename from services/standard-space/main/default/objects/users/listviews/all.listview.yml rename to services/service-core-objects/main/default/objects/users/listviews/all.listview.yml diff --git a/services/standard-space/main/default/objects/users/permissions/admin.permission.yml b/services/service-core-objects/main/default/objects/users/permissions/admin.permission.yml similarity index 100% rename from services/standard-space/main/default/objects/users/permissions/admin.permission.yml rename to services/service-core-objects/main/default/objects/users/permissions/admin.permission.yml diff --git a/services/standard-space/main/default/objects/users/permissions/guest.permission.yml b/services/service-core-objects/main/default/objects/users/permissions/guest.permission.yml similarity index 100% rename from services/standard-space/main/default/objects/users/permissions/guest.permission.yml rename to services/service-core-objects/main/default/objects/users/permissions/guest.permission.yml diff --git a/services/standard-space/main/default/objects/users/permissions/user.permission.yml b/services/service-core-objects/main/default/objects/users/permissions/user.permission.yml similarity index 100% rename from services/standard-space/main/default/objects/users/permissions/user.permission.yml rename to services/service-core-objects/main/default/objects/users/permissions/user.permission.yml diff --git a/services/standard-space/main/default/objects/users/users.object.yml b/services/service-core-objects/main/default/objects/users/users.object.yml similarity index 100% rename from services/standard-space/main/default/objects/users/users.object.yml rename to services/service-core-objects/main/default/objects/users/users.object.yml diff --git a/services/standard-space/main/default/triggers/company.trigger.js b/services/service-core-objects/main/default/triggers/company.trigger.js similarity index 100% rename from services/standard-space/main/default/triggers/company.trigger.js rename to services/service-core-objects/main/default/triggers/company.trigger.js diff --git a/services/standard-space/main/default/triggers/organizations.trigger.js b/services/service-core-objects/main/default/triggers/organizations.trigger.js similarity index 100% rename from services/standard-space/main/default/triggers/organizations.trigger.js rename to services/service-core-objects/main/default/triggers/organizations.trigger.js diff --git a/services/standard-space/main/default/triggers/space_users.core.js b/services/service-core-objects/main/default/triggers/space_users.core.js similarity index 90% rename from services/standard-space/main/default/triggers/space_users.core.js rename to services/service-core-objects/main/default/triggers/space_users.core.js index 32c9f7ebd6..3e3e38e652 100644 --- a/services/standard-space/main/default/triggers/space_users.core.js +++ b/services/service-core-objects/main/default/triggers/space_users.core.js @@ -2,7 +2,7 @@ * @Author: sunhaolin@hotoa.com * @Date: 2021-05-24 12:32:57 * @LastEditors: baozhoutao@steedos.com - * @LastEditTime: 2024-01-20 11:21:14 + * @LastEditTime: 2025-01-15 14:32:11 * @Description: */ const _ = require('underscore'); @@ -10,8 +10,6 @@ const NEEDSYNCATTRIBUTES = ['name', 'username', 'email', 'email_verified', 'mobi 'mobile_verified', 'locale', 'avatar', 'last_logon', 'email_notification', 'sms_notification', 'password_expired']; const { Binary } = require('mongodb'); const { getObject } = require('@steedos/objectql'); -const Fiber = require('fibers'); - getNeedSyncSet = function(doc, modifierSet){ let syncSet = {}; @@ -72,11 +70,12 @@ exports.syncUserInfo = async function (doc, modifierSet) { _conertToBinary(needSyncProp); await userObj.directUpdate(doc.user, userProp) - Fiber(function(){ - return db.space_users.direct.update({_id: {$ne: doc._id}, user: doc.user}, {$set: needSyncProp}, { - multi: true - }); - }).run();; + + const suCollection = await suObj.getCollection(); + + await suCollection.update({user: doc.user}, {$set: needSyncProp}, { + multi: true + }) } } diff --git a/services/standard-space/main/default/triggers/space_users.trigger.js b/services/service-core-objects/main/default/triggers/space_users.trigger.js similarity index 100% rename from services/standard-space/main/default/triggers/space_users.trigger.js rename to services/service-core-objects/main/default/triggers/space_users.trigger.js diff --git a/services/standard-space/main/default/triggers/spaces.trigger.js b/services/service-core-objects/main/default/triggers/spaces.trigger.js similarity index 100% rename from services/standard-space/main/default/triggers/spaces.trigger.js rename to services/service-core-objects/main/default/triggers/spaces.trigger.js diff --git a/services/standard-space/main/default/triggers/users.trigger.js b/services/service-core-objects/main/default/triggers/users.trigger.js similarity index 100% rename from services/standard-space/main/default/triggers/users.trigger.js rename to services/service-core-objects/main/default/triggers/users.trigger.js diff --git a/services/service-core-objects/main/default/util/password.js b/services/service-core-objects/main/default/util/password.js new file mode 100644 index 0000000000..279a38efaa --- /dev/null +++ b/services/service-core-objects/main/default/util/password.js @@ -0,0 +1,48 @@ +const crypto = require('crypto'); +const objectql = require('@steedos/objectql'); +const config = objectql.getSteedosConfig(); + +const bcrypt = require('bcryptjs'); + +bcryptPassword = function(password){ + const salt = bcrypt.genSaltSync(10); + const hash = bcrypt.hashSync(password, salt); + return hash; +}; + +hashPassword = function(password, algorithm){ + if (typeof password === 'string') { + const hash = crypto.createHash(algorithm); + hash.update(password); + return hash.digest('hex'); + } + + return password.digest; +}; + + +exports.parsePassword = function(newPassword, options){ + + const passwordHashAlgorithm = "sha256" + let passwordPolicy = (config.password || {}).policy + if(passwordPolicy){ + if(!(new RegExp(passwordPolicy)).test(newPassword || '')){ + let err = new Error(config.password.policyError); + throw new Meteor.Error(400, { + message: err.message, + loginInfo: err.loginInfo, + errorCode: err.errorCode, + } ); + } + } + const formattedPassword = hashPassword(newPassword, passwordHashAlgorithm ) + const bcrypt = bcryptPassword(formattedPassword) + if(!options.services){ + options.services = {} + } + if (!options.services.password) { + options.services.password = {}; + } + options.services.password.bcrypt = bcrypt; + options.password_expired = false; +} \ No newline at end of file diff --git a/services/service-core-objects/package.json b/services/service-core-objects/package.json new file mode 100644 index 0000000000..ab0def61bb --- /dev/null +++ b/services/service-core-objects/package.json @@ -0,0 +1,20 @@ +{ + "name": "@steedos/service-core-objects", + "version": "3.0.0-beta.2", + "main": "package.service.js", + "private": false, + "publishConfig": { + "access": "public" + }, + "keywords": [ + "steedos" + ], + "dependencies": { + "@steedos/service-package-loader": "3.0.0-beta.2", + "lodash": "^4.17.21" + }, + "description": "steedos package", + "repository": {}, + "license": "MIT", + "gitHead": "72fa51bda8ff714d5fdb933bf0a45ea4cb82df74" +} diff --git a/services/service-core-objects/package.service.js b/services/service-core-objects/package.service.js new file mode 100644 index 0000000000..f0779cc21b --- /dev/null +++ b/services/service-core-objects/package.service.js @@ -0,0 +1,189 @@ +/* + * @Author: sunhaolin@hotoa.com + * @Date: 2022-12-02 13:17:06 + * @LastEditors: baozhoutao@steedos.com + * @LastEditTime: 2025-01-15 12:05:03 + * @Description: + */ +"use strict"; +const project = require('./package.json'); +const packageName = project.name; +const packageLoader = require('@steedos/service-package-loader'); +const objectMixin = require('@steedos/service-object-mixin') +const objectql = require('@steedos/objectql'); +const { MongoClient } = require('mongodb'); +const _ = require('lodash') + +const triggers = require('./src/triggers') + +const methods = require('./src/methods'); +const actions = require('./src/actions') + +/** + * @typedef {import('moleculer').Context} Context Moleculer's Context + */ +module.exports = { + name: packageName, + namespace: "steedos", + mixins: [packageLoader], + /** + * Settings + */ + settings: { + packageInfo: { + path: __dirname, + name: packageName, + isPackage: true + }, + STEEDOS_IDENTITY_OIDC_ENABLED: process.env.STEEDOS_IDENTITY_OIDC_ENABLED, + STEEDOS_IDENTITY_OIDC_CONFIG_URL: process.env.STEEDOS_IDENTITY_OIDC_CONFIG_URL, + STEEDOS_IDENTITY_OIDC_CLIENT_ID: process.env.STEEDOS_IDENTITY_OIDC_CLIENT_ID, + MAIL_URL: process.env.MAIL_URL, + ROOT_URL: process.env.ROOT_URL + }, + + /** + * Dependencies + */ + dependencies: ['~packages-standard-objects'], + + /** + * Actions + */ + actions: { + ...triggers, + ...actions + }, + + /** + * Events + */ + events: { + /** + * [Feature]: Master-detail relationship 级联删除 #4984 + * [Feature]: Lookup relationship 级联删除 #4985 + * 考虑死循环的情况，A 主表是 B，B主表是A + */ + "@*.deleted": { + async handler(ctx) { + // console.log(require('chalk').red('-------------------@*.deleted-------------------'), ctx.params) + const params = ctx.params + const { isDelete, isAfter, previousDoc, objectName } = params; + if (isAfter && isDelete && previousDoc) { + const spaceId = previousDoc.space; + const obj = objectql.getObject(objectName); + const detailsInfo = await obj.getDetailsInfo(); // 查找当前哪些对象有masterDetail字段引用当前对象 + const lookupDetailsInfo = await obj.getLookupDetailsInfo(); // 查找当前哪些对象有lookup字段引用当前对象 + + // 空的不执行 + if (_.isEmpty(detailsInfo) && _.isEmpty(lookupDetailsInfo)) { + return; + } + + const client = new MongoClient(process.env.MONGO_URL, { + useNewUrlParser: true, + useUnifiedTopology: true, + }); + await client.connect(); + const db = client.db(); + + // Start a session. + const session = client.startSession(); + + // Start a transaction + session.startTransaction({ readConcern: { level: "majority" }, writeConcern: { w: "majority" }, readPreference: 'primary' }); + + // Operations inside the transaction + try { + const infoMap = {}; // 防止死循环 + const deleteDetails = async (detailsInfo, previousDoc) => { + for (const info of detailsInfo) { + if (!infoMap[info]) { + infoMap[info] = 1 + } else { + continue; + } + const infos = info.split("."); + const detailObjectApiName = infos[0]; + const detailFieldName = infos[1]; + + const detailObj = objectql.getObject(detailObjectApiName); + const detailField = detailObj.getField(detailFieldName); + const refFieldName = detailField.reference_to_field || '_id' + + const detailColl = db.collection(detailObjectApiName); + const query = { [detailFieldName]: previousDoc[refFieldName], space: spaceId }; + const docs = await detailColl.find(query, { session }).toArray() + await detailColl.deleteMany(query, { session }); + + const detailDetailsInfo = await detailObj.getDetailsInfo(); + if (detailDetailsInfo.length > 0) { + for (const doc of docs) { + await deleteDetails(detailDetailsInfo, doc) + } + } + } + } + + await deleteDetails(detailsInfo, previousDoc) + + for (const info of lookupDetailsInfo) { + const infos = info.split("."); + const detailObjectApiName = infos[0]; + const detailFieldName = infos[1]; + const detailObj = objectql.getObject(detailObjectApiName); + const detailField = detailObj.getField(detailFieldName); + if ('clear' === detailField.deleted_lookup_record_behavior || !detailField.deleted_lookup_record_behavior) { // 清除相关记录lookup字段的值，默认清除 + const refFieldName = detailField.reference_to_field || '_id' + const detailColl = db.collection(detailObjectApiName); + await detailColl.updateMany({ + [detailFieldName]: previousDoc[refFieldName] + }, { + $unset: { + [detailFieldName]: 1 + } + }, { session }); + } + } + + await session.commitTransaction(); + } catch (error) { + // Abort transaction on error + await session.abortTransaction(); + console.error(error); + } finally { + await session.endSession(); + await client.close(); + } + + } + } + }, + }, + + /** + * Methods + */ + methods: methods, + + /** + * Service created lifecycle event handler + */ + created() { + console.log('core-objects') + }, + + /** + * Service started lifecycle event handler + */ + async started() { + + }, + + /** + * Service stopped lifecycle event handler + */ + async stopped() { + + } +}; diff --git a/services/standard-space/src/actions/index.js b/services/service-core-objects/src/actions/index.js similarity index 100% rename from services/standard-space/src/actions/index.js rename to services/service-core-objects/src/actions/index.js diff --git a/services/standard-space/src/actions/upsetOrganizations.js b/services/service-core-objects/src/actions/upsetOrganizations.js similarity index 100% rename from services/standard-space/src/actions/upsetOrganizations.js rename to services/service-core-objects/src/actions/upsetOrganizations.js diff --git a/services/standard-space/src/actions/upsetSpaceUsers.js b/services/service-core-objects/src/actions/upsetSpaceUsers.js similarity index 100% rename from services/standard-space/src/actions/upsetSpaceUsers.js rename to services/service-core-objects/src/actions/upsetSpaceUsers.js diff --git a/services/standard-space/src/methods/getOrgByGroupId.js b/services/service-core-objects/src/methods/getOrgByGroupId.js similarity index 100% rename from services/standard-space/src/methods/getOrgByGroupId.js rename to services/service-core-objects/src/methods/getOrgByGroupId.js diff --git a/services/standard-space/src/methods/index.js b/services/service-core-objects/src/methods/index.js similarity index 100% rename from services/standard-space/src/methods/index.js rename to services/service-core-objects/src/methods/index.js diff --git a/services/standard-space/src/methods/upsetOrg.js b/services/service-core-objects/src/methods/upsetOrg.js similarity index 100% rename from services/standard-space/src/methods/upsetOrg.js rename to services/service-core-objects/src/methods/upsetOrg.js diff --git a/services/standard-space/src/methods/upsetOrgs.js b/services/service-core-objects/src/methods/upsetOrgs.js similarity index 100% rename from services/standard-space/src/methods/upsetOrgs.js rename to services/service-core-objects/src/methods/upsetOrgs.js diff --git a/services/standard-space/src/methods/upsetSpaceUser.js b/services/service-core-objects/src/methods/upsetSpaceUser.js similarity index 100% rename from services/standard-space/src/methods/upsetSpaceUser.js rename to services/service-core-objects/src/methods/upsetSpaceUser.js diff --git a/services/standard-space/src/methods/upsetSpaceUsers.js b/services/service-core-objects/src/methods/upsetSpaceUsers.js similarity index 100% rename from services/standard-space/src/methods/upsetSpaceUsers.js rename to services/service-core-objects/src/methods/upsetSpaceUsers.js diff --git a/services/standard-space/src/methods/upsetUser.js b/services/service-core-objects/src/methods/upsetUser.js similarity index 100% rename from services/standard-space/src/methods/upsetUser.js rename to services/service-core-objects/src/methods/upsetUser.js diff --git a/services/service-core-objects/src/triggers/index.js b/services/service-core-objects/src/triggers/index.js new file mode 100644 index 0000000000..d7fc3c279b --- /dev/null +++ b/services/service-core-objects/src/triggers/index.js @@ -0,0 +1,11 @@ +/* + * @Author: 孙浩林 sunhaolin@steedos.com + * @Date: 2023-09-20 16:08:33 + * @LastEditors: baozhoutao@steedos.com + * @LastEditTime: 2025-01-15 11:42:09 + * @FilePath: /steedos-platform-2.3/services/standard-space/src/triggers/index.js + * @Description: + */ +module.exports = { + space_users_trigger: require('./space_users_trigger') +} \ No newline at end of file diff --git a/services/standard-space/src/triggers/space_users_trigger.js b/services/service-core-objects/src/triggers/space_users_trigger.js similarity index 100% rename from services/standard-space/src/triggers/space_users_trigger.js rename to services/service-core-objects/src/triggers/space_users_trigger.js diff --git a/services/service-plugin-amis/public/tailwind/tailwind-steedos.css b/services/service-plugin-amis/public/tailwind/tailwind-steedos.css index e9c0d0d18f..226a6217f4 100644 --- a/services/service-plugin-amis/public/tailwind/tailwind-steedos.css +++ b/services/service-plugin-amis/public/tailwind/tailwind-steedos.css @@ -64,6 +64,10 @@ position: absolute } +.relative { + position: relative +} + .sticky { position: sticky } @@ -75,6 +79,10 @@ left: 0px } +.isolate { + isolation: isolate +} + .z-20 { z-index: 20 } diff --git a/services/service-steedos-server/index.js b/services/service-steedos-server/index.js index 8502f423c6..b3eb974029 100644 --- a/services/service-steedos-server/index.js +++ b/services/service-steedos-server/index.js @@ -479,7 +479,6 @@ function getBuiltinPlugins () { "@steedos/service-cachers-manager", // 依赖了 steedos/core "@steedos/workflow", "@steedos/accounts", - "@steedos/plugin-company", // "@steedos/word-template", "@steedos/metadata-api", // ? TODO: 为啥使用meteor package load "@steedos/data-import", // main 文件不是 package.service.js @@ -492,6 +491,7 @@ function getBuiltinPlugins () { // "@steedos/standard-process" // "@steedos/service-files", // "@steedos/steedos-plugin-schema-builder", + "@steedos/service-core-objects" ] if ("true" == process.env.STEEDOS_ENABLE_STANDARD_ACCOUNTS) { plugins.unshift("@steedos/standard-accounts"); diff --git a/services/service-steedos-server/package.json b/services/service-steedos-server/package.json index ab3889b93f..0db3cd84c2 100644 --- a/services/service-steedos-server/package.json +++ b/services/service-steedos-server/package.json @@ -9,7 +9,6 @@ "@steedos/data-import": "3.0.0-beta.2", "@steedos/metadata-api": "3.0.0-beta.2", "@steedos/meteor-bundle-runner": "3.0.0-beta.2", - "@steedos/plugin-company": "3.0.0-beta.2", "@steedos/service-accounts": "3.0.0-beta.2", "@steedos/service-api": "3.0.0-beta.2", "@steedos/service-cachers-manager": "3.0.0-beta.2", diff --git a/services/standard-space/main/default/objectTranslations/company.en/company.en.objectTranslation.yml b/services/standard-space/main/default/objectTranslations/company.en/company.en.objectTranslation.yml deleted file mode 100644 index 602f65882d..0000000000 --- a/services/standard-space/main/default/objectTranslations/company.en/company.en.objectTranslation.yml +++ /dev/null @@ -1,50 +0,0 @@ -name: company -label: Division -description: -fields: - name: - label: Name - help: - description: - code: - label: Code - help: - description: - parent: - label: Superior Department - help: - description: - organization: - label: Corresponding Department - help: - description: - currency_type: - label: Currency Type - help: - description: - admins: - label: Administrator - help: - description: - description: - label: Description - help: - description: - sort_no: - label: Sort Number - help: - description: - company_id: - label: - help: - description: - company_ids: - label: - help: - description: -listviews: - all: - label: All Divisions -actions: - updateOrgs: - label: Update The Whole Company diff --git a/services/standard-space/main/default/objectTranslations/company.zh-CN/company.zh-CN.objectTranslation.yml b/services/standard-space/main/default/objectTranslations/company.zh-CN/company.zh-CN.objectTranslation.yml deleted file mode 100644 index 0c98b58244..0000000000 --- a/services/standard-space/main/default/objectTranslations/company.zh-CN/company.zh-CN.objectTranslation.yml +++ /dev/null @@ -1,50 +0,0 @@ -name: company -label: 分部 -description: -fields: - name: - label: 分部名称 - help: - description: - code: - label: 分部代码 - help: - description: - parent: - label: 上级分部 - help: - description: - organization: - label: 关联部门 - help: - description: - currency_type: - label: 本位币 - help: - description: - admins: - label: 管理员 - help: - description: - description: - label: 备注 - help: - description: - sort_no: - label: 排序号 - help: - description: - company_id: - label: 主分部 - help: - description: - company_ids: - label: 所属分部 - help: - description: -listviews: - all: - label: 所有 -actions: - updateOrgs: - label: 更新组织 diff --git a/services/standard-space/main/default/objectTranslations/logs.en/logs.en.objectTranslation.yml b/services/standard-space/main/default/objectTranslations/logs.en/logs.en.objectTranslation.yml deleted file mode 100644 index 3ed5e1c824..0000000000 --- a/services/standard-space/main/default/objectTranslations/logs.en/logs.en.objectTranslation.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: logs -label: Logs -description: -fields: - name: - label: Name - help: - description: - level: - label: Level - help: - description: - data: - label: Data - help: - description: - node_id: - label: Node ID - help: - description: -listviews: - all: - label: All diff --git a/services/standard-space/main/default/objectTranslations/logs.zh-CN/logs.zh-CN.objectTranslation.yml b/services/standard-space/main/default/objectTranslations/logs.zh-CN/logs.zh-CN.objectTranslation.yml deleted file mode 100644 index 79eed1f86c..0000000000 --- a/services/standard-space/main/default/objectTranslations/logs.zh-CN/logs.zh-CN.objectTranslation.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: logs -label: 系统日志 -description: -fields: - name: - label: 标题 - help: - description: - level: - label: 级别 - help: - description: - data: - label: 数据 - help: - description: - node_id: - label: 节点标识 - help: - description: -listviews: - all: - label: 所有 diff --git a/services/standard-space/main/default/objectTranslations/notifications.en/notifications.en.objectTranslation.yml b/services/standard-space/main/default/objectTranslations/notifications.en/notifications.en.objectTranslation.yml deleted file mode 100644 index bd5318f90a..0000000000 --- a/services/standard-space/main/default/objectTranslations/notifications.en/notifications.en.objectTranslation.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: notifications -label: Notification -description: -fields: - name: - label: Title - help: - description: - body: - label: Body - help: - description: - related_to: - label: Related Object Record - help: - description: - related_name: - label: Name of Related Object Record - help: - description: - url: - label: URL - help: - description: - from: - label: From - help: - description: - owner: - label: Owner - help: - description: - is_read: - label: Readed - help: - description: - created: - label: Notification Time - help: - description: -listviews: - all: - label: All Notifications diff --git a/services/standard-space/main/default/objectTranslations/notifications.zh-CN/notifications.zh-CN.objectTranslation.yml b/services/standard-space/main/default/objectTranslations/notifications.zh-CN/notifications.zh-CN.objectTranslation.yml deleted file mode 100644 index e8f4f28b08..0000000000 --- a/services/standard-space/main/default/objectTranslations/notifications.zh-CN/notifications.zh-CN.objectTranslation.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: notifications -label: 通知 -description: -fields: - name: - label: 通知标题 - help: - description: - body: - label: 通知描述 - help: - description: - related_to: - label: 相关记录 - help: - description: - related_name: - label: 记录标题 - help: - description: - url: - label: 相对链接 - help: - description: - from: - label: 发送人 - help: - description: - owner: - label: 通知对象 - help: - description: - is_read: - label: 已读 - help: - description: - created: - label: 通知时间 - help: - description: -listviews: - all: - label: 全部 diff --git a/services/standard-space/main/default/objectTranslations/organizations.en/organizations.en.objectTranslation.yml b/services/standard-space/main/default/objectTranslations/organizations.en/organizations.en.objectTranslation.yml deleted file mode 100644 index 4893c9a231..0000000000 --- a/services/standard-space/main/default/objectTranslations/organizations.en/organizations.en.objectTranslation.yml +++ /dev/null @@ -1,64 +0,0 @@ -name: organizations -label: Organizational Structures -description: -fields: - name: - label: Name - help: - description: - fullname: - label: Full Name - help: - description: - parent: - label: Superior Organization - help: - description: - parents: - label: All Superior Organization - help: - description: - children: - label: Subordinate Organization - help: - description: - sort_no: - label: Sort Number - help: - description: - users: - label: Organization Users - help: - description: - company_id: - label: Main Division - help: - description: - company_ids: - label: All Divisions - help: - description: - is_company: - label: is Division - help: - description: - hidden: - label: Hidden - help: - description: -groups: - systemfields: systemfields -listviews: - all: - label: All Organizations - lookup: - label: Lookup Organization - effective: - label: Effective Organizations -actions: - standard_query: - label: Search - addSubOrganization: - label: Add a Branch -CustomLabels: - organizations_group_系统: System diff --git a/services/standard-space/main/default/objectTranslations/organizations.zh-CN/organizations.zh-CN.objectTranslation.yml b/services/standard-space/main/default/objectTranslations/organizations.zh-CN/organizations.zh-CN.objectTranslation.yml deleted file mode 100644 index e4309e0f8e..0000000000 --- a/services/standard-space/main/default/objectTranslations/organizations.zh-CN/organizations.zh-CN.objectTranslation.yml +++ /dev/null @@ -1,64 +0,0 @@ -name: organizations -label: 组织机构 -description: -fields: - name: - label: 名称 - help: - description: - fullname: - label: 组织全称 - help: - description: - parent: - label: 上级组织 - help: - description: - parents: - label: 上级组织 - help: - description: - children: - label: 下级组织 - help: - description: - sort_no: - label: 排序号 - help: - description: - users: - label: 成员 - help: - description: - company_id: - label: 所属分部 - help: - description: - company_ids: - label: 所属分部 - help: - description: - is_company: - label: 分部级 - help: - description: - hidden: - label: 隐藏 - help: - description: -groups: - systemfields: systemfields -listviews: - all: - label: 所有 - lookup: - label: 相关 - effective: - label: 有效组织 -actions: - standard_query: - label: 查找 - addSubOrganization: - label: 添加子组织 -CustomLabels: - organizations_group_系统: 系统 diff --git a/services/standard-space/main/default/objectTranslations/settings.en/settings.en.objectTranslation.yml b/services/standard-space/main/default/objectTranslations/settings.en/settings.en.objectTranslation.yml deleted file mode 100644 index 5636cd9083..0000000000 --- a/services/standard-space/main/default/objectTranslations/settings.en/settings.en.objectTranslation.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: settings -label: Setting -description: -fields: - description: - label: Description - help: - description: - schema: - label: Form Schema - help: - description: - instance_state: - label: 申请单审批状态 - help: - options: - description: - is_public: - label: 公开 - help: 在前端可访问 - description: - key: - label: key - help: - description: - name: - label: Name - help: - description: - value: - label: Value - help: - description: -listviews: - all: - label: All - recent: - label: Recent diff --git a/services/standard-space/main/default/objectTranslations/settings.zh-CN/settings.zh-CN.objectTranslation.yml b/services/standard-space/main/default/objectTranslations/settings.zh-CN/settings.zh-CN.objectTranslation.yml deleted file mode 100644 index 25c58b422c..0000000000 --- a/services/standard-space/main/default/objectTranslations/settings.zh-CN/settings.zh-CN.objectTranslation.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: settings -label: 参数配置 -description: -fields: - description: - label: 描述 - help: - description: - schema: - label: 表单 - help: - description: - is_public: - label: 公开 - help: 在前端可访问 - description: - key: - label: key - help: - description: - name: - label: 名称 - help: - description: - owner: - label: 所有者 - help: - description: - value: - label: 值 - help: - description: -groups: - 系统信息: 系统信息 -listviews: - all: - label: 所有 - recent: - label: 最近查看 diff --git a/services/standard-space/main/default/objects/organizations/fields/company_id.field.yml b/services/standard-space/main/default/objects/organizations/fields/company_id.field.yml index 7562340ac5..2e0aa87782 100644 --- a/services/standard-space/main/default/objects/organizations/fields/company_id.field.yml +++ b/services/standard-space/main/default/objects/organizations/fields/company_id.field.yml @@ -14,5 +14,8 @@ optionsFunction: ! |- /* 主分部 company_id / 所属分部 company_ids 业务逻辑 #170 忽略base.object.yml中的defaultValue、optionsFunction脚本 */ } +readonly: true +visible_on: "{{global.mode ==='read' ? true : false}}" +hidden: false sort_no: 170 filterable: true diff --git a/services/standard-space/main/default/objects/organizations/fields/company_ids.field.yml b/services/standard-space/main/default/objects/organizations/fields/company_ids.field.yml index 40dcd3b624..30f661712d 100644 --- a/services/standard-space/main/default/objects/organizations/fields/company_ids.field.yml +++ b/services/standard-space/main/default/objects/organizations/fields/company_ids.field.yml @@ -14,4 +14,6 @@ optionsFunction: ! |- /* 主分部 company_id / 所属分部 company_ids 业务逻辑 #170 忽略base.object.yml中的defaultValue、optionsFunction脚本 */ } +omit: true +hidden: true sort_no: 180 diff --git a/services/standard-space/main/default/objects/organizations/fields/is_company.field.yml b/services/standard-space/main/default/objects/organizations/fields/is_company.field.yml index 00edebcd6e..f6a28a1fb0 100644 --- a/services/standard-space/main/default/objects/organizations/fields/is_company.field.yml +++ b/services/standard-space/main/default/objects/organizations/fields/is_company.field.yml @@ -1,8 +1,8 @@ name: is_company label: Divisional type: boolean -hidden: true +hidden: false index: true readonly: true visible_on: '{{global.mode ===''read'' ? true : false}}' -sort_no: 190 +sort_no: 190 \ No newline at end of file diff --git a/services/standard-space/main/default/objects/space_users/fields/company_id.field.yml b/services/standard-space/main/default/objects/space_users/fields/company_id.field.yml deleted file mode 100644 index d323acdf8c..0000000000 --- a/services/standard-space/main/default/objects/space_users/fields/company_id.field.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: company_id -label: Main Division -type: lookup -visible_on: '{{global.mode ===''read'' ? true : false}}' -readonly: true -defaultValue: ! |- - function anonymous( - ) { - - /* 主分部 company_id / 所属分部 company_ids 业务逻辑 #170 忽略base.object.yml中的defaultValue、optionsFunction脚本 */ - - } -optionsFunction: ! |- - function anonymous( - ) { - - /* 主分部 company_id / 所属分部 company_ids 业务逻辑 #170 忽略base.object.yml中的defaultValue、optionsFunction脚本 */ - - } -sort_no: 200 diff --git a/services/standard-space/package.service.js b/services/standard-space/package.service.js index 93e5ec5aeb..41120dd004 100644 --- a/services/standard-space/package.service.js +++ b/services/standard-space/package.service.js @@ -1,8 +1,8 @@ /* * @Author: sunhaolin@hotoa.com * @Date: 2022-12-02 13:17:06 - * @LastEditors: 孙浩林 sunhaolin@steedos.com - * @LastEditTime: 2024-06-14 10:29:14 + * @LastEditors: baozhoutao@steedos.com + * @LastEditTime: 2025-01-15 11:44:28 * @Description: */ "use strict"; @@ -16,8 +16,8 @@ const _ = require('lodash') const triggers = require('./src/triggers') -const methods = require('./src/methods'); -const actions = require('./src/actions') +const methods = []; +const actions = []; /** * @typedef {import('moleculer').Context} Context Moleculer's Context diff --git a/services/standard-space/src/triggers/index.js b/services/standard-space/src/triggers/index.js index d323414591..de7396355e 100644 --- a/services/standard-space/src/triggers/index.js +++ b/services/standard-space/src/triggers/index.js @@ -1,12 +1,11 @@ /* * @Author: 孙浩林 sunhaolin@steedos.com * @Date: 2023-09-20 16:08:33 - * @LastEditors: 孙浩林 sunhaolin@steedos.com - * @LastEditTime: 2024-06-14 10:28:53 + * @LastEditors: baozhoutao@steedos.com + * @LastEditTime: 2025-01-15 11:43:52 * @FilePath: /steedos-platform-2.3/services/standard-space/src/triggers/index.js * @Description: */ module.exports = { - notificationsTrigger: require('./notificationsTrigger'), - space_users_trigger: require('./space_users_trigger') + notificationsTrigger: require('./notificationsTrigger') } \ No newline at end of file