@nocobase/client 0.12.0-alpha.2 → 0.12.0-alpha.4

package/es/api-client/hooks/useRequest.js

@@ -30,7 +30,7 @@ export function useRequest(service) {
   var tempService;
   if (typeof service === 'function') {
     tempService = service;
-  } else {
+  } else if (service) {
     tempService = /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         var params,
@@ -65,6 +65,21 @@ export function useRequest(service) {
         return _ref.apply(this, arguments);
       };
     }();
+  } else {
+    tempService = /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2);
+      }));
+      return function tempService() {
+        return _ref2.apply(this, arguments);
+      };
+    }();
   }
   var tempOptions = _objectSpread(_objectSpread({}, options), {}, {
     onSuccess: function onSuccess() {

package/es/block-provider/BlockProvider.js

@@ -61,6 +61,8 @@ var useResource = function useResource(props) {
   var association = useAssociation(props);
   var sourceId = useSourceId === null || useSourceId === void 0 ? void 0 : useSourceId();
   var field = useField();
+  var withoutTableFieldResource = useContext(WithoutTableFieldResource);
+  var __parent = useContext(BlockRequestContext);
   if (block === 'TableField') {
     var _record$__parent;
     var options = {
@@ -71,8 +73,6 @@ var useResource = function useResource(props) {
     };
     return new TableFieldResource(options);
   }
-  var withoutTableFieldResource = useContext(WithoutTableFieldResource);
-  var __parent = useContext(BlockRequestContext);
   if (!withoutTableFieldResource && (__parent === null || __parent === void 0 ? void 0 : __parent.block) === 'TableField' && (__parent === null || __parent === void 0 ? void 0 : __parent.resource) instanceof TableFieldResource) {
     return __parent.resource;
   }

package/es/block-provider/hooks/index.js

@@ -14,7 +14,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 import { SchemaExpressionScopeContext, useField, useFieldSchema, useForm } from '@formily/react';
-import { parse } from '@nocobase/utils/client';
+import { isURL, parse } from '@nocobase/utils/client';
 import { App, message } from 'antd';
 import { cloneDeep } from 'lodash';
 import get from 'lodash/get';
@@ -50,15 +50,6 @@ function renderTemplate(str, data) {
     return get(data, key) || '';
   });
 }
-function isURL(string) {
-  var url;
-  try {
-    url = new URL(string);
-  } catch (e) {
-    return false;
-  }
-  return url.protocol === 'http:' || url.protocol === 'https:';
-}
 var filterValue = function filterValue(value) {
   if (_typeof(value) !== 'object') {
     return value;
@@ -95,7 +86,6 @@ function getFormValues(filterByTk, field, form, fieldNames, getField, resource)
       return omit(_objectSpread({}, form.values), keys);
     }
   }
-  console.log('form.values', form.values);
   return form.values;
   var values = {};
   var _loop = function _loop() {
@@ -177,14 +167,14 @@ export var useCreateActionProps = function useCreateActionProps() {
     onClick: function onClick() {
       return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
         var _actionSchema$xActio, _fieldSchema$xCompon;
-        var fieldNames, _ref, _ref$assignedValues, originalAssignedValues, onSuccess, overwriteValues, skipValidator, addChild, assignedValues, values, _treeParentField$name, _treeParentField$fore, treeParentField, _parent$service, _parent$service$refre, data;
+        var fieldNames, _ref, _ref$assignedValues, originalAssignedValues, onSuccess, overwriteValues, skipValidator, triggerWorkflows, addChild, assignedValues, values, _treeParentField$name, _treeParentField$fore, treeParentField, _parent$service, _parent$service$refre, data;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               fieldNames = fields.map(function (field) {
                 return field.name;
               });
-              _ref = (_actionSchema$xActio = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio !== void 0 ? _actionSchema$xActio : {}, _ref$assignedValues = _ref.assignedValues, originalAssignedValues = _ref$assignedValues === void 0 ? {} : _ref$assignedValues, onSuccess = _ref.onSuccess, overwriteValues = _ref.overwriteValues, skipValidator = _ref.skipValidator;
+              _ref = (_actionSchema$xActio = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio !== void 0 ? _actionSchema$xActio : {}, _ref$assignedValues = _ref.assignedValues, originalAssignedValues = _ref$assignedValues === void 0 ? {} : _ref$assignedValues, onSuccess = _ref.onSuccess, overwriteValues = _ref.overwriteValues, skipValidator = _ref.skipValidator, triggerWorkflows = _ref.triggerWorkflows;
               addChild = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.addChild;
               assignedValues = parse(originalAssignedValues)({
                 currentTime: new Date(),
@@ -210,7 +200,11 @@ export var useCreateActionProps = function useCreateActionProps() {
               _context2.next = 14;
               return resource[action]({
                 values: _objectSpread(_objectSpread(_objectSpread({}, values), overwriteValues), assignedValues),
-                filterKeys: filterKeys
+                filterKeys: filterKeys,
+                // TODO(refactor): should change to inject by plugin
+                triggerWorkflows: triggerWorkflows !== null && triggerWorkflows !== void 0 && triggerWorkflows.length ? triggerWorkflows.map(function (row) {
+                  return [row.workflowKey, row.context].filter(Boolean).join('!');
+                }).join(',') : undefined
               });
             case 14:
               data = _context2.sent;
@@ -1088,11 +1082,11 @@ export var useUpdateActionProps = function useUpdateActionProps() {
     onClick: function onClick() {
       return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
         var _actionSchema$xActio7;
-        var _ref15, _ref15$assignedValues, originalAssignedValues, onSuccess, overwriteValues, skipValidator, assignedValues, fieldNames, values, _parent$service6, _parent$service6$refr;
+        var _ref15, _ref15$assignedValues, originalAssignedValues, onSuccess, overwriteValues, skipValidator, triggerWorkflows, assignedValues, fieldNames, values, _parent$service6, _parent$service6$refr;
         return _regeneratorRuntime().wrap(function _callee19$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
             case 0:
-              _ref15 = (_actionSchema$xActio7 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio7 !== void 0 ? _actionSchema$xActio7 : {}, _ref15$assignedValues = _ref15.assignedValues, originalAssignedValues = _ref15$assignedValues === void 0 ? {} : _ref15$assignedValues, onSuccess = _ref15.onSuccess, overwriteValues = _ref15.overwriteValues, skipValidator = _ref15.skipValidator;
+              _ref15 = (_actionSchema$xActio7 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio7 !== void 0 ? _actionSchema$xActio7 : {}, _ref15$assignedValues = _ref15.assignedValues, originalAssignedValues = _ref15$assignedValues === void 0 ? {} : _ref15$assignedValues, onSuccess = _ref15.onSuccess, overwriteValues = _ref15.overwriteValues, skipValidator = _ref15.skipValidator, triggerWorkflows = _ref15.triggerWorkflows;
               assignedValues = parse(originalAssignedValues)({
                 currentTime: new Date(),
                 currentRecord: currentRecord,
@@ -1117,7 +1111,11 @@ export var useUpdateActionProps = function useUpdateActionProps() {
                 filterByTk: filterByTk,
                 values: _objectSpread(_objectSpread(_objectSpread({}, values), overwriteValues), assignedValues)
               }, data), {}, {
-                updateAssociationValues: updateAssociationValues
+                updateAssociationValues: updateAssociationValues,
+                // TODO(refactor): should change to inject by plugin
+                triggerWorkflows: triggerWorkflows !== null && triggerWorkflows !== void 0 && triggerWorkflows.length ? triggerWorkflows.map(function (row) {
+                  return [row.workflowKey, row.context].filter(Boolean).join('!');
+                }).join(',') : undefined
               }));
             case 12:
               actionField.data.loading = false;
@@ -1568,7 +1566,7 @@ export var useAssociationNames = function useAssociationNames() {
         var fieldPath = !isAssociationField && isAssociationSubfield ? getAssociationPath(s.name) : s.name;
         var path = prefix === '' || !prefix ? fieldPath : prefix + '.' + fieldPath;
         appends.add(path);
-        if (['Nester', 'SubTable'].includes((_s$xComponentProps = s['x-component-props']) === null || _s$xComponentProps === void 0 ? void 0 : _s$xComponentProps.mode)) {
+        if (['Nester', 'SubTable', 'PopoverNester'].includes((_s$xComponentProps = s['x-component-props']) === null || _s$xComponentProps === void 0 ? void 0 : _s$xComponentProps.mode)) {
           updateAssociationValues.add(path);
           var bufPrefix = prefix && prefix !== '' ? prefix + '.' + s.name : s.name;
           getAssociationAppends(s, bufPrefix);

package/es/collection-manager/Configuration/AddCollectionAction.js

@@ -169,7 +169,7 @@ var getDefaultCollectionFields = function getDefaultCollectionFields(values) {
       uiSchema: {
         type: 'object',
         title: '{{t("Created by")}}',
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           fieldNames: {
             value: 'id',
@@ -205,7 +205,7 @@ var getDefaultCollectionFields = function getDefaultCollectionFields(values) {
       uiSchema: {
         type: 'object',
         title: '{{t("Last updated by")}}',
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           fieldNames: {
             value: 'id',

package/es/collection-manager/Configuration/AddFieldAction.js

@@ -24,10 +24,10 @@ import { useTranslation } from 'react-i18next';
 import { useRequest } from '../../api-client';
 import { RecordProvider, useRecord } from '../../record-provider';
 import { ActionContextProvider, SchemaComponent, useActionContext, useCompile } from '../../schema-component';
-import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider';
 import { useCancelAction } from '../action-hooks';
 import { useCollectionManager } from '../hooks';
 import useDialect from '../hooks/useDialect';
+import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider';
 import * as components from './components';
 import { getOptions } from './interfaces';
 var getSchema = function getSchema(schema, record, compile) {
@@ -38,6 +38,7 @@ var getSchema = function getSchema(schema, record, compile) {
   if (schema.hasDefaultValue === true) {
     var _schema$default;
     properties['defaultValue'] = cloneDeep(schema === null || schema === void 0 ? void 0 : (_schema$default = schema.default) === null || _schema$default === void 0 ? void 0 : _schema$default.uiSchema);
+    properties.defaultValue.required = false;
     properties['defaultValue']['title'] = compile('{{ t("Default value") }}');
     properties['defaultValue']['x-decorator'] = 'FormItem';
     properties['defaultValue']['x-reactions'] = {

package/es/collection-manager/Configuration/EditFieldAction.js

@@ -23,10 +23,10 @@ import { useTranslation } from 'react-i18next';
 import { useAPIClient, useRequest } from '../../api-client';
 import { RecordProvider, useRecord } from '../../record-provider';
 import { ActionContextProvider, SchemaComponent, useActionContext, useCompile } from '../../schema-component';
-import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider';
 import { useCancelAction, useUpdateAction } from '../action-hooks';
 import { useCollectionManager } from '../hooks';
 import useDialect from '../hooks/useDialect';
+import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider';
 import * as components from './components';
 var getSchema = function getSchema(schema, record, compile, getContainer) {
   var _record$__parent;
@@ -39,6 +39,7 @@ var getSchema = function getSchema(schema, record, compile, getContainer) {
   }
   if (schema.hasDefaultValue === true) {
     properties['defaultValue'] = cloneDeep(schema.default.uiSchema) || {};
+    properties.defaultValue.required = false;
     properties['defaultValue']['title'] = compile('{{ t("Default value") }}');
     properties['defaultValue']['x-decorator'] = 'FormItem';
     properties['defaultValue']['x-reactions'] = {

package/es/collection-manager/action-hooks.js

@@ -453,7 +453,9 @@ export var useCreateAction = function useCreateAction() {
             case 14:
               _context5.prev = 14;
               _context5.t0 = _context5["catch"](0);
-              field.data.loading = false;
+              if (field.data) {
+                field.data.loading = false;
+              }
             case 17:
             case "end":
               return _context5.stop();

package/es/global-theme/AntdAppProvider.js

@@ -13,7 +13,11 @@ var AppInner = /*#__PURE__*/memo(function (_ref) {
 });
 var AntdAppProvider = function AntdAppProvider(_ref2) {
   var children = _ref2.children;
-  return /*#__PURE__*/React.createElement(App, null, /*#__PURE__*/React.createElement(AppInner, null, children));
+  return /*#__PURE__*/React.createElement(App, {
+    style: {
+      height: '100%'
+    }
+  }, /*#__PURE__*/React.createElement(AppInner, null, children));
 };
 AntdAppProvider.displayName = 'AntdAppProvider';
 export default AntdAppProvider;

package/es/locale/en_US.d.ts

@@ -182,6 +182,9 @@ declare const _default: {
     "Action type": string;
     Actions: string;
     Insert: string;
+    "Insert if not exists": string;
+    "Insert if not exists, or update": string;
+    "Determine whether a record exists by the following fields": string;
     Update: string;
     View: string;
     "View record": string;
@@ -251,6 +254,7 @@ declare const _default: {
     "Link to description": string;
     "Sub-table": string;
     "Sub-details": string;
+    "Sub-form(Popover)": string;
     "System info": string;
     "Created at": string;
     "Last updated at": string;

package/es/locale/en_US.js

@@ -182,6 +182,9 @@ export default {
   "Action type": "Action type",
   "Actions": "Actions",
   "Insert": "Insert",
+  "Insert if not exists": "Insert if not exists",
+  "Insert if not exists, or update": "Insert if not exists, or update",
+  "Determine whether a record exists by the following fields": "Determine whether a record exists by the following fields",
   "Update": "Update",
   "View": "View",
   "View record": "View record",
@@ -251,6 +254,7 @@ export default {
   "Link to description": "Used to create collection relationships quickly and compatible with most common scenarios. Suitable for non-developer use. When present as a field, it is a drop-down selection used to select records from the target collection. Once created, it will simultaneously generate the associated fields of the current collection in the target collection.",
   "Sub-table": "Sub-table",
   "Sub-details": "Sub-details",
+  "Sub-form(Popover)": "Sub-form(Popover)",
   "System info": "System info",
   "Created at": "Created at",
   "Last updated at": "Last updated at",

package/es/locale/ja_JP.d.ts

@@ -222,6 +222,7 @@ declare const _default: {
     "Link to": string;
     "Link to description": string;
     "Sub-table": string;
+    "Sub-form(Popover)": string;
     "System info": string;
     "Created at": string;
     "Last updated at": string;

package/es/locale/ja_JP.js

@@ -222,6 +222,7 @@ export default {
   "Link to": "リンク",
   "Link to description": "コレクションの関連付けを素早く作成するためにしようされ、ほとんどの一般的なシナリオに対応しています。開発者以外の方のしようにも適しています。フィールドとして存在する場合、参照元コレクションのレコードを選択するために使用されるドロップダウンです。一度作成されると、参照先コレクションに現在のコレクションの関連フィールドが同時に生成されます。",
   "Sub-table": "サブテーブル",
+  "Sub-form(Popover)": "サブフォーム（ポップアップ窓）",
   "System info": "システム情報",
   "Created at": "作成日",
   "Last updated at": "最終更新日",

package/es/locale/zh_CN.d.ts

@@ -1,5 +1,7 @@
 declare const _default: {
     "Display <1><0>10</0><1>20</1><2>50</2><3>100</3></1> items per page": string;
+    "Page number": string;
+    "Page size": string;
     "Meet <1><0>All</0><1>Any</1></1> conditions in the group": string;
     "Open in<1><0>Modal</0><1>Drawer</1><2>Window</2></1>": string;
     "{{count}} filter items": string;
@@ -314,6 +316,7 @@ declare const _default: {
     "Select file": string;
     Subtable: string;
     "Sub-form": string;
+    "Sub-form(Popover)": string;
     "Sub-details": string;
     "Record picker": string;
     "Toggles the subfield mode": string;
@@ -699,6 +702,8 @@ declare const _default: {
     Constant: string;
     'Select a variable': string;
     Insert: string;
+    "Insert if not exists": string;
+    "Insert if not exists, or update": string;
     'System variables': string;
     'Date variables': string;
     'Double click to choose entire object': string;
@@ -767,5 +772,6 @@ declare const _default: {
     "Sync successfully": string;
     "Sync from form fields": string;
     "Select all": string;
+    "Determine whether a record exists by the following fields": string;
 };
 export default _default;

package/es/locale/zh_CN.js

@@ -1,5 +1,7 @@
 export default {
   "Display <1><0>10</0><1>20</1><2>50</2><3>100</3></1> items per page": "每页显示 <1><0>10</0><1>20</1><2>50</2><3>100</3></1> 条",
+  "Page number": "页码",
+  "Page size": "每页条数",
   "Meet <1><0>All</0><1>Any</1></1> conditions in the group": "满足组内 <1><0>全部</0><1>任意</1></1> 条件",
   "Open in<1><0>Modal</0><1>Drawer</1><2>Window</2></1>": "在 <1><0>对话框</0><1>抽屉</1><2>窗口</2></1> 内打开",
   "{{count}} filter items": "{{count}} 个筛选项",
@@ -314,6 +316,7 @@ export default {
   "Select file": "选择文件",
   "Subtable": "子表格",
   "Sub-form": "子表单",
+  "Sub-form(Popover)": "子表单(弹窗)",
   "Sub-details": "子详情",
   "Record picker": "数据选择器",
   "Toggles the subfield mode": "切换子字段模式",
@@ -700,6 +703,8 @@ export default {
   'Constant': '常量',
   'Select a variable': '选择变量',
   "Insert": "插入",
+  "Insert if not exists": "不存在时插入",
+  "Insert if not exists, or update": "不存在时插入，否则更新",
   'System variables': '系统变量',
   'Date variables': '日期变量',
   'Double click to choose entire object': '双击选择整个对象',
@@ -767,5 +772,6 @@ export default {
   "Tag color field": "标签颜色字段",
   "Sync successfully": "同步成功",
   "Sync from form fields": "同步表单字段",
-  "Select all": "全选"
+  "Select all": "全选",
+  "Determine whether a record exists by the following fields": "通过以下字段判断记录是否存在"
 };

package/es/pm/Card.js

@@ -14,6 +14,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import { useAPIClient, useRequest } from '../api-client';
+import { useGlobalTheme } from '../global-theme';
 import { useStyles as useMarkdownStyles } from '../schema-component/antd/markdown/style';
 import { useParseMarkdown } from '../schema-component/antd/markdown/util';
 import { useStyles } from './style';
@@ -38,7 +39,11 @@ var PluginDocument = function PluginDocument(props) {
   var _data$data;
   var _useStyles = useStyles(),
     styles = _useStyles.styles;
-  var _useMarkdownStyles = useMarkdownStyles(),
+  var _useGlobalTheme = useGlobalTheme(),
+    isDarkTheme = _useGlobalTheme.isDarkTheme;
+  var _useMarkdownStyles = useMarkdownStyles({
+      isDarkTheme: isDarkTheme
+    }),
     componentCls = _useMarkdownStyles.componentCls,
     hashId = _useMarkdownStyles.hashId;
   var _useState = useState(''),