@nocobase/client 0.7.0-alpha.4 → 0.7.0-alpha.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "0.7.0-alpha.4",
+  "version": "0.7.0-alpha.56",
   "license": "Apache-2.0",
   "licenses": [
     {
@@ -9,30 +9,19 @@
     }
   ],
   "main": "lib",
-  "module": "esm",
-  "sideEffects": [
-    "dist/*",
-    "esm/*.js",
-    "lib/*.js",
-    "src/*.ts",
-    "*.less",
-    "**/*/style.js"
-  ],
-  "types": "esm/index.d.ts",
-  "engines": {
-    "npm": ">=3.0.0"
-  },
+  "module": "es/index.js",
+  "typings": "es/index.d.ts",
   "dependencies": {
     "@dnd-kit/core": "^5.0.1",
     "@dnd-kit/sortable": "^6.0.0",
     "@emotion/css": "^11.7.1",
-    "@formily/antd": "^2.0.15",
-    "@formily/core": "^2.0.15",
-    "@formily/react": "^2.0.15",
-    "@nocobase/utils": "0.7.0-alpha.4",
+    "@formily/antd": "2.0.20",
+    "@formily/core": "2.0.20",
+    "@formily/react": "2.0.20",
+    "@nocobase/utils": "0.7.0-alpha.56",
     "ahooks": "^3.0.5",
     "antd": "~4.19.5",
-    "axios": "^0.24.0",
+    "axios": "^0.26.1",
     "classnames": "^2.3.1",
     "file-saver": "^2.0.5",
     "i18next": "^21.6.0",
@@ -57,14 +46,10 @@
     "react-dom": ">=16.8.0",
     "react-is": ">=16.8.0 || >=17.0.0"
   },
-  "scripts": {
-    "build": "rimraf -rf lib esm dist && npm run build:cjs && npm run build:esm",
-    "build:cjs": "tsc --project tsconfig.build.json",
-    "build:esm": "tsc --project tsconfig.build.json --module es2015 --outDir esm"
-  },
   "devDependencies": {
+    "@testing-library/react": "^12.1.2",
     "@types/marked": "^4.0.1",
     "axios-mock-adapter": "^1.20.0"
   },
-  "gitHead": "327e413b6dd94dad9b756b1e08cda47cad734dc1"
+  "gitHead": "9a8c05e8fb26029f1d1ba68408a8bddac0e67a76"
 }

package/src/acl/Configuration/RoleConfigure.tsx

@@ -47,11 +47,11 @@ export const RoleConfigure = () => {
             title: t('Configure permissions'),
             'x-decorator': 'FormItem',
             'x-component': 'Checkbox',
-            'x-content': '允许配置系统，包括界面配置、数据表配置、权限配置、系统配置等全部配置项',
+            'x-content': t('Allows configuration of the whole system, including UI, collections, permissions, etc.'),
           },
           'strategy.actions': {
-            title: t('General action permissions'),
-            description: '所有数据表都默认使用通用数据操作权限；同时，可以针对每个数据表单独配置权限。',
+            title: t('Global action permissions'),
+            description: t('All collections use general action permissions by default; permission configured individually will override the default one.'),
             'x-component': 'StrategyActions',
             'x-decorator': 'FormItem',
           },
@@ -59,7 +59,7 @@ export const RoleConfigure = () => {
             title: t('Menu permissions'),
             'x-decorator': 'FormItem',
             'x-component': 'Checkbox',
-            'x-content': '新增菜单项默认允许访问',
+            'x-content': t('New menu items are allowed to be accessed by default.'),
           },
         },
       }}

package/src/acl/Configuration/schemas/roles.ts

@@ -241,7 +241,7 @@ export const roleSchema: ISchema = {
                               properties: {
                                 tab1: {
                                   type: 'void',
-                                  title: '{{t("Global permissions")}}',
+                                  title: '{{t("General permissions")}}',
                                   'x-component': 'Tabs.TabPane',
                                   'x-component-props': {},
                                   properties: {

package/src/block-provider/KanbanBlockProvider.tsx

@@ -4,7 +4,7 @@ import { Spin } from 'antd';
 import React, { createContext, useContext, useEffect } from 'react';
 import { useACLRoleContext } from '../acl';
 import { useCollection } from '../collection-manager';
-import { toColumns } from '../schema-component/antd/kanban-v2/Kanban';
+import { toColumns } from '../schema-component/antd/kanban/Kanban';
 import { BlockProvider, useBlockRequestContext } from './BlockProvider';
 
 export const KanbanBlockContext = createContext<any>({});

package/src/block-provider/hooks/index.ts

@@ -1,4 +1,4 @@
-import { useFieldSchema, useForm } from '@formily/react';
+import { useField, useFieldSchema, useForm } from '@formily/react';
 import { Modal } from 'antd';
 import { useTranslation } from 'react-i18next';
 import { useHistory } from 'react-router-dom';
@@ -59,6 +59,7 @@ export const useCreateActionProps = () => {
   const history = useHistory();
   const { t } = useTranslation();
   const actionSchema = useFieldSchema();
+  const actionField = useField();
   const { fields, getField } = useCollection();
   const compile = useCompile();
   return {
@@ -100,12 +101,15 @@ export const useCreateActionProps = () => {
           values[key] = form.values[key];
         }
       }
+      actionField.data = field.data || {};
+      actionField.data.loading = true;
       await resource.create({
         values: {
           ...values,
           ...overwriteValues,
         },
       });
+      actionField.data.loading = false;
       __parent?.service?.refresh?.();
       setVisible?.(false);
       const onSuccess = actionSchema?.['x-action-settings']?.onSuccess;
@@ -138,6 +142,7 @@ export const useUpdateActionProps = () => {
   const history = useHistory();
   const { fields, getField } = useCollection();
   const compile = useCompile();
+  const actionField = useField();
   return {
     async onClick() {
       const skipValidator = actionSchema?.['x-action-settings']?.skipValidator;
@@ -154,7 +159,7 @@ export const useUpdateActionProps = () => {
             values[key] = form.values[key];
             continue;
           }
-          if (!field.added.has(key)) {
+          if (field.added && !field.added.has(key)) {
             continue;
           }
           const items = form.values[key];
@@ -184,6 +189,8 @@ export const useUpdateActionProps = () => {
           values[key] = form.values[key];
         }
       }
+      actionField.data = field.data || {};
+      actionField.data.loading = true;
       await resource.update({
         filterByTk,
         values: {
@@ -191,6 +198,7 @@ export const useUpdateActionProps = () => {
           ...overwriteValues,
         },
       });
+      actionField.data.loading = false;
       __parent?.service?.refresh?.();
       if (!(resource instanceof TableFieldResource)) {
         __parent?.__parent?.service?.refresh?.();

package/src/block-provider/index.tsx

@@ -6,4 +6,5 @@ export * from './FormBlockProvider';
 export * from './KanbanBlockProvider';
 export * from './TableBlockProvider';
 export * from './TableFieldProvider';
+export * from './TableSelectorProvider';
 

package/src/collection-manager/interfaces/attachment.ts

@@ -23,7 +23,7 @@ export const attachment: IField = {
     },
   },
   schemaInitialize(schema: ISchema, { block }) {
-    if (['Table', 'Kanban'].includes(block)) {
+    if (['Table', 'KanbanV2'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['size'] = 'small';
     }

package/src/collection-manager/types.ts

@@ -19,6 +19,7 @@ export interface CollectionOptions {
   title?: string;
   filterTargetKey?: string;
   targetKey?: string;
+  sortable?: any;
   fields?: FieldOptions[];
 }
 

package/src/locale/en_US.ts

@@ -280,5 +280,12 @@ export default {
   "Add card": "Add card",
   "edit title": "Edit Title",
   "Turn the page": "Turn the page",
-  "Others": "Others"
+  "Others": "Others",
+
+  // workflows
+  'Execution History': 'History',
+  'Parallel branch': 'Branch',
+
+  'Unsaved changes': 'Unsaved changes',
+  'Are you sure you don\'t want to save?': 'Are you sure you don\'t want to save?',
 }

package/src/locale/zh_CN.ts

@@ -32,6 +32,7 @@ export default {
   "Insert inner": "在里面插入",
   "Delete": "删除",
   "UI editor": "界面配置",
+  "Collection": "数据表",
   "Collections & Fields": "数据表配置",
   "Roles & Permissions": "角色和权限",
   "Edit profile": "个人资料",
@@ -45,6 +46,7 @@ export default {
   "Sign out": "注销",
   "Cancel": "取消",
   "Submit": "提交",
+  "Close": "关闭",
   "Set the data scope": "设置数据范围",
   "Data blocks": "数据区块",
   "Table": "表格",
@@ -153,6 +155,10 @@ export default {
   "is not": "不等于",
   "contains": "包含",
   "does not contain": "不包含",
+  "starts with": "开头是",
+  "not starts with": "开头不是",
+  "ends with": "结尾是",
+  "not ends with": "结尾不是",
   "is empty": "为空",
   "is not empty": "不为空",
   "Edit chart": "编辑图表",
@@ -300,8 +306,8 @@ export default {
   'Insert before': '在前面插入',
   'Insert after': '在后面插入',
   'UI Editor': '界面配置',
-  'ASC': 'ASC',
-  'DESC': 'DESC',
+  'ASC': '升序',
+  'DESC': '降序',
   'Add sort field': '添加排序字段',
   'ID': 'ID',
   'Drawer': '抽屉',
@@ -313,6 +319,7 @@ export default {
 
   'Skip required validation': '跳过必填校验',
   'Form values': '表单值',
+  'Fields values': '字段值',
   'When submitting the following fields, the saved values are': '提交以下字段时，保存的值为',
   'After successful submission': '提交成功后',
   'Then': '然后',
@@ -364,8 +371,12 @@ export default {
 
   'Role display name': '角色名称',
   'Default role': '默认角色',
-
+  'All collections use general action permissions by default; permission configured individually will override the default one.': '所有数据表都默认使用通用数据操作权限；同时，可以针对每个数据表单独配置权限。',
+  'Allows configuration of the whole system, including UI, collections, permissions, etc.': '允许配置系统，包括界面配置、数据表配置、权限配置、系统配置等全部配置项',
+  'New menu items are allowed to be accessed by default.': '新增菜单项默认允许访问',
   'Global permissions': '全局配置',
+  'General permissions': '通用配置',
+  'Global action permissions': '全局操作权限',
   'General action permissions': '通用操作权限',
   'Action display name': '操作名称',
   'Allow': '允许',
@@ -395,4 +406,85 @@ export default {
   'Local storage': '本地存储',
   'Aliyun OSS': '阿里云 OSS',
   'Amazon S3': '亚马逊 S3',
+
+  // plugins/workflow
+  'Workflow': '工作流',
+  'Execution History': '执行历史',
+  'Trigger type': '触发方式',
+  'Description': '描述',
+  'Status': '状态',
+  'Started': '启用',
+  'Stopped': '停用',
+  'Version': '版本',
+  'Copy to new version': '复制到新版本',
+
+  'Load failed': '加载失败',
+
+  'Trigger': '触发器',
+  'Collection event': '数据表事件',
+  'Trigger on': '触发时机',
+  'After record added': '新增数据后',
+  'After record updated': '更新数据后',
+  'After record added or updated': '新增或更新数据后',
+  'After record deleted': '删除数据后',
+  'Changed fields': '发生变动的字段',
+  'Triggered only if one of the selected fields changes. If unselected, it means that it will be triggered when any field changes. When record is added or deleted, any field is considered to have been changed.': '只有被选中的某个字段发生变动时才会触发。如果不选择，则表示任何字段变动时都会触发。新增或删除数据时，任意字段都被认为发生变动。',
+  'Only triggers when match conditions': '满足以下条件才触发',
+
+  'End': '结束',
+
+  'Trigger context': '触发数据',
+  'Node result': '节点数据',
+  'Constant': '常量',
+
+  'Boolean': '逻辑值',
+  'String': '字符串',
+
+  'Comparison': '值比较',
+  'Arithmetic calculation': '算术运算',
+  'String operation': '字符串',
+
+  'On going': '进行中',
+  'Success': '成功',
+  'Failed': '失败',
+  'Canceled': '已取消',
+
+  'This node contains branches, deleting will also be preformed to them, are you sure?': '节点包含分支，将同时删除其所有分支下的子节点，确定继续？',
+
+  'Control': '流程控制',
+  'Collection operations': '数据表操作',
+
+  'Node type': '节点类型',
+
+  'Calculation': '运算',
+  'Configure calculation': '配置运算',
+  'Calculation result': '运算结果',
+  'True': '真',
+  'False': '假',
+
+  'Condition': '条件判断',
+  'Mode': '模式',
+  'Continue when "Yes"': '“是”则继续',
+  'Branch into "Yes" and "No"': '“是”和“否”分别继续',
+  'Conditions': '条件配置',
+
+  'Parallel branch': '分支',
+  'All succeeded': '全部成功',
+  'Any succeeded': '任意成功',
+  'Continue after all branches succeeded': '全部分支都成功后才能继续',
+  'Continue after any branch succeeded': '任意分支成功后就继续',
+
+  'Create record': '新增数据',
+  'Update record': '更新数据',
+  'Query record': '查询数据',
+  'Multiple records': '多条数据',
+  'Please select collection first': '请先选择数据表',
+  'Only update records matching conditions': '只更新满足条件的数据',
+  'Fields that are not assigned a value will be set to the default value, and those that do not have a default value are set to null.': '未被赋值的字段将被设置为默认值，没有默认值的设置为空值。',
+  'Trigger in executed workflow cannot be modified': '已经执行过工作流的触发器不能被修改',
+  'Node in executed workflow cannot be modified': '已经执行过工作流中的节点不能被修改',
+
+  'Unsaved changes': '未保存修改',
+  'Are you sure you don\'t want to save?': '你确定不保存修改吗？',
+  'Dragging': '拖拽中',
 }

package/src/plugin-manager/PluginManager.tsx

@@ -1,8 +1,9 @@
 import { MoreOutlined, SettingOutlined } from '@ant-design/icons';
-import { ConfigProvider, Menu, MenuItemProps, Tooltip } from 'antd';
+import { ConfigProvider, Menu, MenuItemProps, Spin, Tooltip } from 'antd';
 import cls from 'classnames';
 import { get } from 'lodash';
 import React, { createContext, useContext } from 'react';
+import { useAPIClient, useRequest } from '../api-client';
 import { PluginManagerContext } from './context';
 
 export const usePrefixCls = (
@@ -107,3 +108,15 @@ PluginManager.Toolbar.Item = (props) => {
     </Menu.Item>
   );
 };
+
+export const RemotePluginManagerToolbar = () => {
+  const api = useAPIClient();
+  const { data, loading } = useRequest({
+    resource: 'plugins',
+    action: 'getPinned',
+  });
+  if (loading) {
+    return <Spin />;
+  }
+  return <PluginManager.Toolbar items={data?.data} />;
+};

package/src/route-switch/antd/admin-layout/index.tsx

@@ -9,8 +9,8 @@ import {
   CurrentUserProvider,
   findByUid,
   findMenuItem,
-  PluginManager,
   RemoteCollectionManagerProvider,
+  RemotePluginManagerToolbar,
   RemoteSchemaTemplateManagerProvider,
   SchemaComponent,
   useACLRoleContext,
@@ -151,17 +151,7 @@ const InternalAdminLayout = (props: any) => {
         </div>
         <div style={{ position: 'absolute', top: 0, right: 0 }}>
           <ACLAllowConfigure>
-            <PluginManager.Toolbar
-              items={[
-                { component: 'DesignableSwitch', pin: true },
-                { component: 'CollectionManagerShortcut', pin: true },
-                { component: 'ACLShortcut', pin: true },
-                { component: 'WorkflowShortcut', pin: true },
-                { component: 'SchemaTemplateShortcut', pin: true },
-                { component: 'SystemSettingsShortcut' },
-                { component: 'FileStorageShortcut' },
-              ]}
-            />
+            <RemotePluginManagerToolbar />
           </ACLAllowConfigure>
           <CurrentUser />
         </div>

package/src/schema-component/antd/action/Action.Designer.tsx

@@ -11,7 +11,7 @@ export const ActionDesigner = (props) => {
   const { t } = useTranslation();
   const isPopupAction = ['create', 'update', 'view'].includes(fieldSchema['x-action'] || '');
   return (
-    <GeneralSchemaDesigner {...props}>
+    <GeneralSchemaDesigner {...props} disableInitializer>
       <SchemaSettings.ModalItem
         title={t('Edit button')}
         schema={
@@ -65,7 +65,7 @@ export const ActionDesigner = (props) => {
             { label: t('Drawer'), value: 'drawer' },
             { label: t('Dialog'), value: 'modal' },
           ]}
-          value={field.componentProps.openMode}
+          value={fieldSchema?.['x-component-props']?.['openMode']}
           onChange={(value) => {
             field.componentProps.openMode = value;
             fieldSchema['x-component-props']['openMode'] = value;

package/src/schema-component/antd/action/Action.Drawer.tsx

@@ -4,11 +4,13 @@ import { Drawer } from 'antd';
 import classNames from 'classnames';
 import React from 'react';
 import { createPortal } from 'react-dom';
+import { useTranslation } from 'react-i18next';
 import { useActionContext } from './hooks';
 import { ComposedActionDrawer } from './types';
 
 export const ActionDrawer: ComposedActionDrawer = observer((props) => {
   const { footerNodeName = 'Action.Drawer.Footer', ...others } = props;
+  const { t } = useTranslation();
   const { visible, setVisible } = useActionContext();
   const schema = useFieldSchema();
   const field = useField();
@@ -32,7 +34,7 @@ export const ActionDrawer: ComposedActionDrawer = observer((props) => {
             {...others}
             destroyOnClose
             visible={visible}
-            onClose={() => setVisible(false)}
+            onClose={() => setVisible(false, true)}
             className={classNames(
               others.className,
               css`

package/src/schema-component/antd/action/Action.Modal.tsx

@@ -32,7 +32,7 @@ export const ActionModal: ComposedActionDrawer = observer((props) => {
             {...others}
             destroyOnClose
             visible={visible}
-            onCancel={() => setVisible(false)}
+            onCancel={() => setVisible(false, true)}
             className={classNames(
               others.className,
               css`

package/src/schema-component/antd/action/Action.tsx

@@ -6,7 +6,7 @@ import React, { useState } from 'react';
 import { useActionContext } from '../..';
 import { Icon } from '../../../icon';
 import { SortableItem } from '../../common';
-import { useDesigner } from '../../hooks';
+import { useCompile, useDesigner } from '../../hooks';
 import { useProps } from '../../hooks/useProps';
 import ActionContainer from './Action.Container';
 import { ActionDesigner } from './Action.Designer';
@@ -69,7 +69,7 @@ export const Action: ComposedAction = observer((props: any) => {
   const {
     popover,
     confirm,
-    openMode,
+    // openMode,
     containerRefKey,
     component,
     useAction = useA,
@@ -80,14 +80,18 @@ export const Action: ComposedAction = observer((props: any) => {
   } = props;
   const { onClick } = useProps(props);
   const [visible, setVisible] = useState(false);
+  const [formValueChanged, setFormValueChanged] = useState(false);
   const Designer = useDesigner();
-  const field = useField();
+  const field = useField<any>();
   const { run } = useAction();
   const fieldSchema = useFieldSchema();
+  const compile = useCompile();
   const designerProps = fieldSchema['x-designer-props'];
+  const openMode = fieldSchema?.['x-component-props']?.['openMode'];
   const renderButton = () => (
     <SortableItem
       {...others}
+      loading={field?.data?.loading}
       icon={<Icon type={icon} />}
       onClick={(e: React.MouseEvent) => {
         e.preventDefault();
@@ -109,12 +113,22 @@ export const Action: ComposedAction = observer((props: any) => {
       component={component || Button}
       className={classnames(className, actionDesignerCss)}
     >
-      {field.title}
+      {compile(fieldSchema.title)}
       <Designer {...designerProps} />
     </SortableItem>
   );
   return (
-    <ActionContext.Provider value={{ button: renderButton(), visible, setVisible, openMode, containerRefKey }}>
+    <ActionContext.Provider
+      value={{
+        button: renderButton(),
+        visible,
+        setVisible,
+        formValueChanged,
+        setFormValueChanged,
+        openMode,
+        containerRefKey,
+      }}
+    >
       {popover && <RecursionField basePath={field.address} onlyRenderProperties schema={fieldSchema} />}
       {!popover && renderButton()}
       {!popover && props.children}

package/src/schema-component/antd/action/context.tsx

@@ -8,4 +8,6 @@ export interface ActionContextProps {
   setVisible?: (v: boolean) => void;
   openMode?: 'drawer' | 'modal' | 'page';
   containerRefKey?: string;
+  formValueChanged?: boolean;
+  setFormValueChanged?: (v: boolean) => void;
 }

package/src/schema-component/antd/action/hooks.ts

@@ -1,5 +1,7 @@
 import { useForm } from '@formily/react';
+import { Modal as AntdModal } from 'antd';
 import { useContext } from 'react';
+import { useTranslation } from 'react-i18next';
 import { ActionContext } from './context';
 
 export const useA = () => {
@@ -10,12 +12,28 @@ export const useA = () => {
 
 export const useActionContext = () => {
   const ctx = useContext(ActionContext);
+  const { t } = useTranslation();
 
   return {
     ...ctx,
-    setVisible(visible: boolean) {
+    setVisible(visible: boolean, confirm = false) {
       if (ctx?.openMode !== 'page') {
-        ctx?.setVisible?.(visible);
+        if (!visible) {
+          if (confirm && ctx.formValueChanged) {
+            AntdModal.confirm({
+              title: t('Unsaved changes'),
+              content: t("Are you sure you don't want to save?"),
+              async onOk() {
+                ctx.setFormValueChanged(false);
+                ctx.setVisible(false);
+              },
+            });
+          } else {
+            ctx.setVisible(false);
+          }
+        } else {
+          ctx?.setVisible?.(visible);
+        }
       }
     },
   };