@nocobase/client-v2 2.1.0-beta.30 → 2.1.0-beta.32

package/src/flow/models/utils/displayValueUtils.ts

@@ -0,0 +1,57 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { isValidElement } from 'react';
+
+export function hasDisplayValue(value: any) {
+  return value !== undefined && value !== null && value !== '';
+}
+
+function getTitleFieldName(collectionField: any) {
+  const targetCollection = collectionField?.targetCollection;
+  return (
+    collectionField?.targetCollectionTitleFieldName ||
+    targetCollection?.titleCollectionField?.name ||
+    targetCollection?.titleField ||
+    targetCollection?.options?.titleField
+  );
+}
+
+function getTitleCollectionField(collectionField: any, titleFieldName: string) {
+  return (
+    collectionField?.targetCollection?.getField?.(titleFieldName) ||
+    collectionField?.targetCollection?.titleCollectionField
+  );
+}
+
+export function normalizeDisplayValue(value: any, options: { collectionField?: any } = {}): any {
+  if (!hasDisplayValue(value) || isValidElement(value)) {
+    return value;
+  }
+  if (['string', 'number', 'boolean'].includes(typeof value)) {
+    return value;
+  }
+  if (Array.isArray(value)) {
+    const parts = value.map((item) => normalizeDisplayValue(item, options)).filter(hasDisplayValue);
+    return parts.length ? parts.map(String).join(', ') : undefined;
+  }
+  if (value instanceof Date) {
+    return value.toISOString();
+  }
+  if (typeof value === 'object') {
+    const titleFieldName = getTitleFieldName(options.collectionField);
+    if (titleFieldName) {
+      return normalizeDisplayValue(value[titleFieldName], {
+        collectionField: getTitleCollectionField(options.collectionField, titleFieldName),
+      });
+    }
+    return undefined;
+  }
+  return value;
+}

package/src/utils/globalDeps.ts

@@ -19,6 +19,7 @@ import { dayjs } from '@nocobase/utils/client';
 import * as nocobaseFlowEngine from '@nocobase/flow-engine';
 import * as ahooks from 'ahooks';
 import * as antd from 'antd';
+import axios from 'axios';
 import * as i18next from 'i18next';
 import lodash from 'lodash';
 import React from 'react';
@@ -68,6 +69,7 @@ export function defineGlobalDeps(requirejs: RequireJS) {
 
   // utils
   requirejs.define('ahooks', () => ahooks);
+  requirejs.define('axios', () => axios);
   requirejs.define('dayjs', () => dayjs);
   requirejs.define('lodash', () => lodash);
   requirejs.define('@emotion/css', () => emotionCss);

package/src/utils/remotePlugins.ts

@@ -12,33 +12,16 @@ import type { PluginClass } from '../PluginManager';
 import type { PluginData } from '../PluginManager';
 import type { RequireJS } from './requirejs';
 
-/**
- * @internal
- */
-export function defineDevPlugins(plugins: Record<string, PluginClass>) {
-  Object.entries(plugins).forEach(([packageName, plugin]) => {
-    window.define(`${packageName}/client-v2`, () => plugin);
-  });
+function getClientV2ModuleId(packageName: string) {
+  return `${packageName}/client-v2`;
 }
 
 /**
  * @internal
  */
-export function definePluginClient(packageName: string) {
-  window.define(`${packageName}/client-v2`, ['exports', packageName], function (_exports: any, _pluginExports: any) {
-    Object.defineProperty(_exports, '__esModule', {
-      value: true,
-    });
-    Object.keys(_pluginExports).forEach(function (key) {
-      if (key === '__esModule') return;
-      if (key in _exports && _exports[key] === _pluginExports[key]) return;
-      Object.defineProperty(_exports, key, {
-        enumerable: true,
-        get: function () {
-          return _pluginExports[key];
-        },
-      });
-    });
+export function defineDevPlugins(plugins: Record<string, PluginClass>) {
+  Object.entries(plugins).forEach(([packageName, plugin]) => {
+    window.define(getClientV2ModuleId(packageName), () => plugin);
   });
 }
 
@@ -49,7 +32,7 @@ export function configRequirejs(requirejs: any, pluginData: PluginData[]) {
   requirejs.requirejs.config({
     waitSeconds: 120,
     paths: pluginData.reduce<Record<string, string>>((acc, cur) => {
-      acc[cur.packageName] = cur.url;
+      acc[getClientV2ModuleId(cur.packageName)] = cur.url;
       return acc;
     }, {}),
   });
@@ -85,10 +68,7 @@ export function processRemotePlugins(pluginData: PluginData[], resolve: (plugins
 export function getRemotePlugins(requirejs: any, pluginData: PluginData[] = []): Promise<Array<[string, PluginClass]>> {
   configRequirejs(requirejs, pluginData);
 
-  const packageNames = pluginData.map((item) => item.packageName);
-  packageNames.forEach((packageName) => {
-    definePluginClient(packageName);
-  });
+  const packageNames = pluginData.map((item) => getClientV2ModuleId(item.packageName));
 
   return new Promise((resolve, reject) => {
     requirejs.requirejs(packageNames, processRemotePlugins(pluginData, resolve), reject);