Merge branch 'main' into next

packages/core/client/src/application/Application.tsx

@@ -266,6 +266,14 @@ export class Application {
     return this.getPublicPath() + pathname.replace(/^\//g, '');
   }
 
+  getFullUrl(pathname: string) {
+    const name = this.name;
+    if (name && name !== 'main') {
+      return this.getPublicPath() + 'apps/' + name + '/' + pathname.replace(/^\//g, '');
+    }
+    return this.getPublicPath() + pathname.replace(/^\//g, '');
+  }
+
   getCollectionManager(dataSource?: string) {
     return this.dataSourceManager.getDataSource(dataSource)?.collectionManager;
   }

packages/core/client/src/application/__tests__/Application.test.tsx

@@ -13,11 +13,11 @@ import MockAdapter from 'axios-mock-adapter';
 import React, { Component } from 'react';
 import { Link, Outlet } from 'react-router-dom';
 import { describe } from 'vitest';
+import { CollectionFieldInterface } from '../../data-source';
 import { OpenModeProvider } from '../../modules/popup/OpenModeProvider';
 import { Application } from '../Application';
 import { Plugin } from '../Plugin';
 import { useApp } from '../hooks';
-import { CollectionFieldInterface } from '../../data-source';
 
 describe('Application', () => {
   beforeAll(() => {
@@ -85,6 +85,32 @@ describe('Application', () => {
     });
   });
 
+  describe('getFullUrl', () => {
+    it('default', () => {
+      const app = new Application({});
+      expect(app.getFullUrl('test')).toBe('/test');
+      expect(app.getFullUrl('/test')).toBe('/test');
+    });
+
+    it('custom', () => {
+      const app = new Application({ publicPath: '/nocobase' });
+      expect(app.getFullUrl('/test')).toBe('/nocobase/test');
+      expect(app.getFullUrl('test')).toBe('/nocobase/test');
+    });
+
+    it('sub app', () => {
+      const app = new Application({ name: 'sub1' });
+      expect(app.getFullUrl('test')).toBe('/apps/sub1/test');
+      expect(app.getFullUrl('/test')).toBe('/apps/sub1/test');
+    });
+
+    it('sub app', () => {
+      const app = new Application({ name: 'sub1', publicPath: '/nocobase/' });
+      expect(app.getFullUrl('test')).toBe('/nocobase/apps/sub1/test');
+      expect(app.getFullUrl('/test')).toBe('/nocobase/apps/sub1/test');
+    });
+  });
+
   describe('publicPath', () => {
     it('default', () => {
       const app = new Application({});

packages/core/client/src/schema-component/antd/action/Action.Designer.tsx

@@ -571,6 +571,17 @@ export function WorkflowConfig() {
               items: {
                 type: 'object',
                 properties: {
+                  sort: {
+                    type: 'void',
+                    'x-component': 'ArrayTable.Column',
+                    'x-component-props': { width: 50, title: '', align: 'center' },
+                    properties: {
+                      sort: {
+                        type: 'void',
+                        'x-component': 'ArrayTable.SortHandle',
+                      },
+                    },
+                  },
                   context: {
                     type: 'void',
                     'x-component': 'ArrayTable.Column',

packages/plugins/@nocobase/plugin-mobile/src/client/desktop-mode/Header.tsx

@@ -95,7 +95,7 @@ export const DesktopModeHeader: FC = () => {
         }
       `}
     >
-      <Button style={{ color: 'white' }} href={app.getRouteUrl('/admin')}>
+      <Button style={{ color: 'white' }} href={app.getFullUrl('/admin')}>
         {t('Back')}
       </Button>
       <div style={{ display: 'flex', alignItems: 'center' }}>