({
- resource: 'product',
- action: 'list',
- params: {
- appends: ['category'],
- pageSize: 99999,
- },
- });
+ const { data: products } = useProducts();
//合同方案
- const { data: leaseItems } = useLeaseItems(contractPlanId);
- const { data: inLeaseItems } = useLeaseItems(inContractPlanId);
- const { data: outLeaseItems } = useLeaseItems(outContractPlanId);
+ const { data: leaseItems } = useLeaseItems(contractPlanId, date);
- if (!reqProduct.data) {
+ if (!products) {
return '';
}
- const allPrice = {
- name: '总金额',
- total: 0,
- unit: '',
- };
- const weight = {
- name: '理论重量',
- total: 0,
- unit: '吨',
- };
- const priceWeight = {
- name: '理论重量',
- total: 0,
- unit: '吨',
- };
- const contractWeight = {
- name: '理论重量',
- total: 0,
- unit: '吨',
- };
- const outContractWeight = {
- name: '理论重量',
- total: 0,
- unit: '吨',
- };
- // 订单分组实际重量
- const recordData = form.values;
- // 基础小结
- const summaryProduct = {};
- // 合同小结/入库合同小结
- const contractSummary = {};
- // 出库合同小结
- const outContractSummary = {};
- // 报价小结
- const quoteSummary = {};
- form.values.items?.forEach((item) => {
- const productCategory = reqProduct.data.data?.find(
- (product) => product.category_id === item.product?.category_id,
- )?.category;
- if (!(JSON.stringify(productCategory?.attr) === `["6"]`)) {
- if (!item.product || !item.count) return;
- const element = _.cloneDeep(item);
- // 获取产品的分类数据信息
- if (!productCategory) return;
- element.product.category = productCategory;
- // 基础小结
- const { calc } = summary(element, null, null);
- weight.total += calc.weight / 1000;
- calcProductCount(summaryProduct, calc, productCategory);
- // 合同小结(租赁出入库单/租赁直发单)
- if (form.values.category === RecordCategory.lease || form.values.category === RecordCategory.lease2lease) {
- if (form.values.category === RecordCategory.lease && !leaseItems) return;
- if (form.values.category === RecordCategory.lease2lease && !inLeaseItems) return;
- const in_contract = form.values.category === RecordCategory.lease ? leaseItems.data : inLeaseItems.data;
- const { ruleCalc } = summary(element, in_contract, reqWeightRules, recordData);
- contractWeight.total += ruleCalc.weight / 1000;
- calcProductCount(contractSummary, ruleCalc, productCategory);
- if (form.values.category === RecordCategory.lease2lease && outLeaseItems) {
- // 还需要生成出库合同小结
- const out_contract = outLeaseItems.data;
- const { ruleCalc } = summary(element, out_contract, reqWeightRules, recordData);
- outContractWeight.total += ruleCalc.weight / 1000;
- calcProductCount(outContractSummary, ruleCalc, productCategory);
- }
- }
- // 采购出入库/采购直发小结
- if (form.values.category === RecordCategory.purchase || form.values.category === RecordCategory.purchase2lease) {
- const priceRules = leaseData?.map((rule) => {
- return {
- conversion_logic_id: rule.conversion_logic.id,
- products: rule.product,
- unit_price: rule.unit_price,
- };
- });
- const { ruleCalc } = summary(element, priceRules, reqWeightRules, recordData);
- priceWeight.total += ruleCalc.weight / 1000;
- allPrice.total += ruleCalc.price;
- calcProductCount(quoteSummary, ruleCalc, productCategory);
- if (form.values.category === RecordCategory.purchase2lease && inLeaseItems) {
- const in_contract = inLeaseItems.data;
- const { ruleCalc } = summary(element, in_contract, null, recordData);
- contractWeight.total += ruleCalc.weight / 1000;
- calcProductCount(contractSummary, ruleCalc, productCategory);
- }
- }
- }
- });
- summaryProduct['0'] = weight;
- contractSummary['0'] = contractWeight;
- outContractSummary['0'] = outContractWeight;
- quoteSummary['0'] = priceWeight;
- quoteSummary['999'] = allPrice;
+ const resultItems = {};
+ if (form.values.items?.length && contractPlan?.length) {
+ form.values.items.forEach((item) => {
+ if (!item?.new_product_id && !item?.count) return;
+ const productItem = products.find((value) => value.id === item.new_product.id);
+ const productCategory = products?.find((value) => value.id === item.new_product.parentId);
+ resultItems['basis'] = basisItem(productCategory, item, productItem, resultItems['basis']);
+ contractPlan.forEach((contractPlanItem, index) => {
+ if (!contractPlanItem.contract) return;
+ const movement = contractPlanItem.movement === '-1' ? '出库' : '入库';
+ const record_category = contractPlanItem.contract.record_category;
+ const rule = leaseItems[contractPlanItem.contract.id]?.find((value) =>
+ productItem?.parentScopeId.includes(value.new_products_id),
+ );
+ resultItems[movement + index] = ruleItem(
+ record_category,
+ movement,
+ index + 1,
+ rule,
+ resultForm,
+ productCategory,
+ item,
+ productItem,
+ resultItems[movement + index],
+ reqWeightRules,
+ );
+ });
+ });
+ }
- const resultItems = [
- { label: '基础', value: transDescriptions(Object.values(summaryProduct)) },
- { label: '报价', value: transDescriptions(Object.values(quoteSummary)) },
- { label: '出库合同', value: transDescriptions(Object.values(outContractSummary)) },
- {
- label: form.values.category === RecordCategory.lease ? '合同' : '入库合同',
- value: transDescriptions(Object.values(contractSummary)),
- },
- ];
-
- const trans: any[] = resultItems
+ const trans: any[] = Object.values(resultItems)
.map((item) => {
- if (item.value.length) {
- const data = {
- label: item.label,
- key: item.label,
- children: (params: {}, options = {}) {
const cacheKey = stringify(params);
return useRequest
(params, { cacheKey, ...options });
}
-export const useLeaseItems = (planId) => {
- const params = {
- resource: 'contract_plan_lease_items',
- action: 'list',
- params: {
- appends: ['products'],
- filter: {
- contract_plan_id: planId,
- },
- pageSize: 99999,
- },
- };
- const { data, loading, run } = useCachedRequest(params, {
- manual: true,
- });
- useEffect(() => {
- if (planId) {
- run();
- }
- }, [planId]);
- return { data, loading };
-};
-
-export const useProductFeeItems = (planId) => {
- const feeParams = {
- resource: 'contract_plan_fee_items',
- action: 'list',
- params: {
- appends: ['fee_product'],
- filter: {
- contract_plan_id: planId,
- },
- pageSize: 99999,
- },
- };
-
- const { data, loading, run } = useCachedRequest(feeParams, {
- manual: true,
- });
- useEffect(() => {
- if (planId) {
- run();
- }
- }, [planId]);
- return { data, loading };
-};
-
-export const useFeeItems = (categoryId, planId) => {
- const { data, loading, run } = useCachedRequest(
- {
- resource: 'contract_plan_lease_items',
- action: 'list',
- params: {
- appends: ['fee_items', 'products'],
- filter: {
- $and: [
- {
- contract_plan_id: planId,
- },
- {
- products: {
- category_id: categoryId ?? -1,
+export const useLeaseItems = (planId, date) => {
+ const [data, setData] = useState({});
+ const api = useAPIClient();
+ const day = date || new Date();
+ const nowDay = dayjs(day).startOf('day').add(-1, 'minute');
+ if (typeof planId !== 'object') return { data };
+ planId?.forEach((value) => {
+ if (!value) return;
+ if (!data[value]) {
+ api
+ .request({
+ resource: 'contract_plan_lease_items',
+ action: 'list',
+ params: {
+ appends: ['new_products'],
+ filter: {
+ contract_plan: {
+ contract_items: {
+ start_date: { $dateBefore: nowDay },
+ end_date: { $dateAfter: nowDay },
+ contract_id: {
+ $eq: value,
+ },
+ },
},
},
- ],
- },
- pageSize: 99999,
+ pageSize: 99999,
+ },
+ })
+ .then((res) => {
+ const result = { ...data };
+ result[value] = res.data?.data;
+ setData(result);
+ })
+ .catch(() => {
+ return;
+ });
+ }
+ });
+ return { data };
+};
+
+export const useFeeItems = (planId, date) => {
+ const [data, setData] = useState({});
+ const api = useAPIClient();
+ const day = date || new Date();
+ const nowDay = dayjs(day).startOf('day').add(-1, 'minute');
+ if (typeof planId !== 'object') return { data };
+ planId?.forEach((value) => {
+ if (!value) return;
+ if (!data[value]) {
+ api
+ .request({
+ resource: 'contract_plan_fee_items',
+ action: 'list',
+ params: {
+ appends: ['new_fee_products'],
+ filter: {
+ contract_plan: {
+ contract_items: {
+ start_date: { $dateBefore: nowDay },
+ end_date: { $dateAfter: nowDay },
+ contract_id: {
+ $eq: value,
+ },
+ },
+ },
+ },
+ pageSize: 99999,
+ },
+ })
+ .then((res) => {
+ const result = { ...data };
+ result[value] = res.data?.data;
+ setData(result);
+ })
+ .catch(() => {
+ return;
+ });
+ }
+ });
+ return { data };
+};
+
+export const useProductFeeItems = (planId, date) => {
+ const [data, setData] = useState({});
+ const api = useAPIClient();
+ const day = date || new Date();
+ const nowDay = dayjs(day).startOf('day').add(-1, 'minute');
+ if (typeof planId !== 'object') return { data };
+ planId?.forEach((value) => {
+ if (!value) return;
+ if (!data[value]) {
+ api
+ .request({
+ resource: 'contract_plan_lease_items',
+ action: 'list',
+ params: {
+ appends: ['fee_items', 'new_products'],
+ filter: {
+ contract_plan: {
+ contract_items: {
+ start_date: { $dateBefore: nowDay },
+ end_date: { $dateAfter: nowDay },
+ contract_id: {
+ $eq: value,
+ },
+ },
+ },
+ },
+ pageSize: 99999,
+ },
+ })
+ .then((res) => {
+ const result = { ...data };
+ result[value] = res.data?.data;
+ setData(result);
+ })
+ .catch(() => {
+ return;
+ });
+ }
+ });
+ return { data };
+};
+
+export const useProducts = () => {
+ const { data } = useCachedRequest({
+ resource: 'products',
+ action: 'list',
+ params: {
+ pageSize: 99999,
+ },
+ });
+ if (data?.data) {
+ data.data.forEach((value) => {
+ value['parentScopeId'] = selParentId(data.data, value, []);
+ });
+ }
+ return { data: data?.data };
+};
+
+export const useCompany = (appends, id) => {
+ const { data, loading, run } = useCachedRequest(
+ {
+ resource: 'contracts',
+ action: 'list',
+ params: {
+ filter: { id: { $eq: id } },
+ appends,
},
},
- {
- manual: true,
- },
+ { manual: true },
);
-
useEffect(() => {
- if (planId && categoryId) {
+ if (id) {
run();
}
- }, [planId, categoryId]);
+ }, [id]);
return { data, loading };
};
+
+const selParentId = (products, item, scopeId) => {
+ scopeId.push(item.id);
+ if (!item.parentId) {
+ return scopeId;
+ }
+ const items = products.find((value) => value.id === item.parentId);
+ if (!items) {
+ return scopeId;
+ }
+ return selParentId(products, items, scopeId);
+};
diff --git a/packages/plugins/@hera/plugin-rental/src/client/hooks/useAddToChecklistActionProps.tsx b/packages/plugins/@hera/plugin-rental/src/client/hooks/useAddToChecklistActionProps.tsx
index 7fb492624..d77d1e084 100644
--- a/packages/plugins/@hera/plugin-rental/src/client/hooks/useAddToChecklistActionProps.tsx
+++ b/packages/plugins/@hera/plugin-rental/src/client/hooks/useAddToChecklistActionProps.tsx
@@ -1,5 +1,5 @@
import { useForm } from '@tachybase/schema';
-import { useAPIClient, useBlockRequestContext, useRequest } from '@nocobase/client';
+import { useAPIClient, useBlockRequestContext, useRequest } from '@tachybase/client';
import { useChartFilter } from '@nocobase/plugin-data-visualization/client';
import { message } from 'antd';
import { useNavigate } from 'react-router-dom';
diff --git a/packages/plugins/@hera/plugin-rental/src/client/hooks/usePdfPath.tsx b/packages/plugins/@hera/plugin-rental/src/client/hooks/usePdfPath.tsx
index be422b083..9ea0b1e56 100644
--- a/packages/plugins/@hera/plugin-rental/src/client/hooks/usePdfPath.tsx
+++ b/packages/plugins/@hera/plugin-rental/src/client/hooks/usePdfPath.tsx
@@ -1,7 +1,12 @@
-import { useRecord } from '@nocobase/client';
+import { useRecord } from '@tachybase/client';
import React, { createContext, useContext, useMemo, useState } from 'react';
import { SettlementStyleContext } from '../schema-initializer/actions/SettlementStyleSwitchActionInitializer';
+export const PdfPaperSwitchingContext = createContext({
+ paper: null,
+ setPaper: null,
+});
+
export const PdfIsDoubleContext = createContext({
isDouble: null,
setIsDouble: null,
@@ -17,27 +22,59 @@ export const PdfMargingTopContext = createContext({
setMargingTop: null,
});
+// 页面缩放
+export const FontSizeContext = createContext({
+ size: null,
+ setSize: null,
+});
+
+// 注释
+export const AnnotateContext = createContext({
+ annotate: null,
+ setAnnotate: null,
+});
+
export const PdfIsDoubleProvider = (props) => {
const [isDouble, setIsDouble] = useState(false);
const [settingType, setSettingLoad] = useState(false);
const [margingTop, setMargingTop] = useState(0);
+ const [paper, setPaper] = useState('A4');
+ const [size, setSize] = useState('9');
+ const [annotate, setAnnotate] = useState(false);
return (
-
-
- {props.children}
-
-
+
+
+
+
+
+ {props.children}
+
+
+
+
+
);
};
export const useRecordPdfPath = () => {
const record = useRecord();
+ let recordId = record.id;
+ if (record.__collectionName === 'contracts' && record.__parent) {
+ recordId = record.__parent.id;
+ }
+ if (typeof record.id === 'string') {
+ recordId = record.id.split('_')[1] || record.id;
+ }
const { isDouble } = useContext(PdfIsDoubleContext);
const { settingType } = useContext(PdfIsLoadContext);
const { margingTop } = useContext(PdfMargingTopContext);
+ const { paper } = useContext(PdfPaperSwitchingContext);
+ const { size } = useContext(FontSizeContext);
+ const { annotate } = useContext(AnnotateContext);
const path = useMemo(
- () => `/records:pdf?recordId=${record.id}&isDouble=${isDouble}&settingType=${settingType}&margingTop=${margingTop}`,
- [record.id, isDouble, settingType, margingTop],
+ () =>
+ `/records:pdf?recordId=${recordId}&isDouble=${isDouble}&settingType=${settingType}&margingTop=${margingTop}&paper=${paper}&font=${size}&annotate=${annotate}`,
+ [recordId, isDouble, settingType, margingTop, paper, size, annotate],
);
return path;
};
diff --git a/packages/plugins/@hera/plugin-rental/src/client/index.tsx b/packages/plugins/@hera/plugin-rental/src/client/index.tsx
index 2376910bc..f41d112c9 100644
--- a/packages/plugins/@hera/plugin-rental/src/client/index.tsx
+++ b/packages/plugins/@hera/plugin-rental/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin, useCollection } from '@nocobase/client';
+import { Plugin, useCollection } from '@tachybase/client';
import { RecordSummary } from './custom-components/RecordSummary';
import { RecordTotalPrice } from './custom-components/RecordTotalPrice';
import { RecordItemWeight } from './custom-components/RecordItemWeight';
@@ -49,8 +49,16 @@ import {
PrintSetupMargingTop,
} from './schema-initializer/actions/RecordPrintSetupMargingTopInitializer';
import { UnusedRecordsBlockHelper } from './schema-initializer/blocks/UnusedRecordsBlockInitializer';
+
+import { PaperSwitching, PaperSwitchingInitializer } from './schema-initializer/actions/paperSwitching';
+import {
+ RecordPrintAnnotateActionInitializer,
+ Annotate,
+} from './schema-initializer/actions/RecordPrintAnnotateActionInitializer';
+import { PrintFontSize, PrintFontSizeInitializer } from './schema-initializer/actions/RecordPrintFontSizeInitializer';
import { MovementFieldInterface } from './interfaces/movement';
import { Movement } from './schema-components/Movement';
+import { MovementStatus } from './custom-components/MovementStatus';
export class PluginRentalClient extends Plugin {
locale: Locale;
async afterAdd() {}
@@ -86,26 +94,44 @@ export class PluginRentalClient extends Plugin {
type: 'item',
title: '{{t("Column switch")}}',
component: 'ColumnSwitchActionInitializer',
- useVisible() {
- const collection = useCollection();
- const name = collection['options']['name'];
- return name === 'records';
- },
+ // useVisible() {
+ // const collection = useCollection();
+ // const name = collection['options']['name'];
+ // return name === 'records';
+ // },
});
+ this.app.schemaInitializerManager.addItem('PDFViewActionInitializer', 'enbaleActions.paperSwitching', {
+ type: 'item',
+ title: '{{t("paper switching")}}',
+ component: 'PaperSwitchingInitializer',
+ });
+ this.app.schemaInitializerManager.addItem('PDFViewActionInitializer', 'enbaleActions.paperSwitching', {
+ type: 'item',
+ title: '{{t("font size")}}',
+ component: 'PrintFontSizeInitializer',
+ });
+
this.app.schemaInitializerManager.addItem('PDFViewActionInitializer', 'enbaleActions.recordPrintSetup', {
type: 'item',
title: '{{t("Record print setup")}}',
component: 'RecordPrintSetupActionInitializer',
});
+
+ this.app.schemaInitializerManager.addItem('PDFViewActionInitializer', 'enbaleActions.recordPrintAnnotate', {
+ type: 'item',
+ title: '{{t("Record print annotate")}}',
+ component: 'RecordPrintAnnotateActionInitializer',
+ });
+
this.app.schemaInitializerManager.addItem('PDFViewActionInitializer', 'enbaleActions.recordPrintMargingTop', {
type: 'item',
title: '{{t("Record print margingtop")}}',
component: 'RecordPrintSetupMargingTopInitializer',
- useVisible() {
- const collection = useCollection();
- const name = collection['options']['name'];
- return name === 'records' || name === 'waybills';
- },
+ // useVisible() {
+ // const collection = useCollection();
+ // const name = collection['options']['name'];
+ // return name === 'records' || name === 'waybills';
+ // },
});
this.app.schemaInitializerManager.addItem('PDFViewActionInitializer', 'enbaleActions.settlementExcelExport', {
type: 'item',
@@ -186,6 +212,12 @@ export class PluginRentalClient extends Plugin {
PDFViewerCountablePrintActionInitializer,
ColumnSwitchActionInitializer,
ColumnSwitchAction,
+ PaperSwitching,
+ PrintFontSize,
+ Annotate,
+ RecordPrintAnnotateActionInitializer,
+ PaperSwitchingInitializer,
+ PrintFontSizeInitializer,
SettlementExcelExportActionInitializer,
SettlementStyleProvider,
SettlementStyleSwitchActionInitializer,
@@ -194,6 +226,7 @@ export class PluginRentalClient extends Plugin {
RecordPrintSetupMargingTopInitializer,
PrintSetup,
PrintSetupMargingTop,
+ MovementStatus,
});
this.app.addScopes({
useAddToChecklistActionProps,
diff --git a/packages/plugins/@hera/plugin-rental/src/client/interfaces/movement.ts b/packages/plugins/@hera/plugin-rental/src/client/interfaces/movement.ts
index 3b0c4f503..19a088779 100644
--- a/packages/plugins/@hera/plugin-rental/src/client/interfaces/movement.ts
+++ b/packages/plugins/@hera/plugin-rental/src/client/interfaces/movement.ts
@@ -1,4 +1,4 @@
-import { CollectionFieldInterface, dataSource, defaultProps, operators } from '@nocobase/client';
+import { CollectionFieldInterface, dataSource, defaultProps, operators } from '@tachybase/client';
import { tval } from '../locale';
import { Field, uid } from '@tachybase/schema';
@@ -18,7 +18,7 @@ export class MovementFieldInterface extends CollectionFieldInterface {
availableTypes = ['string', 'integer', 'boolean', 'integer'];
properties = {
...defaultProps,
- 'uiSchema.left': {
+ 'uiSchema.x-component-props.left': {
type: 'string',
title: tval('Left part'),
required: true,
@@ -28,7 +28,7 @@ export class MovementFieldInterface extends CollectionFieldInterface {
useCurrentFields: '{{ useCurrentFields }}',
},
},
- 'uiSchema.righ': {
+ 'uiSchema.x-component-props.right': {
type: 'string',
title: tval('Right part'),
required: true,
diff --git a/packages/plugins/@hera/plugin-rental/src/client/locale.tsx b/packages/plugins/@hera/plugin-rental/src/client/locale.tsx
index f8dc08a74..f58b138d4 100644
--- a/packages/plugins/@hera/plugin-rental/src/client/locale.tsx
+++ b/packages/plugins/@hera/plugin-rental/src/client/locale.tsx
@@ -1,4 +1,4 @@
-import { Application, useApp, tval as nTval } from '@nocobase/client';
+import { Application, useApp, tval as nTval } from '@tachybase/client';
const NAMESPACE = '@hera/plugin-rental';
diff --git a/packages/plugins/@hera/plugin-rental/src/client/schema-components/Movement.tsx b/packages/plugins/@hera/plugin-rental/src/client/schema-components/Movement.tsx
index cd90749dd..c279711ae 100644
--- a/packages/plugins/@hera/plugin-rental/src/client/schema-components/Movement.tsx
+++ b/packages/plugins/@hera/plugin-rental/src/client/schema-components/Movement.tsx
@@ -1,11 +1,12 @@
-import { useCollectionField } from '@nocobase/client';
+import { useCollectionField } from '@tachybase/client';
import { connect, isValid, mapProps, mapReadPretty, useField } from '@tachybase/schema';
-import { Radio, Tag } from 'antd';
+import { Tag } from 'antd';
import React from 'react';
import { useEffect } from 'react';
+import { MovementStatus } from '../custom-components/MovementStatus';
export const Movement = connect(
- Radio.Group,
+ MovementStatus,
mapProps(
{
dataSource: 'options',
diff --git a/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/AddToChecklistActionInitializer.tsx b/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/AddToChecklistActionInitializer.tsx
index 17adedd95..4420eed9a 100644
--- a/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/AddToChecklistActionInitializer.tsx
+++ b/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/AddToChecklistActionInitializer.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { ActionInitializer } from '@nocobase/client';
+import { ActionInitializer } from '@tachybase/client';
import { tval } from '../../locale';
export const AddToChecklistActionInitializer = (props) => {
diff --git a/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/ColumnSwitchActionInitializer.tsx b/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/ColumnSwitchActionInitializer.tsx
index 6ae092298..15247ed19 100644
--- a/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/ColumnSwitchActionInitializer.tsx
+++ b/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/ColumnSwitchActionInitializer.tsx
@@ -1,5 +1,5 @@
import React, { useContext, useEffect, useState } from 'react';
-import { ActionInitializer, useRequest } from '@nocobase/client';
+import { ActionInitializer, useRequest } from '@tachybase/client';
import { Radio } from 'antd';
import { PdfIsDoubleContext } from '../../hooks/usePdfPath';
diff --git a/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/PDFViewerPrintActionInitializer.tsx b/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/PDFViewerPrintActionInitializer.tsx
index 3ddabca8e..bba9fd68c 100644
--- a/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/PDFViewerPrintActionInitializer.tsx
+++ b/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/PDFViewerPrintActionInitializer.tsx
@@ -1,5 +1,5 @@
import { usePDFViewerRef } from '@hera/plugin-core/client';
-import { Action, ActionInitializer, useAPIClient, useRecord } from '@nocobase/client';
+import { Action, ActionInitializer, useAPIClient, useRecord } from '@tachybase/client';
import React, { createContext, useContext, useState } from 'react';
const PrintCounterContext = createContext(null);
diff --git a/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/RecordPrintAnnotateActionInitializer.tsx b/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/RecordPrintAnnotateActionInitializer.tsx
new file mode 100644
index 000000000..bbc09d261
--- /dev/null
+++ b/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/RecordPrintAnnotateActionInitializer.tsx
@@ -0,0 +1,30 @@
+import React, { useContext, useEffect, useState } from 'react';
+import { ActionInitializer } from '@tachybase/client';
+import { Switch } from 'antd';
+import { useRequest } from '@tachybase/client';
+import { AnnotateContext } from '../../hooks/usePdfPath';
+export const Annotate = (props) => {
+ const { setAnnotate } = useContext(AnnotateContext);
+ return (
+
+
统一注释:
+
{
+ setAnnotate(e);
+ }}
+ />
+ ({
diff --git a/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/RecordPrintSetupMargingTopInitializer.tsx b/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/RecordPrintSetupMargingTopInitializer.tsx
index 33523091a..7ea5b12a7 100644
--- a/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/RecordPrintSetupMargingTopInitializer.tsx
+++ b/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/RecordPrintSetupMargingTopInitializer.tsx
@@ -1,10 +1,10 @@
import React, { useContext, useEffect, useState } from 'react';
-import { ActionInitializer, useAPIClient } from '@nocobase/client';
+import { ActionInitializer, useAPIClient } from '@tachybase/client';
import { Input } from 'antd';
-import { useRequest } from '@nocobase/client';
+import { useRequest } from '@tachybase/client';
import { PdfMargingTopContext } from '../../hooks/usePdfPath';
import { debounce } from 'lodash';
-import { useCurrentUserContext } from '@nocobase/client';
+import { useCurrentUserContext } from '@tachybase/client';
export const PrintSetupMargingTop = (props) => {
const { data } = useCurrentUserContext();
const userId = data.data?.id;
diff --git a/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/SettlementExcelExportActionInitializer.tsx b/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/SettlementExcelExportActionInitializer.tsx
index 6a8628d92..854731939 100644
--- a/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/SettlementExcelExportActionInitializer.tsx
+++ b/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/SettlementExcelExportActionInitializer.tsx
@@ -1,5 +1,5 @@
import React, { useContext } from 'react';
-import { ActionInitializer, useAPIClient, useRecord } from '@nocobase/client';
+import { ActionInitializer, useAPIClient, useRecord } from '@tachybase/client';
import { useField } from '@tachybase/schema';
import { SettlementStyleContext } from './SettlementStyleSwitchActionInitializer';
import { ExportToExcel } from './SettlementExportExcel';
diff --git a/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/SettlementExportExcel.tsx b/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/SettlementExportExcel.tsx
index f3d17a613..b619411da 100644
--- a/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/SettlementExportExcel.tsx
+++ b/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/SettlementExportExcel.tsx
@@ -56,8 +56,8 @@ export const excelDataHandle = (excelData) => {
*/
const nameRows = [
{
- companyName: { name: '承租单位：', value: `${contracts.project?.company?.name ?? ''}` },
- companyName1: { name: '合同编号：', value: `${contracts.project?.code ?? ''}` },
+ companyName: { name: '承租单位：', value: `${contracts.party_b?.name ?? ''}` },
+ companyName1: { name: '合同编号：', value: `${contracts.number ?? ''}` },
rowId: '3',
},
{
@@ -78,7 +78,7 @@ export const excelDataHandle = (excelData) => {
name: '项目联系人：',
value: `${contracts?.project.contacts.map((contact) => contact.name + ' ' + contact.phone).join(' ')}`,
},
- endData: { name: '经办人：', value: `${contracts.operator.nickname}` },
+ endData: { name: '制表人：', value: `${contracts.operator.nickname}` },
rowId: '6',
},
];
@@ -148,7 +148,7 @@ export const excelDataHandle = (excelData) => {
parseFloat(calc.n_compensate.toFixed(2)),
parseFloat(calc.h_compensate.toFixed(2)),
parseFloat(calc.loadfreight.toFixed(2)),
- parseFloat(calc.other.toFixed(2)),
+ parseFloat(calc.other ? calc.other.toFixed(2) : 0),
formatPercent(calc.tax, 2),
parseFloat(calc.current_expenses.toFixed(2)),
parseFloat(calc.accumulate.toFixed(2)),
@@ -170,30 +170,34 @@ export const excelDataHandle = (excelData) => {
columns: [
{
name: '物料名称',
+ key: 'name1',
+ },
+ {
+ name: ' ',
+ key: '',
+ },
+ {
+ name: '费用类别',
+ key: 'name2',
+ },
+ {
+ name: '单位',
+ key: 'name3',
+ },
+ {
+ name: '订单数量',
+ key: 'name4',
+ },
+ {
+ name: '出入库数量',
+ key: 'name5',
+ },
+ {
+ name: '租赁单价',
key: 'name',
},
{
name: ' ',
- key: ' ',
- },
- {
- name: '费用类别',
- key: 'name',
- },
- {
- name: '单位',
- key: 'name',
- },
- {
- name: '订单数量',
- key: 'name',
- },
- {
- name: '出入库数量',
- key: 'name',
- },
- {
- name: '租赁单价',
key: 'name',
},
{
@@ -206,7 +210,7 @@ export const excelDataHandle = (excelData) => {
},
{
name: ' ',
- key: ' ',
+ key: '',
},
],
rows: [],
@@ -221,6 +225,7 @@ export const excelDataHandle = (excelData) => {
parseFloat(value.item_count?.toFixed(2) || 0),
parseFloat(value.count.toFixed(2)),
parseFloat(value.unit_price.toFixed(5)),
+ '',
value.days,
parseFloat(value.amount.toFixed(2)),
'',
@@ -253,6 +258,10 @@ export const excelDataHandle = (excelData) => {
name: '物质名称',
key: 'name',
},
+ {
+ name: ' ',
+ key: '',
+ },
{
name: '费用类别',
key: 'name',
@@ -291,6 +300,7 @@ export const excelDataHandle = (excelData) => {
converDate(value.date, 'YYYY-MM-DD'),
value.movement === '-1' ? '出库' : value.movement === '1' ? '入库' : '出入库',
value.name,
+ '',
category,
value.unit_name,
parseFloat(value.item_count?.toFixed(2) || 0),
@@ -355,6 +365,10 @@ export const excelDataHandle = (excelData) => {
name: ' ',
key: ' ',
},
+ {
+ name: ' ',
+ key: ' ',
+ },
],
rows: [],
};
@@ -370,6 +384,7 @@ export const excelDataHandle = (excelData) => {
item.notes,
'',
'',
+ '',
]);
});
@@ -413,7 +428,7 @@ export const excelDataHandle = (excelData) => {
},
{
name: ' ',
- key: ' ',
+ key: '',
},
{
name: '单位',
@@ -427,6 +442,10 @@ export const excelDataHandle = (excelData) => {
name: '结存数量',
key: 'name5',
},
+ {
+ name: ' ',
+ key: '',
+ },
],
rows: [],
};
@@ -445,6 +464,7 @@ export const excelDataHandle = (excelData) => {
calc.summary[countNum]?.unit_name ?? '',
calc.summary[countNum] ? parseFloat(calc.summary[countNum]?.item_count?.toFixed(2) || 0) : '',
calc.summary[countNum] ? parseFloat(calc.summary[countNum]?.count.toFixed(2)) : '',
+ '',
]);
}
});
@@ -458,17 +478,25 @@ export const excelDataHandle = (excelData) => {
const footRows = [
{
- companyName: { name: '制表人：' },
- companyName1: { name: '审核人：' },
- companyName2: { name: '验收人：' },
+ companyName: { name: `承租单位：${contracts.party_b?.name ?? ''}` },
+ companyName1: { name: `出租单位：${contracts.first_party?.name ?? PromptText.noContractedCompany}` },
rowId: notesRow + 2,
},
{
companyName: { name: '承租单位项目经理：' },
- companyName1: { name: '材料负责人：' },
- companyName2: { name: '出租单位代表人：' },
+ companyName1: { name: '出租单位审核人：' },
rowId: notesRow + 4,
},
+ {
+ companyName: { name: '承租单位材料负责人：' },
+ companyName1: { name: '出租单位对账人：' },
+ rowId: notesRow + 6,
+ },
+ {
+ companyName: { name: '签署日期：' },
+ companyName1: { name: '签署日期：' },
+ rowId: notesRow + 8,
+ },
];
return {
table1,
@@ -492,7 +520,7 @@ export const excelDataHandle = (excelData) => {
const excelAddTable = (tablerow, tableHeaderText, ws, table) => {
ws.getCell(`A${tablerow - 1}`).value = tableHeaderText;
- ws.mergeCells(`A${tablerow - 1}:J${tablerow - 1}`);
+ ws.mergeCells(`A${tablerow - 1}:K${tablerow - 1}`);
ws.getCell(`A${tablerow - 1}`).alignment = { horizontal: 'center' };
ws.getCell(`A${tablerow - 1}`).border = {
top: { style: 'thin' },
@@ -546,7 +574,7 @@ export const ExportToExcel = async (data) => {
value.height = 20;
});
//设置表格边框
- const cols = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J'];
+ const cols = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K'];
const CellBorder = (row) => {
cols.forEach((value) => {
if (value === 'A' && row === `${notesRow}`) {
@@ -572,9 +600,7 @@ export const ExportToExcel = async (data) => {
});
};
//设置表格表头
- ws.getCell('A1').value = `${
- contracts.project?.associated_company?.name ?? `${PromptText.noContractedCompany}`
- } 对账单`;
+ ws.getCell('A1').value = `${contracts.first_party?.name ?? `${PromptText.noContractedCompany}`} 对账单`;
ws.mergeCells('A1:J1');
ws.getCell('A1').alignment = { vertical: 'middle', horizontal: 'center' };
ws.getCell('A1').font = {
@@ -584,19 +610,19 @@ export const ExportToExcel = async (data) => {
row.height = 30;
//设置第一行内容
ws.getCell('A2').value = '客户各项费用明细';
- ws.mergeCells('A2:J2');
+ ws.mergeCells('A2:K2');
ws.getCell('A2').alignment = { horizontal: 'center' };
//设置表格上层合同信息
nameRows.forEach((value) => {
ws.getCell(`A${value?.rowId}`).value = value[Object.keys(value)[0]].name + value[Object.keys(value)[0]].value;
ws.mergeCells(`A${value?.rowId}:F${value?.rowId}`);
ws.getCell(`G${value?.rowId}`).value = value[Object.keys(value)[1]].name + value[Object.keys(value)[1]].value;
- ws.mergeCells(`G${value?.rowId}:J${value?.rowId}`);
+ ws.mergeCells(`G${value?.rowId}:K${value?.rowId}`);
});
//本期汇总
ws.getCell(`A${table1Row - 1}`).value = '本期汇总';
- ws.mergeCells(`A${table1Row - 1}:J${table1Row - 1}`);
+ ws.mergeCells(`A${table1Row - 1}:K${table1Row - 1}`);
ws.getCell(`A${table1Row - 1}`).alignment = { horizontal: 'center' };
ws.getCell(`A${table1Row - 1}`).border = {
bottom: { style: 'thin' },
@@ -616,7 +642,8 @@ export const ExportToExcel = async (data) => {
const rows24 = ws.getRows(table2Row, calc.history ? calc.history?.length + 1 : 1);
rows24.forEach((value) => {
ws.mergeCells(`A${value['_number']}:B${value['_number']}`);
- ws.mergeCells(`I${value['_number']}:J${value['_number']}`);
+ ws.mergeCells(`G${value['_number']}:H${value['_number']}`);
+ ws.mergeCells(`J${value['_number']}:K${value['_number']}`);
if (value['_number'] !== table2Row) {
const row25 = ws.getRow(value['_number']);
row25.alignment = { horizontal: 'right' };
@@ -631,6 +658,7 @@ export const ExportToExcel = async (data) => {
excelAddTable(table3Row, '本期明细', ws, table3);
const rows37 = ws.getRows(table3Row, calc.list ? calc.list?.length + 1 : 1);
rows37.forEach((value) => {
+ ws.mergeCells(`C${value['_number']}:D${value['_number']}`);
if (value['_number'] !== table3Row) {
const row38 = ws.getRow(value['_number']);
row38.alignment = { horizontal: 'right' };
@@ -645,7 +673,7 @@ export const ExportToExcel = async (data) => {
ws.mergeCells(`A${value['_number']}:B${value['_number']}`);
ws.mergeCells(`C${value['_number']}:D${value['_number']}`);
ws.mergeCells(`F${value['_number']}:G${value['_number']}`);
- ws.mergeCells(`H${value['_number']}:J${value['_number']}`);
+ ws.mergeCells(`H${value['_number']}:K${value['_number']}`);
if (value['_number'] !== table4row) {
const row38 = ws.getRow(value['_number']);
row38.alignment = { horizontal: 'right' };
@@ -667,6 +695,7 @@ export const ExportToExcel = async (data) => {
rows1?.forEach((value) => {
ws.mergeCells(`A${value['_number']}:B${value['_number']}`);
ws.mergeCells(`F${value['_number']}:G${value['_number']}`);
+ ws.mergeCells(`J${value['_number']}:K${value['_number']}`);
if (value['_number'] !== table5Row) {
const row38 = ws.getRow(value['_number']);
row38.alignment = { horizontal: 'right' };
@@ -685,9 +714,8 @@ export const ExportToExcel = async (data) => {
'承租单位收到租费单结算明细15日内未提异议即视为确认。请签字盖章后邮寄一份至' +
contracts.project?.associated_company.address;
ws.getCell(`F${notesRow}`).value = `
- 备注:${contracts.project?.comment ?? ''}
- 出租单位：${contracts.project?.associated_company?.name ?? PromptText.noContractedCompany}`;
- ws.mergeCells(`F${notesRow}:J${notesRow}`);
+ 备注:${contracts.project?.comment ?? ''}`;
+ ws.mergeCells(`F${notesRow}:K${notesRow}`);
const url = 'http://985.so/bpw6g';
const imageUrl = await QRCode.toDataURL(url);
const imageId1 = workBook.addImage({
@@ -704,11 +732,9 @@ export const ExportToExcel = async (data) => {
//设置底部签名区域
footRows.forEach((value) => {
ws.getCell(`A${value?.rowId}`).value = value[Object.keys(value)[0]].name;
- ws.mergeCells(`A${value?.rowId}:C${value?.rowId}`);
- ws.getCell(`D${value?.rowId}`).value = value[Object.keys(value)[1]].name;
- ws.mergeCells(`D${value?.rowId}:G${value?.rowId}`);
- ws.getCell(`H${value?.rowId}`).value = value[Object.keys(value)[2]].name;
- ws.mergeCells(`H${value?.rowId}:J${value?.rowId}`);
+ ws.mergeCells(`A${value?.rowId}:E${value?.rowId}`);
+ ws.getCell(`F${value?.rowId}`).value = value[Object.keys(value)[1]].name;
+ ws.mergeCells(`F${value?.rowId}:K${value?.rowId}`);
});
const buffer = await workBook.xlsx.writeBuffer();
diff --git a/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/SettlementStyleSwitchActionInitializer.tsx b/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/SettlementStyleSwitchActionInitializer.tsx
index 9cf15772e..9a860c5c6 100644
--- a/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/SettlementStyleSwitchActionInitializer.tsx
+++ b/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/SettlementStyleSwitchActionInitializer.tsx
@@ -1,5 +1,5 @@
import React, { createContext, useContext, useState } from 'react';
-import { Action, ActionInitializer } from '@nocobase/client';
+import { Action, ActionInitializer } from '@tachybase/client';
export const SettlementStyleContext = createContext({
style: 'category',
diff --git a/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/paperSwitching.tsx b/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/paperSwitching.tsx
new file mode 100644
index 000000000..de44ea8b1
--- /dev/null
+++ b/packages/plugins/@hera/plugin-rental/src/client/schema-initializer/actions/paperSwitching.tsx
@@ -0,0 +1,66 @@
+import React, { useContext, useEffect, useRef, useState } from 'react';
+import { ActionInitializer, useRequest } from '@tachybase/client';
+import { Button, Divider, Input, InputRef, Radio, Select, Space } from 'antd';
+import { PdfPaperSwitchingContext } from '../../hooks/usePdfPath';
+import { PlusOutlined } from '@ant-design/icons';
+
+export const PaperSwitching = (props) => {
+ const { setPaper } = useContext(PdfPaperSwitchingContext);
+
+ const index = 0;
+ const [items, setItems] = useState(['A1', 'A2', 'A3', 'A4', 'A5', 'A6', 'B1', 'B2', 'B3', 'B4']);
+ // const [name, setName] = useState('');
+ // const inputRef = useRef(null);
+ // const onNameChange = (event: React.ChangeEvent) => {
+ // setName(event.target.value);
+ // };
+
+ // const addItem = (e: React.MouseEvent) => {
+ // e.preventDefault();
+ // setItems([...items, name || `New item ${index++}`]);
+ // setName('');
+ // setTimeout(() => {
+ // inputRef.current?.focus();
+ // }, 0);
+ // };
+ const handleChange = (event) => {
+ setPaper(event);
+ };
+ return (
+ (
+ <>
+ {menu}
+ {/*
+ */}
+
+ )}
+ options={items.map((item) => ({ label: item, value: item }))}
+ />
+ );
+};
+
+export const PaperSwitchingInitializer = (props) => {
+ const schema = {
+ title: '{{ t("paper switching") }}',
+ 'x-action': 'paperSwitching',
+ 'x-component': 'PaperSwitching',
+ 'x-designer': 'Action.Designer',
+ };
+ return
{columns.map((column, columnIndex) => (
- {item[column + 'name']}
+
+ {annotate && item[column + 'commentIndex']
+ ? item[column + 'commentIndex'] + '……' + item[column + 'name']
+ : item[column + 'name']}
+
{!item[column + 'count'] ? '' : formatQuantity(item[column + 'count'], 2) + item[column + 'unit']}
-
+
{!item[column + 'total']
? ''
: formatQuantity(item[column + 'total'], 2) + item[column + 'conversion_unit']}
-
- {item[column + 'isExcluded']
- ? '不计入合同 ' + (item[column + 'comment'] || '')
- : item[column + 'comment'] || ''}
-
+ {!annotate && (
+
+ {item[column + 'isExcluded']
+ ? '不计入合同 ' + (item[column + 'comment'] || '')
+ : item[column + 'comment'] || ''}
+
+ )}
))}
));
let addCol = <>;
- if (detail.category === RecordCategory.purchase) {
+ if (detail.record_category === '购销') {
const allprice = getAllPrice();
addCol = (
@@ -336,15 +320,27 @@ const PreviewDocument = ({
{column === 'left_' ? '' : '总金额'}
- {column === 'left_' ? '' : allprice}
-
+ {column === 'left_' ? '' : allprice}
+
+ {!annotate && (
+
))}
);
}
- return detail.category === RecordCategory.purchase ? (
+ return detail.record_category === '购销' ? (
<>
{page}
{addCol}
@@ -381,71 +377,76 @@ const PreviewDocument = ({
));
};
+ const projectPhone = detail.record_party_b.contacts?.map((item) => (item.name || '') + (item.phone || '')).join(' ');
+
+ const car = detail.vehicles ? detail.vehicles.map((item) => item?.number).join(' ') : '';
return (
-
- {recordsName}
- {detail.category === RecordCategory.inventory ? '盘点' : outOfStorage}单
+
+ {' '}
+ {/**transform: `scale(${trans})` */}
+ {detail.contract_first_party?.name || '异常数据，请联系相关负责人！'}
+ {detail.contract_first_party ? detail.movement : '盘点'}单
- {/* 第一行 */}
-
- {detail.category === RecordCategory.purchase && (
- 销售单位：{outOfStorageAddress(1)}
- )}
- {detail.category === RecordCategory.staging && (
- 出库方：{outOfStorageAddress(1)}
- )}
- {detail.category === RecordCategory.inventory && (
- 盘点单位：{detail.in_stock?.name}
- )}
- {detail.category !== RecordCategory.lease && (
- 日期：{date && dayjs(date).format('YYYY-MM-DD')}
- )}
- {detail.category !== RecordCategory.lease && 流水号：{number} }
-
- {/* 第二行 */}
-
- {detail.category === RecordCategory.purchase && (
- 采购单位：{outOfStorageAddress(0)}
- )}
- {detail.category === RecordCategory.staging && (
- 入库方：{outOfStorageAddress(0)}
- )}
- {detail.category !== RecordCategory.inventory && detail.category !== RecordCategory.lease && (
- 车号：{car}
- )}
- {detail.category !== RecordCategory.inventory && detail.category !== RecordCategory.lease && (
- 原始单号：{origin}
- )}
-
- {/* 租赁 */}
- {detail.category === RecordCategory.lease && (
-
- 承租单位：{detail.contract?.project?.company?.name || ''}
- 日期：{date && dayjs(date).format('YYYY-MM-DD')}
+ {detail.record_category === '租赁' && (
+
+
+ 承租单位：{detail.record_party_b.company.name || ''}
+
+ 日期：{detail.record_date && dayjs(detail.record_date).format('YYYY-MM-DD')}
+
+
+
+
+ 项目名称：{detail.record_party_b.name || ''}
+ 流水号：{detail.record_number}
+
+
+
+ 项目地址：{detail.record_party_b.address}
+ 原始单号：{detail.record_origin}
+
+
+
+ 项目联系人：{projectPhone}
+ 车号：{car}
+
)}
- {detail.category === RecordCategory.lease && (
-
- 项目名称：{detail.contract?.project?.name || ''}
- 流水号：{number}
+
+ {detail.record_category === '购销' && (
+
+
+
+ 销售单位：{detail.record_party_b.company.name || ''} {detail.record_party_b.name || ''}
+
+
+ 日期：{detail.record_date && dayjs(detail.record_date).format('YYYY-MM-DD')}
+
+ 流水号：{detail.record_number}
+
+
+ 采购单位：{detail.record_party_a.name || ''}
+ 车号：{car}
+ 原始单号：{detail.record_origin}
+
)}
- {detail.category === RecordCategory.lease && (
-
- 项目地址：{detail.contract?.project?.address}
- 原始单号：{origin}
-
- )}
- {detail.category === RecordCategory.lease && (
-
- 项目联系人：{projectPhone}
- 车号：{car}
+ {!detail.record_category && (
+
+
+ 盘点单位：{detail.record_party_a.name || ''}
+
+ 日期：{detail.record_date && dayjs(detail.record_date).format('YYYY-MM-DD')}
+
+ 流水号：{detail.record_number}
+
)}
+
{/* 定价 */}
- {detail.category === RecordCategory.purchase && (
+ {detail.record_category === '购销' && (
物料名称及规格
单价
@@ -463,21 +464,20 @@ const PreviewDocument = ({
)}
)}
- {detail.category === RecordCategory.purchase &&
- renderPrice(isDouble ? dobulePriceRule : priceRule, isDouble)}
+ {detail.record_category === '购销' && renderPrice(isDouble ? dobulePriceRule : priceRule, isDouble)}
{/* ============================================================两表分割================================================================================= */}
{/* 单列租金及费用 */}
物料名称及规格
数量
小计
- 备注
+ {!annotate && 备注 }
{isDouble && (
<>
物料名称及规格
数量
- 小计
- 备注
+ 小计
+ {!annotate && 备注 }
)}
@@ -495,14 +495,21 @@ const PreviewDocument = ({
- 制表人：{singlePlayer}
- {detail.category === RecordCategory.lease && 出租单位（签名）： }
- {detail.category === RecordCategory.lease && 租借单位（签名）： }
- {detail.category === RecordCategory.purchase && 采购单位（签名）： }
- {detail.category === RecordCategory.purchase && 购入单位（签名）： }
- {detail.category === RecordCategory.staging && 暂存仓库（签名）： }
- {detail.category === RecordCategory.inventory && 盘点仓库（签名）： }
+ 制表人：{detail.nickname + ' ' + detail?.userPhone}
+ {detail.record_category === '租赁' && 出租单位（签名）： }
+ {detail.record_category === '租赁' && 租借单位（签名）： }
+ {detail.record_category === '购销' && 采购单位（签名）： }
+ {detail.record_category === '购销' && 购入单位（签名）： }
+ {!detail.record_category && 盘点仓库（签名）： }
+ {record.map((item) => (
+ <>
+
+ {annotate && item.commentIndex && {item.commentIndex + ':' + item.comment} }
+
+
+ ))}
{detail.pdfExplain}
@@ -512,13 +519,7 @@ const PreviewDocument = ({
);
};
-export const renderItV2 = async (rent: {
- detail: any;
- record: any[];
- priceRule: any[];
- isDouble: Number;
- printSetup: String;
-}) => {
+export const renderItV2 = async (rent: { detail: any; record: any[]; priceRule: any[]; options: any }) => {
const url = 'https://shcx.daoyoucloud.com/admin';
const imageUrl = await QRCode.toDataURL(url);
return await renderToStream(
- {contracts.project?.associated_company?.name ?? `${PromptText.noContractedCompany}`}
+ {contracts.first_party?.name ?? `${PromptText.noContractedCompany}`}
对账单
客户各项费用明细
@@ -231,7 +231,7 @@ const PreviewDocument = ({
承租单位：
- {contracts?.project?.company?.name}
+ {contracts.party_b?.name}
合同编号：
@@ -259,7 +259,7 @@ const PreviewDocument = ({
项目联系人：
{contracts.project?.contacts.map((contact) => contact.name + ' ' + contact.phone).join(' ')}
- 经办人：{contracts.operator.nickname}
+ 制表人：{contracts.operator.nickname}
@@ -412,21 +412,23 @@ const PreviewDocument = ({
备注：{contracts.project?.comment}
-
- 出租单位：
- {contracts.project?.associated_company?.name ?? `${PromptText.noContractedCompany}`}
-
- 制表人：
- 审核人：
- 验收：
+ 承租单位：{contracts.party_b?.name}
+ 出租单位：{contracts.first_party?.name}
承租单位项目经理：
- 材料负责人：
- 出租单位代表人：
+ 出租单位审核人：
+
+
+ 承租单位材料负责人：
+ 出租对账人：
+
+
+ 签署日期：
+ 签署日期：
diff --git a/packages/plugins/@hera/plugin-rental/src/server/pdf-documents/waybills-document.tsx b/packages/plugins/@hera/plugin-rental/src/server/pdf-documents/waybills-document.tsx
index f52896cf3..ae1501682 100644
--- a/packages/plugins/@hera/plugin-rental/src/server/pdf-documents/waybills-document.tsx
+++ b/packages/plugins/@hera/plugin-rental/src/server/pdf-documents/waybills-document.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { Document, Page, Text, View, StyleSheet, renderToStream } from '@hera/plugin-core';
-import { formatCurrency, formatQuantity } from '../../utils/currencyUtils';
+import { formatQuantity } from '../../utils/currencyUtils';
import { converDate } from '../../utils/daysUtils';
import { Waybill } from '../../interfaces/waybill';
@@ -193,23 +193,20 @@ const PreviewDocument = ({ waybill, settings }: { waybill: Waybill; settings: an
);
}
// 单号
- const recordNumber = waybill.record.number;
- const items = (
- waybill.record.items
- ? waybill.record.items.map((item) => {
- const convertible = item.product.category.convertible;
- const data = {
- name: item.product.name + '/' + item.product.spec,
- count: item.count,
- unit: item.product.category.unit,
- conversion_unit: convertible ? item.product.category.conversion_unit : item.product.category.unit,
- sort: item.product.category.sort * 100000 + item.product.sort,
- total: formatQuantity(convertible ? item.count * item.product.ratio : item.count, 2),
- };
- return data;
- })
- : []
- ).sort((a, b) => a.sort - b.sort);
+ const recordNumber = waybill.record_number;
+ const items = waybill.products
+ ? waybill.products.map((item) => {
+ const convertible = item.convertible;
+ const data = {
+ name: item.products_name,
+ count: item.count,
+ unit: item.unit,
+ conversion_unit: convertible ? item.conversion_unit : item.unit,
+ total: formatQuantity(item.total, 2),
+ };
+ return data;
+ })
+ : [];
const chunkedArray = Array.from({ length: Math.ceil(items.length / 3) }, (_, i) => {
const chunk = items.slice(i * 3, i * 3 + 3);
@@ -344,15 +341,15 @@ const PreviewDocument = ({ waybill, settings }: { waybill: Waybill; settings: an
- {waybill.payer?.company?.name} {waybill.payer?.name}
+ {waybill.payer_company} {waybill.payer_name}
- {waybill.payee_account?.name}
+ {waybill.payee_account_name}
- {waybill.payee_account?.bank} {waybill.payee_account?.number}
+ {waybill.payee_account_bank} {waybill.payee_account_number}
@@ -368,14 +365,14 @@ const PreviewDocument = ({ waybill, settings }: { waybill: Waybill; settings: an
发货方单位
- {waybill.out_stock?.company?.name} {waybill.out_stock?.name}
+ {waybill.shipper_company} {waybill.shipper_name}
- {waybill.shipper_contact?.name}
+ {waybill.shipper_contact}
- {waybill.shipper_contact?.phone}
+ {waybill.shipper_contact_phone}
发货方地址
- {waybill.out_stock?.address}
+ {waybill.shipper_address}
- {waybill.in_stock?.company?.name} {waybill.in_stock?.name}
+ {waybill.consignee_company} {waybill.consignee_name}
- {waybill.consignee_contact?.name}
+ {waybill.consignee_contact}
- {waybill.consignee_contact?.phone}
+ {waybill.consignee_contact_phone}
收货方地址
- {waybill.in_stock?.address}
+ {waybill.consignee_address}
承运方单位
- {waybill.carrier?.name}
+ {waybill.carrier}
驾驶员
- {waybill.driver?.name}
+ {waybill.driver}
身份证
- {waybill.driver?.id_card}
+ {waybill.driver_idcard}
- {waybill.record.vehicles.map((item) => item?.number).join(' ')}
+ {waybill.vehicles}
- {waybill.driver?.phone}
+ {waybill.driver_phone}
diff --git a/packages/plugins/@hera/plugin-rental/src/server/plugin.ts b/packages/plugins/@hera/plugin-rental/src/server/plugin.ts
index 57cd896e7..5affaba16 100644
--- a/packages/plugins/@hera/plugin-rental/src/server/plugin.ts
+++ b/packages/plugins/@hera/plugin-rental/src/server/plugin.ts
@@ -1,17 +1,17 @@
import path from 'path';
-import { Plugin } from '@nocobase/server';
+import { Plugin } from '@tachybase/server';
import { RecordService } from './services/record-service';
import { ContractRuleService } from './services/contract-rule-service';
import { ContractService } from './services/contract-service';
import { ProjectService } from './services/project-service';
-import { Container } from '@nocobase/utils';
+import { Container } from '@tachybase/utils';
import './actions';
import { SqlLoader } from '@hera/plugin-core';
import { DetailCheckService } from './services/detail-check-service';
import { CollectionRepository } from '@nocobase/plugin-collection-manager';
-import { Repository } from '@nocobase/database';
+import { Repository } from '@tachybase/database';
import { VehiclesService } from './services/vehicles-service';
-import { Cache } from '@nocobase/cache';
+import { Cache } from '@tachybase/cache';
export class PluginRentalServer extends Plugin {
cache: Cache;
@@ -59,6 +59,7 @@ export class PluginRentalServer extends Plugin {
await collectionRepo.createMany({
records: categories
+ .filter(Boolean)
.filter((item) => typeof item.id !== 'undefined')
.map((item) => ({ collectionName, categoryId: item.id })),
});
diff --git a/packages/plugins/@hera/plugin-rental/src/server/services/contract-rule-service.ts b/packages/plugins/@hera/plugin-rental/src/server/services/contract-rule-service.ts
index 4370fe8c5..402ae3cf9 100644
--- a/packages/plugins/@hera/plugin-rental/src/server/services/contract-rule-service.ts
+++ b/packages/plugins/@hera/plugin-rental/src/server/services/contract-rule-service.ts
@@ -1,19 +1,38 @@
-import Database, { CreateOptions, MagicAttributeModel } from '@nocobase/database';
-import { Db, Service } from '@nocobase/utils';
-
+import Database, { CreateOptions, MagicAttributeModel } from '@tachybase/database';
+import { Db, Service } from '@tachybase/utils';
+import { Op } from 'sequelize';
@Service()
export class ContractRuleService {
@Db()
private db: Database;
-
+ // 合同重复项需要重新是实现
async load() {
// 合同方案规则重复校验
+ this.db.on('contract_plan_lease_items.beforeSave', this.leaseItemBeforeSave.bind(this));
+ // 上表最底表的hooks不会作用到合同方案整体的重复判断，所以需要contract_plan的hooks
this.db.on('contract_plans.beforeSave', this.contractPlansBeforeSave.bind(this));
- // beforeSave无法获取多对多关联关系的数据
- this.db.on('contract_plan_lease_items.beforeCreate', this.contractPlanLeaseItemsBeforeSave.bind(this));
- this.db.on('contract_plan_lease_items.beforeUpdate', this.contractPlanLeaseItemsBeforeSave.bind(this));
- this.db.on('contract_plan_fee_items.beforeCreate', this.contractPlanFeeItemsBeforeSave.bind(this));
- this.db.on('contract_plan_fee_items.beforeUpdate', this.contractPlanFeeItemsBeforeSave.bind(this));
+ }
+
+ async leaseItemBeforeSave(model: MagicAttributeModel, options: CreateOptions): Promise {
+ if (!options.values) return;
+ // 只适用单个表数据修改
+ if (options.values.contract_plan?.id && options.values.new_products?.id) {
+ const where = {
+ contract_plan_id: options.values.contract_plan.id,
+ new_products_id: options.values.new_products.id,
+ };
+ if (!model.isNewRecord) {
+ where['id'] = {
+ [Op.ne]: model.id,
+ };
+ }
+ const data = await this.db.getRepository('contract_plan_lease_items').findOne({
+ where,
+ });
+ if (data) {
+ throw new Error('租金存在');
+ }
+ }
}
/**
@@ -24,158 +43,28 @@ export class ContractRuleService {
*/
async contractPlansBeforeSave(model: MagicAttributeModel, options: CreateOptions): Promise {
if (!options.values) return;
- const leaseData2 = options.values.lease_items.map((item) => item.products);
- const repeatData = this.repeatQuery2(leaseData2);
+ const leaseData = options.values.lease_items.map((item) => item.new_products);
+ const repeatData = this.repeatQuery(leaseData);
if (repeatData.length > 0) {
- const products = repeatData.map((item) => item.label).join(',');
- throw new Error('租金规则中的产品重复！重复产品：' + products);
+ throw new Error('租金规则中的产品重复！' + repeatData.map((item) => item.name));
}
- const feeData = options.values.fee_items.map((fee) => fee.fee_product);
- const feeRepeatData = this.repeatQuery(feeData);
- if (feeRepeatData.length > 0) {
- const products = feeRepeatData.map((item) => item.label).join(',');
- throw new Error('费用规则中的产品重复！重复费用：' + products);
- }
- const productFeeRepeatData = [];
- for (const index in options.values.lease_items) {
- const fees = options.values.lease_items[index].fee_items?.filter(Boolean);
- if (!fees) return;
- // 租金，费用，租金费用使用同一判断重复方法，需要处理一下租金费用数据结构
- const transFee = fees.map((item) => {
- if (Object.keys(item).length > 0 && item.fee_product) {
- return { ...item, id: item.fee_product.id, raw_category_id: item.fee_product.id };
- }
- });
- const data = this.repeatQuery(transFee);
- if (data.length > 0) {
- productFeeRepeatData.push({ index, value: data.map((item) => item.fee_product.label).join(',') });
- }
- }
- if (productFeeRepeatData.length > 0) {
- const tips = [];
- for (const iterator of productFeeRepeatData) {
- const tip = `第${Number(iterator.index) + 1}条租金数据中费用重复添加`;
- tips.push(tip);
- }
- throw new Error(tips.join('，'));
+
+ const feeData = options.values.fee_items.map((item) => item.new_fee_products);
+ const repeatFeeData = this.repeatQuery(feeData);
+ if (repeatFeeData.length > 0) {
+ throw new Error('费用规则中的产品重复！' + repeatFeeData.map((item) => item.name));
}
}
- /**
- * 租金单条规则创建before seqlizeHooks事件
- * @param model
- * @param options
- * @returns
- */
- async contractPlanLeaseItemsBeforeSave(model: MagicAttributeModel, options: CreateOptions): Promise {
- if (!options.values?.contract_plan && !options.values?.products) return;
- const plan = await this.db.getRepository('contract_plans').findOne({
- where: {
- id: options.values?.contract_plan?.id || options.values?.contract_plan_id,
- },
- appends: ['lease_items', 'lease_items.products'],
- });
- const add = options.values.products;
- const productData = plan.lease_items
- .filter((item) => item.id !== options.values.id && item.products.length === add.length)
- .map((item) => item.products)
- .flat();
- productData.forEach((item) => {
- const isHas = add.find(
- (p) =>
- (p.id < 99999 && (p.id === item.id || (item.id > 99999 && p.raw_category_id === item.raw_category_id))) ||
- (p.id > 99999 && p.raw_category_id === item.raw_category_id),
- );
- if (isHas) {
- throw new Error('方案中存在此产品');
- }
- });
- }
-
- /**
- * 费用规则创建before seqlizeHooks事件
- * @param model
- * @param options
- * @returns
- */
- async contractPlanFeeItemsBeforeSave(model: MagicAttributeModel, options: CreateOptions): Promise {
- if (!options.values?.contract_plan || !options.values?.fee_product) return;
- const plan = await this.db.getRepository('contract_plans').findOne({
- where: {
- id: options.values.contract_plan.id,
- },
- appends: ['lease_items', 'lease_items.products', 'fee_items', 'fee_items.fee_product'],
- });
- if (options.values.lease_product) {
- // 待页面完成确定入参数格式后
- // const feeProduct = plan.fee_items.filter((item) => item.lease_item_id === options.values.lease_product.id // 确定options.values.lease_product是否为数组格式)
- } else {
- const add = options.values.fee_product;
- if (!Array.isArray(add)) return;
- const feeData = plan.fee_items.filter((item) => !item.lease_item_id).map((item) => item.fee_product);
- feeData.forEach((item) => {
- const isHas = add.find((p) => p.id === item.id);
- if (isHas) {
- throw new Error('方案中存在此赔偿项');
- }
- });
- }
- }
-
- /**
- * 租金规则重复查询
- * @param data
- * @returns
- */
repeatQuery(data: any[]): any[] {
- if (data.filter(Boolean).length > 0) {
- const queryData = data.filter(Boolean);
- if (queryData.length > 0) {
- const arr = [];
- for (let index = 0; index < queryData.length; index++) {
- const repea = queryData.slice(index + 1).filter((item) => {
- if (item) {
- return (
- item.id === queryData[index].id ||
- (item.raw_category_id === queryData[index].raw_category_id &&
- (item.id > 99999 || queryData[index].id > 99999))
- );
- }
- });
- arr.push(...repea.filter(Boolean));
+ const repea = [];
+ for (let i = 0; i < data.length; i++) {
+ for (let j = i + 1; j < data.length; j++) {
+ if (data[i].id === data[j].id) {
+ repea.push(data[i]);
}
- return arr;
- } else {
- return [];
}
- } else {
- return [];
}
- }
-
- /**
- * 与原实现相差较多，新写一实现方法
- * 租金产品多选重复查询，一个组合算是一个整体进行比较
- * @param data
- * @returns
- */
- repeatQuery2(data: any[]): any[] {
- const result = data.reduce((acc, curr) => {
- const found = acc.find((subArr) => subArr.length === curr.length);
- if (found) {
- found.push(...curr);
- } else {
- acc.push(curr);
- }
- return acc;
- }, []);
- const rep = [];
- result.forEach((item) => {
- const repeatData = this.repeatQuery(item);
- if (repeatData.length > 0) {
- rep.push(...item);
- }
- });
- return rep;
+ return repea;
}
}
diff --git a/packages/plugins/@hera/plugin-rental/src/server/services/contract-service.ts b/packages/plugins/@hera/plugin-rental/src/server/services/contract-service.ts
index 3fae2fe9d..7eea0595a 100644
--- a/packages/plugins/@hera/plugin-rental/src/server/services/contract-service.ts
+++ b/packages/plugins/@hera/plugin-rental/src/server/services/contract-service.ts
@@ -1,5 +1,5 @@
-import Database, { CreateOptions, MagicAttributeModel } from '@nocobase/database';
-import { Db, Service } from '@nocobase/utils';
+import Database, { CreateOptions, MagicAttributeModel } from '@tachybase/database';
+import { Db, Service } from '@tachybase/utils';
@Service()
export class ContractService {
@@ -33,7 +33,7 @@ export class ContractService {
if (!options.values) return;
if (options.values.settlementTemplate) {
const temp = {
- 上个月: `MONTH(EOMONTH(TODAY(), -1))`,
+ 上个月: `MONTH(EOMONTH(TODAY(), -1))`, // 工作流默认
本月: `MONTH(TODAY())`,
当年: `YEAR(EOMONTH(TODAY(), -1))`,
};
diff --git a/packages/plugins/@hera/plugin-rental/src/server/services/detail-check-service.ts b/packages/plugins/@hera/plugin-rental/src/server/services/detail-check-service.ts
index d87505e6f..2050b5623 100644
--- a/packages/plugins/@hera/plugin-rental/src/server/services/detail-check-service.ts
+++ b/packages/plugins/@hera/plugin-rental/src/server/services/detail-check-service.ts
@@ -1,5 +1,5 @@
-import Database, { CreateOptions, MagicAttributeModel } from '@nocobase/database';
-import { Db, Service } from '@nocobase/utils';
+import Database, { CreateOptions, MagicAttributeModel } from '@tachybase/database';
+import { Db, Service } from '@tachybase/utils';
@Service()
export class DetailCheckService {
diff --git a/packages/plugins/@hera/plugin-rental/src/server/services/project-service.ts b/packages/plugins/@hera/plugin-rental/src/server/services/project-service.ts
index 3769bbc31..ba7968c5b 100644
--- a/packages/plugins/@hera/plugin-rental/src/server/services/project-service.ts
+++ b/packages/plugins/@hera/plugin-rental/src/server/services/project-service.ts
@@ -1,6 +1,6 @@
-import Database, { CreateOptions, MagicAttributeModel } from '@nocobase/database';
+import Database, { CreateOptions, MagicAttributeModel } from '@tachybase/database';
import { SqlLoader } from '@hera/plugin-core';
-import { Db, Service, Inject } from '@nocobase/utils';
+import { Db, Service, Inject } from '@tachybase/utils';
@Service()
export class ProjectService {
diff --git a/packages/plugins/@hera/plugin-rental/src/server/services/record-pdf-service.ts b/packages/plugins/@hera/plugin-rental/src/server/services/record-pdf-service.ts
index c0981b167..593941517 100644
--- a/packages/plugins/@hera/plugin-rental/src/server/services/record-pdf-service.ts
+++ b/packages/plugins/@hera/plugin-rental/src/server/services/record-pdf-service.ts
@@ -1,337 +1,321 @@
import { ConversionLogics, RecordCategory, RulesNumber, SourcesType, countCource } from '../../utils/constants';
import { renderItV2 } from '../pdf-documents/records-documentV2';
-import { Db, Service } from '@nocobase/utils';
+import { Db, Service } from '@tachybase/utils';
import { RecordPdfOptions } from '../../interfaces/options';
import { PrintSetup } from '../../utils/system';
-import Database from '@nocobase/database';
+import Database from '@tachybase/database';
@Service()
export class RecordPdfService {
@Db()
private db: Database;
- async transformPdfV2(recordData: any, lease_data: any, fee_data: any, options: RecordPdfOptions) {
- const { isDouble, printSetup } = options;
- // 直发单不需要打印预览
- if (recordData.category === RecordCategory.purchase2lease || recordData.category === RecordCategory.lease2lease)
- return;
-
- // 盘点/暂存单使用默认产品表的换算逻辑
- if (recordData.category === RecordCategory.staging || recordData.category === RecordCategory.inventory) {
- lease_data = lease_data.map((item) => {
- const data = {
- ...item,
- };
- // 根据产品表换算
- data['conversion_logic_id'] = 2;
- return data;
- });
- }
- let make_price;
-
- // 购销单计算报价数据
- if (recordData.category === RecordCategory.purchase) {
- const price_rule = lease_data.map((item) => {
- const data = {
- name: item.price_label,
- unit_price: item.price_price,
- comment: item.price_comment,
- };
- if (!item.conversion_logic_id) return;
- if (item.conversion_logic_id === ConversionLogics.Keep) {
- data['count'] = item.count;
- data['unit'] = item.unit;
- } else if (item.conversion_logic_id === ConversionLogics.Product) {
- if (item.convertible) {
- data['count'] = item.count * item.ratio;
- data['unit'] = item.conversion_unit;
- } else {
- data['count'] = item.count;
- data['unit'] = item.unit;
- }
- } else if (item.conversion_logic_id === ConversionLogics.ProductWeight) {
- data['count'] = item.count * item.weight;
- data['unit'] = 'KG';
- } else if (item.conversion_logic_id === ConversionLogics.ActualWeight) {
- const weight = recordData.record_group_weight_items?.find((w) => w.category.id === item.product_category_id);
- if (weight) {
- data['count'] = weight.weight;
- data['unit'] = '吨';
- } else {
- data['count'] = recordData.weight;
- data['unit'] = '吨';
- }
- } else {
- data['unit'] = 'KG';
- if (item.wr.conversion_logic_id === ConversionLogics.Keep) {
- data['count'] = item.count * item.wr.weight;
- } else if (item.wr.conversion_logic_id === ConversionLogics.Product) {
- data['count'] = item.count * item.ratio * item.wr.weight;
- }
- }
- data['all_price'] = data['count'] * data['unit_price'];
- return data;
- });
-
- const setData = Object.values(
- price_rule.reduce((acc, item) => {
- if (!item) {
- console.error('报价计算出错', price_rule);
- return acc;
- }
- if (!acc[item.name]) {
- acc[item.name] = { ...item };
- } else {
- acc[item.name].count += item.count;
- acc[item.name].all_price += item.all_price;
- }
- return acc;
- }, {}),
- );
- make_price = setData;
- }
-
- // ！产品
- const leaseData = lease_data
- .map((lease) => {
- const data = {
- name: lease.label,
- count: lease.count,
- unit: lease.unit,
- comment: lease.item_comment,
- product_id: lease.product_id,
- category_id: lease.category_id,
- product_category_name: lease.product_category_name,
- };
- if (lease.conversion_logic_id === ConversionLogics.Keep) {
- data['total'] = lease.count;
- data['conversion_unit'] = lease.unit;
- } else if (lease.conversion_logic_id === ConversionLogics.Product) {
- if (lease.convertible) {
- data['total'] = lease.count * lease.ratio;
- data['conversion_unit'] = lease.conversion_unit;
- } else {
- data['total'] = lease.count;
- data['conversion_unit'] = lease.unit;
- }
- } else if (lease.conversion_logic_id === ConversionLogics.ProductWeight) {
- data['total'] = lease.count * lease.weight;
- data['conversion_unit'] = 'KG';
- } else if (lease.conversion_logic_id === ConversionLogics.ActualWeight) {
- if (lease.convertible) {
- data['total'] = lease.count * lease.ratio;
- data['conversion_unit'] = lease.conversion_unit;
- } else {
- data['total'] = lease.count;
- data['conversion_unit'] = lease.unit;
- }
- } else {
- data['conversion_unit'] = 'KG';
- if (lease.wr?.conversion_logic_id === ConversionLogics.Keep) {
- data['total'] = lease.count * lease.wr?.weight;
- } else if (lease.wr?.conversion_logic_id === ConversionLogics.Product) {
- data['total'] = lease.count * lease.ratio * lease.wr?.weight;
- }
- }
- return data;
- })
- .sort((a, b) => a.category_id - b.category_id);
-
- // ！产品赔偿
- const product_fee =
- printSetup === PrintSetup.Manual
- ? fee_data.filter((item) => item.product_id && item.count_source === SourcesType.staff)
- : fee_data.filter((item) => item.product_id);
- const transFormProductFee = product_fee.map((item, index) => {
- // 购销/暂存/盘点无费用信息
- if (
- recordData.category === RecordCategory.purchase ||
- recordData.category === RecordCategory.staging ||
- recordData.category === RecordCategory.inventory
- ) {
- return;
- }
- // 人工录入没有数量
- if (item.count_source === SourcesType.staff && !item.fee_count) return;
- // 出库单，计数为入库量
- if (item.record_movement === '-1' && item.count_source === SourcesType.inbound) return;
- // 入库单，计数为出库量
- if (item.record_movement === '1' && item.count_source === SourcesType.outbound) return;
+ /**
+ * 注意点
+ * 1. 正常租赁产品
+ * 2. 租赁产品的维修赔偿
+ * 3. 无关联产品的维修赔偿（实际总重量，出入库量）
+ * 4. 无关联产品的维修赔偿（人工录入)
+ * 5. 报价
+ */
+ async transformPdfV2(
+ intermediate, // 中间表
+ baseRecord, //订单基础数据
+ leaseData, // 租金数据
+ leaseFeeData, // 赔偿数据
+ noLeaseProductFeeData,
+ noRuleexcluded,
+ contracts,
+ options,
+ ) {
+ const { printSetup } = options;
+ const movement = (movement: string) => {
const data = {
- isFee: true,
- isExcluded: item.is_excluded,
- name: item.custom_name || item.label,
- count1: item.count_source === SourcesType.staff ? item.fee_count : item.product_count,
- unit: item.unit,
- comment: '',
- product_id: item.product_id + '.' + (index + 1),
- category_id: item.product_category_id,
+ '-1': '出库',
+ '1': '入库',
};
- if (item.conversion_logic_id === ConversionLogics.Keep) {
- data['total'] = data.count1;
- } else if (item.conversion_logic_id === ConversionLogics.Product) {
- if (item.convertible) {
- data['total'] = data.count1 * item.product_ratio;
- } else {
- data['total'] = data.count1;
- }
- } else if (item.conversion_logic_id === ConversionLogics.ProductWeight) {
- data['total'] = data.count1 * item.product_weight;
- } else if (item.conversion_logic_id === ConversionLogics.ActualWeight) {
- data['total'] = item.actual_weight || item.record_weight;
- } else {
- if (item.weight_rules?.conversion_logic_id === ConversionLogics.Keep) {
- data['total'] = data.count1 * item.weight_rules.weight;
- } else if (item.weight_rules?.conversion_logic_id === ConversionLogics.Product) {
- data['total'] = data.count1 * item.weight_rules.weight * item.product_ratio;
+ return data[movement];
+ };
+
+ const record_category = (category) => {
+ const data = {
+ '0': '租赁',
+ '1': '购销',
+ };
+ return data[category];
+ };
+ const needRecord = {
+ record_type: baseRecord.type_new,
+ record_number: baseRecord.number,
+ record_date: baseRecord.date,
+ record_origin: baseRecord.origin,
+ record_party_b: movement(contracts.movement) === '出库' ? baseRecord.in_stock : baseRecord.out_stock, // 还需要判断第三个合同的情况，确定一下出库入是否合同公司有关
+ record_party_a: movement(contracts.movement) === '入库' ? baseRecord.in_stock : baseRecord.out_stock,
+ vehicles: baseRecord.vehicles,
+ record_category: record_category(contracts.record_category),
+ contract_first_party: contracts.first_party, //公司信息，甲方，我们
+ movement: movement(contracts.movement),
+ pdfExplain: baseRecord.pdfExplain,
+ nickname: baseRecord.nickname,
+ userPhone: baseRecord.userPhone,
+ };
+ // ！租金数据
+ const leasePorducts = leaseData.map((leas) => {
+ const data = {
+ ...leas,
+ };
+ let total: number;
+ const unit = leas.unit;
+ let conversion_unit = leas.conversion_unit;
+ if (leas.conversion_logic_id === ConversionLogics.Keep) {
+ total = leas.count;
+ conversion_unit = leas.unit;
+ } else if (
+ leas.conversion_logic_id === ConversionLogics.Product ||
+ leas.conversion_logic_id === ConversionLogics.ActualWeight
+ ) {
+ const ratio = leas.convertible ? leas.products_ratio : 1;
+ total = leas.count * ratio;
+ conversion_unit = leas.convertible ? leas.conversion_unit : leas.unit;
+ } else if (leas.conversion_logic_id === ConversionLogics.ProductWeight) {
+ total = leas.count * leas.products_weight;
+ conversion_unit = 'KG';
+ } else if (leas.conversion_logic_id > 4) {
+ if (leas.wr_logic_id === ConversionLogics.Keep) {
+ total = leas.count * leas.wr_weight;
+ } else if (leas.wr_logic_id === ConversionLogics.Product) {
+ const ratio = leas.convertible ? leas.products_ratio : 1;
+ total = leas.count * leas.wr_weight * ratio;
}
+ conversion_unit = 'KG';
+ }
+ data['total'] = total;
+ data.unit = unit;
+ data.conversion_unit = conversion_unit;
+ return data;
+ });
+ // ！租金赔偿
+ const leaseProductsFees = leaseFeeData.map((fee) => {
+ const data = {
+ products_id: fee.products_id,
+ name: fee.fee_custom_name || fee.fee_product,
+ comment: fee.is_excluded ? fee.comment + '_不计入合同' : fee.comment,
+ };
+ let count: number;
+ if (fee.count_source === SourcesType.staff) {
+ count = fee.fee_count;
+ } else if (
+ fee.count_source === SourcesType.inAndOut ||
+ (fee.count_source === SourcesType.inbound && contracts.movement === '1') ||
+ (fee.count_source === SourcesType.outbound && contracts.movement === '0')
+ ) {
+ count = fee.count;
+ }
+ let total: number;
+ let conversion_unit = fee.fee_rule_unit;
+ if (fee.conversion_logic_id === ConversionLogics.Keep) {
+ total = count;
+ conversion_unit = fee.fee_unit;
+ } else if (
+ fee.conversion_logic_id === ConversionLogics.Product ||
+ fee.conversion_logic_id === ConversionLogics.ActualWeight
+ ) {
+ const ratio = fee.fee_convertible ? fee.fee_ratio : 1;
+ total = count * ratio;
+ } else if (fee.conversion_logic_id === ConversionLogics.ProductWeight) {
+ total = count * fee.fee_weight;
+ conversion_unit = 'KG';
+ } else if (fee.conversion_logic_id > 4) {
+ const ProductWeightRule = leaseData.findOne((leas) => leas.products_id === fee.products_id);
+ if (ProductWeightRule.wr_logic_id === ConversionLogics.Keep) {
+ total = count * ProductWeightRule.wr_weight;
+ } else if (ProductWeightRule.wr_logic_id === ConversionLogics.Product) {
+ const ratio = ProductWeightRule.convertible ? ProductWeightRule.products_ratio : 1;
+ total = count * ProductWeightRule.wr_weight * ratio;
+ }
+ conversion_unit = 'KG';
}
- data['conversion_unit'] = item.unit;
if (printSetup === PrintSetup.DisplayAndPrice) {
- data['count'] = data['total'];
- data['total'] = data['total'] * item.unit_price;
+ data['count'] = total;
+ data['unit'] = conversion_unit;
+ data['total'] = total * fee.unit_price;
data['conversion_unit'] = '元';
+ } else {
+ data['conversion_unit'] = conversion_unit;
+ data['total'] = total;
}
return data;
});
- // ！无关联赔偿 item中
- let manualData = [];
- const noProductFee = fee_data.filter((item) => !item.product_id && item.count_source === SourcesType.staff);
- if (noProductFee.length) {
- const itemFee = await this.db.sequelize.query(`
- select ri.product_id, ri.count, p.category_id, ri.comment
- from records r
- left join record_items ri on ri.record_id = r.id and ri.product_id in (${noProductFee.map((item) => item.fee_product_id).join(',')})
- join product p on p.id = ri.product_id
- where r.id = ${recordData.id}
- `);
- const result: any = itemFee[0];
- manualData = result.map((item) => {
- const feeRule = noProductFee.find((f) => f.fee_product_id === item.product_id);
- if (!feeRule) return;
- const data = {
- name: feeRule.custom_name || feeRule.label,
- unit: feeRule.unit,
- conversion_unit: feeRule.unit,
- comment: item.comment || '',
- };
- if (feeRule.conversion_logic_id === ConversionLogics.Keep) {
- data['total'] = item.count;
- } else if (feeRule.conversion_logic_id === ConversionLogics.Product) {
- data['total'] = feeRule.convertible ? item.count * feeRule.product_ratio : item.count;
- } else if (feeRule.conversion_logic_id === ConversionLogics.ProductWeight) {
- data['total'] = item.count * feeRule.weight;
- } else if (feeRule.conversion_logic_id === ConversionLogics.ActualWeight) {
- data['total'] = feeRule.record_weight;
- } else {
- const weight_rule = item.weight_rules.find(
- (l) => l.product_id === item.product_id || l.product - RulesNumber === item.category_id,
- );
- if (weight_rule && weight_rule.conversion_logic_id === ConversionLogics.Keep) {
- return item.count * weight_rule.weight;
- } else if (weight_rule && weight_rule.conversion_logic_id === ConversionLogics.Product) {
- return item.count * feeRule.product_ratio * weight_rule.weight;
- }
- }
- if (printSetup === PrintSetup.DisplayAndPrice) {
- data['count'] = data['total'];
- data['total'] = data['total'] * feeRule.unit_price;
- data['conversion_unit'] = '元';
- }
- return data;
- });
- }
- // ！无关联赔偿，出入库量
- const fee =
- printSetup === PrintSetup.Manual
- ? []
- : fee_data.filter((item) => !item.product_id && item.count_source !== SourcesType.staff);
- const no_product_fee = fee
- .map((item) => {
- if (
- recordData.category === RecordCategory.purchase ||
- recordData.category === RecordCategory.staging ||
- recordData.category === RecordCategory.inventory
- ) {
- return;
- }
- if (item.record_movement === '-1' && item.count_source === SourcesType.inbound) return;
- if (item.record_movement === '1' && item.count_source === SourcesType.outbound) return;
- const data = {
- isFee: true,
- name: item.custom_name || item.label,
- unit: item.unit,
- comment: '',
- };
- if (item.conversion_logic_id === ConversionLogics.Keep) {
- data['total'] = lease_data.reduce((a, b) => a + b.count, 0);
- } else if (item.conversion_logic_id === ConversionLogics.Product) {
- data['total'] = lease_data.reduce((a, b) => a + (item.convertible ? b.count * b.ratio : b.count), 0);
- } else if (item.conversion_logic_id === ConversionLogics.ProductWeight) {
- data['total'] = lease_data.reduce((a, b) => a + b.count * b.weight, 0) / 1000;
- } else if (item.conversion_logic_id === ConversionLogics.ActualWeight) {
- data['total'] = item.record_weight;
- } else {
- if (item.weight_rules?.length) {
- data['total'] = lease_data.reduce((a, b) => {
- const weight_rule = item.weight_rules.find(
- (l) => l.product_id === b.product_id || l.product - RulesNumber === b.category_id,
- );
- if (weight_rule && weight_rule.conversion_logic_id === ConversionLogics.Keep) {
- return a + b.count * weight_rule.weight;
- } else if (weight_rule && weight_rule.conversion_logic_id === ConversionLogics.Product) {
- return a + b.count * b.ratio * weight_rule.weight;
- }
- }, 0);
- }
- }
- data['conversion_unit'] = '吨';
- if (printSetup === PrintSetup.DisplayAndPrice) {
- data['count'] = data['total'];
- data['total'] = data['total'] * item.unit_price;
- data['conversion_unit'] = '元';
- }
- return data;
- })
- .filter((item) => item && item.total);
-
- const product_fees = transFormProductFee.filter(Boolean);
- // 内容（租金+费用）
- const product_correlation = [...leaseData, ...product_fees].sort((a, b) => a.product_id - b.product_id);
-
+ const rentData = [...leasePorducts, ...leaseProductsFees].sort((a, b) => a.products_id - b.products_id);
// 生成小计
const productTotal = {};
- leaseData.forEach((element) => {
+ leasePorducts.forEach((element) => {
if (element) {
- productTotal[element.category_id] = {
- name: element.product_category_name + '[小计]',
- total: (productTotal[element.category_id]?.total ?? 0) + element?.total,
+ productTotal[element.parentId] = {
+ name: element.parentName + '[小计]',
+ total: (productTotal[element.parentId]?.total ?? 0) + element.total,
conversion_unit: element.conversion_unit,
count: '',
unit: '',
isTotal: true,
comment: '',
- category_id: element.category_id,
+ parentId: element.parentId,
+ // 报价用
+ priceName: element.parentName,
+ price: element.unit_price,
};
}
});
+
// 插入小计
const productTotalItems = Object.entries(productTotal).map(([_, value]) => value);
productTotalItems.forEach((itemB: any) => {
- const lastIndex = product_correlation.map((itemA) => itemA.category_id).lastIndexOf(itemB.category_id);
+ const lastIndex = rentData.map((itemA) => itemA.parentId).lastIndexOf(itemB.parentId);
if (lastIndex !== -1) {
- product_correlation.splice(lastIndex + 1, 0, itemB);
+ rentData.splice(lastIndex + 1, 0, itemB);
} else {
- product_correlation.push(itemB);
+ rentData.push(itemB);
}
});
- const recordPdfData = [...product_correlation, ...manualData, ...no_product_fee].filter(Boolean);
+
+ // ！无关联费用（人工录入）
+ const noproFeesStaff = noLeaseProductFeeData
+ .filter((item) => item.count_source === SourcesType.staff)
+ .map((fee) => {
+ const data = {
+ fee_products_id: fee.fee_products_id,
+ name: fee.name,
+ comment: fee.is_excluded ? fee.comment + '_不计入合同' : fee.comment,
+ };
+ let total: number;
+ let conversion_unit;
+ if (fee.conversion_logic_id === ConversionLogics.Keep) {
+ total = fee.count;
+ conversion_unit = fee.unit;
+ } else if (
+ fee.conversion_logic_id === ConversionLogics.Product ||
+ fee.conversion_logic_id === ConversionLogics.ActualWeight
+ ) {
+ const ratio = fee.convertible ? fee.ratio : 1;
+ total = fee.count * ratio;
+ conversion_unit = fee.convertible ? fee.conversion_unit : fee.unit;
+ } else if (fee.conversion_logic_id === ConversionLogics.ProductWeight) {
+ total = fee.count * fee.weight;
+ conversion_unit = 'KG';
+ } else if (fee.conversion_logic_id > 4) {
+ if (fee.wr_logic_id === ConversionLogics.Keep) {
+ total = fee.count * fee.wr_weight;
+ } else if (fee.wr_logic_id === ConversionLogics.Product) {
+ const ratio = fee.convertible ? fee.ratio : 1;
+ total = fee.count * fee.wr_weight * ratio;
+ }
+ conversion_unit = 'KG';
+ }
+ if (printSetup === PrintSetup.DisplayAndPrice) {
+ data['count'] = total;
+ data['unit'] = conversion_unit;
+ data['total'] = total * fee.unit_price;
+ data['conversion_unit'] = '元';
+ } else {
+ data['conversion_unit'] = conversion_unit;
+ data['total'] = total;
+ }
+ return data;
+ });
+ rentData.push(...noproFeesStaff);
+
+ // ！无关联费用（出入库量）
+ if (printSetup === PrintSetup.Display || printSetup === PrintSetup.DisplayAndPrice) {
+ const noproFees = noLeaseProductFeeData
+ .filter((item) => item.count_source !== SourcesType.staff)
+ .map((fee) => {
+ const data = {
+ name: fee.custom_name || fee.name,
+ };
+ if (
+ fee.count_source === SourcesType.inAndOut ||
+ (fee.count_source === SourcesType.inbound && intermediate.movement === '1') ||
+ (fee.count_source === SourcesType.outbound && intermediate.movement === '-1')
+ ) {
+ let total = 0;
+ let conversion_unit: string;
+ leaseData.forEach((ele) => {
+ if (fee.conversion_logic_id === ConversionLogics.Keep) {
+ total += ele.count;
+ conversion_unit = ele.unit;
+ } else if (fee.conversion_logic_id === ConversionLogics.Product) {
+ const ratio = ele.convertible ? ele.ratio : 1;
+ total += ele.count * ratio;
+ conversion_unit = ele.convertible ? ele.conversion_unit : ele.unit;
+ } else if (fee.count_logic_id === ConversionLogics.ActualWeight) {
+ total = baseRecord.weight;
+ conversion_unit = '吨';
+ } else if (fee.conversion_logic_id === ConversionLogics.ProductWeight) {
+ total += ele.count * ele.weight;
+ conversion_unit = 'KG';
+ } else if (fee.conversion_logic_id > 4) {
+ const weightRule = fee.weight_rules.find((item) => item.new_product_id === ele.products_id);
+ if (weightRule) {
+ if (weightRule.conversion_logic_id === ConversionLogics.Keep) {
+ total += ele.count * weightRule.weight;
+ } else if (weightRule.conversion_logic_id === ConversionLogics.Product) {
+ const ratio = weightRule.convertible ? weightRule.ratio : 1;
+ total += ele.count * weightRule.weight * ratio;
+ }
+ conversion_unit = 'KG';
+ }
+ }
+ });
+ data['isFee'] = true;
+ conversion_unit = fee.fee_rule_unit || conversion_unit;
+ if (printSetup === PrintSetup.DisplayAndPrice) {
+ data['count'] = total;
+ data['unit'] = conversion_unit;
+ data['total'] = total * fee.unit_price;
+ data['conversion_unit'] = '元';
+ } else {
+ data['conversion_unit'] = conversion_unit;
+ data['total'] = total;
+ }
+ return data;
+ }
+ })
+ .filter(Boolean);
+ rentData.push(...noproFees);
+ const excluded = noRuleexcluded
+ .map((item) => {
+ const data = {
+ name: item.custom_name || item.fee_name,
+ total: item.count,
+ comment: item.is_excluded ? (item.comment || '') + ' 不计入合同' : item.comment || '',
+ conversion_unit: '',
+ };
+ return data;
+ })
+ .filter(Boolean);
+ rentData.push(...excluded);
+ }
+
+ // 报价
+ let priceRule = [];
+ if (needRecord.record_category === '购销') {
+ priceRule = productTotalItems.map((item: any) => {
+ return {
+ name: item.priceName,
+ unit_price: item.price,
+ unit: item.conversion_unit,
+ count: item.total,
+ all_price: item.total * item.price,
+ comment: item.comment,
+ };
+ });
+ }
+ // 注意不记录合同
return await renderItV2({
- detail: recordData,
- record: recordPdfData,
- priceRule: make_price,
- isDouble,
- printSetup,
+ detail: needRecord,
+ record: rentData,
+ priceRule,
+ options,
});
}
}
diff --git a/packages/plugins/@hera/plugin-rental/src/server/services/record-service.ts b/packages/plugins/@hera/plugin-rental/src/server/services/record-service.ts
index 907dddc76..df676c27e 100644
--- a/packages/plugins/@hera/plugin-rental/src/server/services/record-service.ts
+++ b/packages/plugins/@hera/plugin-rental/src/server/services/record-service.ts
@@ -1,63 +1,20 @@
-import Database, { CreateOptions, MagicAttributeModel, Transaction } from '@nocobase/database';
-import { Db, Service } from '@nocobase/utils';
-import { ConversionLogics, Movement, RecordCategory, RecordTypes, settlementStatus } from '../../utils/constants';
+import Database, { CreateOptions, MagicAttributeModel } from '@tachybase/database';
+import { Db, Service } from '@tachybase/utils';
+import { ConversionLogics, RecordCategory, settlementStatus } from '../../utils/constants';
import validateLicensePlate from '../../utils/validateLIcensePlate';
-
+import { QueryTypes } from 'sequelize';
+import _ from 'lodash';
@Service()
export class RecordService {
@Db()
private db: Database;
-
async load() {
- // 1. 创建项目/更新项目（ 直发单，生成对应租赁/购销，出入库单数据， 并且设置订单多对多project字段关系）
- this.db.on('records.afterCreate', this.afterCreateDirectRecord.bind(this));
- this.db.on('records.afterUpdate', this.afterUpdateDirectRecord.bind(this));
this.db.on('records.afterSave', this.recordsAfterSave.bind(this));
+ this.db.on('records.beforeSave', this._calcAllPrice.bind(this));
+ // 盘点单
+ this.db.on('records.afterSaveWithAssociations', this._createStock.bind(this));
}
- /**
- * 处理直发单生成单
- */
- async afterCreateDirectRecord(model: MagicAttributeModel, options: CreateOptions): Promise {
- const { values, transaction, context } = options;
- if (!values) {
- return;
- }
- if (values.record_category === RecordTypes.purchaseDirect || values.record_category === RecordTypes.rentDirect) {
- await this._createRecord(model, values, transaction, context, null);
- }
- }
- /**
- * 处理直发单生成单
- */
- async afterUpdateDirectRecord(model: MagicAttributeModel, options: CreateOptions): Promise {
- const { values, transaction, context } = options;
- if (!values) {
- return;
- }
- // 运输单的创建会走订单的update，如果存在waybill一定是在录运输单
- if (values.waybill) return;
- if (values.record_category === RecordTypes.purchaseDirect || values.record_category === RecordTypes.rentDirect) {
- const deleteDatas = await this.db.getRepository('records').find({ where: { direct_record_id: model.id } });
- // 删除订单多对多项目表数据
- const records = await this.db.getRepository('records').find({ where: { direct_record_id: model.id } });
- await this._deleteReocrdProject(
- records.map((item) => item.id),
- transaction,
- );
- // 删除新建时创建的订单
- await this.db.sequelize.query(
- `
- delete from records
- where records.direct_record_id = ${model.id}
- `,
- {
- transaction,
- },
- );
- const numbers = deleteDatas.map((item) => item.number);
- await this._createRecord(model, values, transaction, context, numbers);
- }
- }
+
/**
* 订单afterSave hooks
* @param model
@@ -66,173 +23,11 @@ export class RecordService {
async recordsAfterSave(model: MagicAttributeModel, options: CreateOptions): Promise {
// 运输单导致的订单更新不必走以下订单逻辑，减少性能消耗，有waybill一定是运输单录入
if (options.values?.waybill) return;
- // 订单新建更新后（根据合同确定出入库字段）
- await this._setProject(model, options);
// 订单发生变化时更新对应结算单的状态（需要重新计算）
await this._updateSettlementStatus(model, options);
// 车牌号校验
await this._checkPlateNumber(model, options);
}
-
- /**
- * 校验车牌号
- */
- async _checkPlateNumber(record: MagicAttributeModel, options: CreateOptions) {
- const { transaction, context } = options;
- if (record.dataValues?.vehicles) {
- const ids = record.dataValues.vehicles.filter((item) => typeof item === 'number').join(',');
- const vehicles = await this.db.sequelize.query(`select * from vehicles where id in (${ids})`, {
- transaction,
- });
- if (vehicles[0].length) {
- vehicles[0].forEach((item: any) => {
- if (item.number) {
- const validate = validateLicensePlate(item.number);
- if (!validate) {
- throw new Error('车牌号格式错误');
- }
- }
- });
- }
- }
- }
-
- // 新版订单录入界面，手动赋值对应的出入库信息
- async _setProject(record: MagicAttributeModel, options: CreateOptions) {
- const { values, transaction, context } = options;
-
- // 非新增和修改订单信息的
- if (!values || values.record_category === undefined) {
- return;
- }
- // 暂存和盘点是不需要处理的
- if (values.category === RecordCategory.inventory) {
- // values.category === RecordCategory.staging ||
- return;
- }
- const where = {};
- // 订单导入直接取值
- if (values.import && values.in_stock && values.out_stock) {
- where['in_stock_id'] = values.in_stock.id;
- where['out_stock_id'] = values.out_stock.id;
- } else {
- let out_stock, in_stock;
- if (values.record_category === RecordTypes.purchaseDirect || values.record_category === RecordTypes.rentDirect) {
- // 采购直发/租赁直发
- const inContract = values.in_contract;
- const contractProject = await this.db
- .getRepository('project')
- .findOne({ where: { id: inContract.project_id } });
- in_stock = contractProject.dataValues;
- if (values.record_category === RecordTypes.rentDirect) {
- const project = await this.db
- .getRepository('project')
- .findOne({ where: { id: values.out_contract.project_id } });
- out_stock = project.dataValues;
- } else {
- out_stock = values.out_stock;
- }
- } else if (
- values.record_category === RecordTypes.rentInStock ||
- values.record_category === RecordTypes.rentOutStock
- ) {
- if (!values.contract) return;
- const contract = values.contract;
- const contractProject = await this.db.getRepository('project').findOne({ where: { id: contract.project_id } });
- // 租赁出库/租赁入库，确定出入库
- // out_stock, in_stock
- // 租赁入库, out_stock = 合同中project_id, in_stock = 合同中项目的associated_company_id => 项目表id
- const associatedCompanyProject = await this.db
- .getRepository('project')
- .findOne({ where: { company_id: contractProject.associated_company_id, category: '1' } });
-
- if (values.record_category === RecordTypes.rentInStock) {
- out_stock = contractProject.dataValues;
- in_stock = associatedCompanyProject?.dataValues;
- } else {
- out_stock = associatedCompanyProject?.dataValues;
- in_stock = contractProject.dataValues;
- }
- } else if (
- values.record_category === RecordTypes.purchaseInStock ||
- values.record_category === RecordTypes.sellOutStock
- ) {
- out_stock = values.out_stock;
- const associatedCompanyProject = await this.db
- .getRepository('project')
- .findOne({ where: { company_id: out_stock.company_id } });
- in_stock = associatedCompanyProject;
- } else if (values.category === RecordCategory.staging) {
- in_stock = values.in_stock;
- out_stock = values.out_stock;
- }
- if (in_stock) {
- where['in_stock_id'] = in_stock.id;
- }
- if (out_stock) {
- where['out_stock_id'] = out_stock.id;
- }
- }
- await record.update(where, { transaction });
- if (where['in_stock_id'] && where['out_stock_id']) {
- // 设置完出库入，设置项目
- await this._updateRecordProjects(record, values, transaction, where);
- }
- }
- /**
- * 订单多对多项目hook赋值方法
- * @param model
- * @param values
- * @param transaction
- * @param where
- */
- async _updateRecordProjects(model, values, transaction, where) {
- if (
- values.category === RecordCategory.purchase2lease ||
- values.category === RecordCategory.lease2lease ||
- values.category === RecordCategory.staging
- ) {
- await this._deleteReocrdProject([model.id], transaction);
- await this.db.sequelize.query(
- `
- INSERT INTO record_projects (project_id, record_id)
- SELECT ${where.in_stock_id} AS project_id, ${model.id} AS record_id
- UNION ALL
- SELECT ${where.out_stock_id} AS project_id, ${model.id} AS project_id;
- `,
- { transaction },
- );
- } else {
- await this._deleteReocrdProject([model.id], transaction);
- await this.db.sequelize.query(
- `
- INSERT INTO record_projects (project_id, record_id)
- SELECT
- CASE WHEN movement = '1' THEN ${where.out_stock_id} ELSE ${where.in_stock_id} END AS project_id,
- id AS record_id
- FROM records
- WHERE records.id = ${model.id}
- `,
- { transaction },
- );
- }
- }
- /**
- * 订单发生变化时删除已经存在的多对多关系的表数据
- * @param id
- * @param transaction
- */
- async _deleteReocrdProject(id: number[], transaction: Transaction) {
- await this.db.getRepository('record_projects').destroy({
- transaction,
- filter: {
- record_id: {
- $eq: id,
- },
- },
- });
- }
-
/**
* 更新订单对应的结算表状态
*/
@@ -265,235 +60,176 @@ export class RecordService {
}
}
}
- if (values?.category === RecordCategory.purchase) {
- // 定价
- const rule = values.price_items;
- // 产品
- const products = values.items;
- // 分组实际总量
- const weight_items = values.group_weight_items;
- let allPrice = 0;
- for (const item of rule) {
- const data = await this._amountCalculation(item, products, weight_items, values.weight);
- allPrice += data;
- }
- const recordId = record.id;
- // 更新订单总金额字段
- await this.db.getModel('records').update(
- { all_price: allPrice },
- {
- where: {
- id: recordId,
- },
- transaction,
- },
- );
- }
}
-
/**
- * 根据产品数据计算金额
- * @param rule 单个规则
- * @param products 全部产品
- * @param weight_items 全部分组实际重量
- * @returns 单个规则产生的总金额
+ * 校验车牌号
*/
- private async _amountCalculation(rule, products, weight_items, recprdWeight) {
- const calc_products = products.filter(
- (product) => product.product.category_id === rule.product.id - 99999 || product.product.id === rule.product.id,
- );
- const categoryIds = calc_products.map((item) => item.product.category_id).filter(Boolean);
- const categoryIdsStr = categoryIds.join(',');
-
- const datas = await this.db.sequelize.query(`
- SELECT pc.*
- FROM product_category pc
- WHERE pc.id IN (${categoryIdsStr ? categoryIdsStr : 'null'});
- `);
- // 相关分类数据
- const categoryDatas = datas[0];
- if (!categoryDatas.length) return;
- if (rule.conversion_logic.id === ConversionLogics.Keep) {
- const allPrice = calc_products.reduce(
- (accumulator, currentValue) => accumulator + currentValue.count * rule.unit_price,
- 0,
- );
- return allPrice;
- } else if (rule.conversion_logic.id === ConversionLogics.Product) {
- const allPrice = calc_products.reduce((accumulator, currentValue) => {
- const category: any = categoryDatas.find((item: any) => currentValue.product.category_id === item.id);
- if (category.convertible) {
- return accumulator + currentValue.count * currentValue.product.ratio * rule.unit_price;
- } else {
- return accumulator + currentValue.count * rule.unit_price;
- }
- }, 0);
- return allPrice;
- } else if (rule.conversion_logic.id === ConversionLogics.ProductWeight) {
- const allPrice = calc_products.reduce(
- (accumulator, currentValue) => accumulator + currentValue.count * currentValue.product.weight * rule.unit_price,
- 0,
- );
- return allPrice / 1000;
- } else if (rule.conversion_logic.id === ConversionLogics.ActualWeight) {
- // 根据产品找分组实际重量
- const weightDate =
- weight_items.find((item) => item.products?.find((product) => product?.id === rule.product.id - 99999))
- ?.weight || recprdWeight;
- if (weightDate) {
- const allPrice = weightDate * rule.unit_price;
- return allPrice;
- } else {
- const allPrice = calc_products.reduce((accumulator, currentValue) => {
- const category: any = categoryDatas.find((item: any) => currentValue.product.category_id === item.id);
- if (category.convertible) {
- return accumulator + currentValue.count * currentValue.product.ratio * rule.unit_price;
- } else {
- return accumulator + currentValue.count * rule.unit_price;
+ async _checkPlateNumber(record: MagicAttributeModel, options: CreateOptions) {
+ const { transaction, context } = options;
+ if (record.dataValues?.vehicles) {
+ const ids = record.dataValues.vehicles.filter((item) => typeof item === 'number').join(',');
+ const vehicles = await this.db.sequelize.query(`select * from vehicles where id in (${ids})`, {
+ transaction,
+ });
+ if (vehicles[0].length) {
+ vehicles[0].forEach((item: any) => {
+ if (item.number) {
+ const validate = validateLicensePlate(item.number);
+ if (!validate) {
+ throw new Error('车牌号格式错误');
+ }
}
- }, 0);
- return allPrice;
+ });
}
- } else {
- const ids = calc_products
- .map((item) => item.product.category_id)
- .filter(Boolean)
- .join(',');
- const rules = this.db.sequelize.query(`
- select wr.*
- from weight_rules wr
- where wr.product_id IN (${ids}) and wr.logic_id = ${rule.conversion_logic.id}
- `);
- const weight_rules = rules[0];
- const allPrice = calc_products.reduce((accumulator, currentValue) => {
- const weight_rule: any = weight_rules?.find((item: any) => currentValue.product_id === item.id);
- const category: any = categoryDatas.find((item: any) => currentValue.product.category_id === item.id);
- if (category.convertible && weight_rule?.logic_id === ConversionLogics.Keep) {
- return accumulator + currentValue.count * currentValue.product.ratio * rule.unit_price;
- } else if (category.convertible && weight_rule?.logic_id === ConversionLogics.Product) {
- return accumulator + currentValue.count * currentValue.product.ratio * weight_rule.weight * rule.unit_price;
- } else if (!category.convertible && weight_rule?.logic_id === ConversionLogics.Keep) {
- return accumulator + currentValue.count * rule.unit_price;
- } else {
- return accumulator + currentValue.count * weight_rule?.weight * rule.unit_price;
- }
- }, 0);
- return allPrice || 0;
}
}
/**
- * 根据直发单创建对应出库订单
+ * 报价合同计算总金额
*/
- async _createRecord(model, values, transaction, context, numbers) {
- delete values.number;
- delete values.id;
- values.vehicles?.forEach((item) => delete item.record_vehicles);
- //采购直发单
- if (values.record_category === RecordTypes.purchaseDirect && values.category === RecordCategory.purchase2lease) {
- const inProject = await this.db.getModel('project').findOne({
- where: {
- id: values.in_contract.project_id,
- },
- });
- const base_project = await this.db.getModel('project').findOne({
- where: {
- company_id: inProject.associated_company_id, // 签约公司id
- category: '1',
- },
- });
- //1. 创建购销入库单
- const purchaseData = {
- ...values,
- direct_record_id: model.id,
- };
- purchaseData['record_category'] = RecordTypes.purchaseInStock;
- purchaseData['movement'] = Movement.in;
- purchaseData['category'] = RecordCategory.purchase;
- purchaseData['in_stock'] = base_project.dataValues;
- if (numbers?.[0]) {
- purchaseData['number'] = numbers[0];
+ async _calcAllPrice(record: MagicAttributeModel, options: CreateOptions) {
+ const { values } = options;
+ if (!values) return;
+ if (values.new_contracts.length) {
+ const contracts = values.new_contracts.map((item) => item.contract).find((i) => i.record_category === '1');
+ if (contracts && values.items.length) {
+ const leaseRule = await this.db.getRepository('contract_plan_lease_items').find({
+ where: {
+ contract_id: contracts.id,
+ },
+ appends: ['conversion_logic', 'conversion_logic.weight_items'],
+ });
+ const sql = `
+ WITH RECURSIVE tree1 AS (
+ SELECT id, "parentId"
+ FROM products
+ WHERE id = :dataId
+ UNION ALL
+ SELECT p.id, p."parentId"
+ FROM tree1 up
+ JOIN products p ON up."parentId" = p.id
+ )
+ select id
+ from tree1
+ `;
+ let allPrice = 0;
+ for (const item of values.items) {
+ const treeIds = await this.db.sequelize.query(sql, {
+ replacements: {
+ dataId: item.new_product.id,
+ },
+ type: QueryTypes.SELECT,
+ });
+ const rule = leaseRule.find((rule) => treeIds.find((i: any) => i.id === rule.new_products_id));
+ if (rule) {
+ const price = rule.unit_price || 0;
+ const count = item.count || 0;
+ if (rule.conversion_logic_id === ConversionLogics.Keep) {
+ allPrice += price * count;
+ } else if (
+ rule.conversion_logic_id === ConversionLogics.Product ||
+ rule.conversion_logic_id === ConversionLogics.ActualWeight
+ ) {
+ const ratio = item.new_product.parent?.convertible ? item.new_product.ratio : 1;
+ allPrice += price * count * ratio;
+ } else if (rule.conversion_logic_id === ConversionLogics.ProductWeight) {
+ allPrice += price * count * (item.new_product.weight || 0);
+ } else {
+ const weightRule = rule.conversion_logic.weight_items.find((weight) =>
+ treeIds.find((i: any) => i.id === weight.new_product_id),
+ );
+ if (weightRule.conversion_logic_id === ConversionLogics.Keep) {
+ allPrice += price * count * weightRule.weight;
+ } else if (weightRule.conversion_logic_id === ConversionLogics.Product) {
+ const ratio = item.new_product.parent?.convertible ? item.new_product.ratio : 1;
+ allPrice += price * count * ratio * weightRule.weight;
+ }
+ }
+ }
+ }
+ if (values.all_price !== allPrice) {
+ record.all_price = allPrice;
+ }
}
- purchaseData.items.forEach((element) => {
- delete element.record_id;
- delete element.id;
- });
- await this.db.getRepository('records').create({ values: purchaseData, transaction, context });
- // 2. 创建租赁出库单
- const leaseData = {
- ...values,
- direct_record_id: model.id,
- };
- leaseData['record_category'] = RecordTypes.rentOutStock;
- leaseData['movement'] = Movement.out;
- leaseData['category'] = RecordCategory.lease;
- leaseData['contract'] = values.in_contract;
- leaseData['out_stock'] = base_project.dataValues;
- leaseData['in_stock'] = inProject.dataValues;
- if (numbers?.[1]) {
- leaseData['number'] = numbers[1];
- }
- leaseData.items.forEach((element) => {
- delete element.record_id;
- delete element.id;
- });
- await this.db.getRepository('records').create({ values: leaseData, transaction, context });
}
- if (values.record_category === RecordTypes.rentDirect && values.category === RecordCategory.lease2lease) {
- // 1.创建租赁入库
- const leaseInData = {
- ...values,
- direct_record_id: model.id,
- };
- const outProject = await this.db.getModel('project').findOne({
+ }
+
+ /**
+ * 盘点单创建
+ */
+ async _createStock(record: MagicAttributeModel, options: CreateOptions) {
+ const { values, transaction, context } = options;
+ if (!values) return;
+ const record_contract = record.get('new_contracts').filter((item) => typeof item === 'object');
+ if (record_contract.length) {
+ const stockProduct = await this.db.getRepository('products').find({
where: {
- id: values.out_contract.project_id,
- },
- });
- const inProject = await this.db.getModel('project').findOne({
- where: {
- id: values.in_contract.project_id,
- },
- });
- const baseProject = await this.db.getModel('project').findOne({
- where: {
- company_id: inProject.associated_company_id, // 签约公司id
category: '1',
},
});
- leaseInData['record_category'] = RecordTypes.rentInStock;
- leaseInData['movement'] = Movement.in;
- leaseInData['category'] = RecordCategory.lease;
- leaseInData['contract'] = values.out_contract;
- leaseInData['out_stock'] = outProject.dataValues;
- leaseInData['in_stock'] = baseProject.dataValues;
- if (numbers?.[0]) {
- leaseInData['number'] = numbers[0];
+ const sql = `
+ WITH RECURSIVE tree1 AS (
+ SELECT id, "parentId"
+ FROM products
+ WHERE id = :dataId
+ UNION ALL
+ SELECT p.id, p."parentId"
+ FROM tree1 up
+ JOIN products p ON up."parentId" = p.id
+ )
+ select id
+ from tree1
+ `;
+ for (const i of record_contract) {
+ const item = i.dataValues;
+ const stock = {
+ record_contract_id: item.id,
+ items: [],
+ project_id: item.contract.dataValues.project_id,
+ };
+ const stockItems = await Promise.all(
+ item.fees.map(async (fee) => {
+ if (typeof fee !== 'object') return;
+ const treeIds = await this.db.sequelize.query(sql, {
+ replacements: {
+ dataId: fee.dataValues.new_fee_product.id,
+ },
+ type: QueryTypes.SELECT,
+ });
+ // 两数组ID，取并集
+ const isStockProduct = _.intersectionBy(stockProduct, treeIds, 'id');
+ if (isStockProduct.length > 0) {
+ // 这里一般是无关联产品的费用，有赔偿标记的类别为需要找对应的产品
+ // 这里需要平替找到对应的产品，目前没有这个分类的产品
+ const parent = await this.db.getRepository('products').find({
+ where: {
+ id: fee.dataValues.new_fee_product.parentId,
+ },
+ });
+ const fee_products = await this.db.getRepository('products').find({
+ where: {
+ name: fee.dataValues.new_fee_product.name,
+ },
+ appends: ['parent'],
+ });
+ const pro = fee_products.find((pro) => pro.parent?.name === parent.name);
+ return { new_product: pro || fee.dataValues.new_fee_product, count: fee.count };
+ } else {
+ if (fee.dataValues.new_product) {
+ return { new_product: fee.dataValues.new_product, count: fee.count };
+ }
+ }
+ }),
+ );
+ if (stockItems.filter(Boolean).length > 0) {
+ stock.items = stockItems;
+ await this.db.getRepository('record_stock').updateOrCreate({
+ filterKeys: ['record_contract_id'],
+ values: stock,
+ transaction,
+ });
+ }
}
- leaseInData.items.forEach((element) => {
- delete element.record_id;
- delete element.id;
- });
- await this.db.getRepository('records').create({ values: leaseInData, transaction, context });
- // 2.创建租赁出库单
- const leaseOutData = {
- ...values,
- direct_record_id: model.id,
- };
- leaseOutData['record_category'] = RecordTypes.rentOutStock;
- leaseOutData['movement'] = Movement.out;
- leaseOutData['category'] = RecordCategory.lease;
- leaseOutData['contract'] = values.in_contract;
- leaseOutData['out_stock'] = baseProject.dataValues;
- leaseOutData['in_stock'] = inProject.dataValues;
- if (numbers?.[1]) {
- leaseOutData['number'] = numbers[1];
- }
- leaseOutData.items.forEach((element) => {
- delete element.record_id;
- delete element.id;
- });
- await this.db.getRepository('records').create({ values: leaseOutData, transaction, context });
}
}
}
diff --git a/packages/plugins/@hera/plugin-rental/src/server/services/settlement-products-service.ts b/packages/plugins/@hera/plugin-rental/src/server/services/settlement-products-service.ts
new file mode 100644
index 000000000..e8cc48011
--- /dev/null
+++ b/packages/plugins/@hera/plugin-rental/src/server/services/settlement-products-service.ts
@@ -0,0 +1,598 @@
+import { Db, Service } from '@tachybase/utils';
+import Database from '@tachybase/database';
+import dayjs from 'dayjs';
+import {
+ AddItemsCategory,
+ CalcDateType,
+ ConversionLogics,
+ Itemcategory,
+ RulesNumber,
+ countCource,
+} from '../../utils/constants';
+import { converDate } from '../../utils/daysUtils';
+import { converUnitCount } from '../../utils/unitUtils';
+import { Settlement } from '../../interfaces/settlement';
+import { FeeRule, LeaseRule } from '../../interfaces/rule';
+import { Record } from '../../interfaces/record';
+import { RecordItems } from '../../interfaces/records';
+import { formatQuantity } from '../../utils/currencyUtils';
+
+@Service()
+export class SettlementProductsService {
+ @Db()
+ private db: Database;
+
+ async calculate(settlementAbout, settlementsId) {
+ /**
+ * 租金计算方式
+ * 0: 计头不计尾
+ * 1. 计尾不计头
+ * 2. 计头又计尾
+ * 3. 不计头不计尾
+ */
+ let createFeesDatas = [];
+ const record = []; //已有录入的订单
+ let createLeasDatas = [];
+ //计算正常租赁订单
+ settlementAbout.settlementLeaseData?.forEach((recordItem) => {
+ if (!recordItem) return;
+ const dateIsBefore = dayjs(recordItem.date).isBefore(settlementAbout.start_date);
+ const start_date = dateIsBefore ? settlementAbout.start_date : recordItem.date;
+ const movement = recordItem.movement === '-1' ? '1' : '-1';
+ const data = {
+ settlement_id: settlementsId, //合同ID
+ movement: recordItem.movement, //出入库状态
+ date: recordItem.date, //时间
+ name: recordItem.product_name,
+ label: recordItem.product_label,
+ category: '0', //费用类别
+ //租赁天数 历史订单就存开始日期到结束日期 当前订单存储订单日期到结束日期
+ unit_price: recordItem.unit_price,
+ days: afterDays(recordItem.calc_type, recordItem.movement, start_date, settlementAbout.end_date),
+ item_count: recordItem.product_count * Number(movement),
+ };
+ //3实际重量
+ if (recordItem.conversion_logic_id === ConversionLogics.ActualWeight) {
+ const productData = { ...data };
+ let weightName;
+ if (recordItem.belong_to_group_weight_name) {
+ weightName =
+ recordItem.belong_to_group_weight_name === recordItem.product_name
+ ? recordItem.product_label + '&&'
+ : `${recordItem.belong_to_group_weight_name}-` + `${recordItem.product_label}&&`;
+ } else {
+ weightName = recordItem.product_label + '&&';
+ }
+ productData['name'] = recordItem.belong_to_group_weight_name ?? recordItem.product_name;
+ productData['label'] = weightName;
+ productData['count'] = 0;
+ productData['amount'] = 0;
+ productData['unit_name'] = '吨';
+ createLeasDatas.push(productData);
+ if (recordItem.group_weight) {
+ const isRecord = record.find(
+ (item) =>
+ item.record_id === recordItem.record_id &&
+ item.belong_to_group_weight_id === recordItem.belong_to_group_weight_id,
+ );
+ if (isRecord) return;
+ record.push(recordItem);
+ data['count'] = recordItem.group_weight;
+ } else if (recordItem.record_weight) {
+ const isRecord = record.find((item) => item.record_id === recordItem.record_id);
+ if (isRecord) return;
+ record.push(recordItem);
+ data['count'] = recordItem.record_weight;
+ }
+ data['name'] = recordItem.belong_to_group_weight_name ?? recordItem.product_name;
+ data['label'] = recordItem.belong_to_group_weight_name ?? recordItem.product_name;
+ data['unit_price'] = data['unit_price'] * 1000;
+ data['item_count'] = 0;
+ data['unit_name'] = '吨';
+ } else {
+ const { count, unit } = calcItemCount(recordItem, recordItem.product_count);
+ data['count'] = count;
+ data['unit_name'] = unit;
+ }
+ data['count'] = data['count'] * Number(movement);
+ data['amount'] = data['count'] * recordItem.unit_price * data['days'];
+ createLeasDatas.push(data);
+ });
+
+ //计算有关联费用
+ settlementAbout.settlementFeeData?.forEach((feeItem) => {
+ if (!dayjs(feeItem.date).isBetween(settlementAbout.start_date, settlementAbout.end_date, 'day', '[]')) return;
+ const recordItem = settlementAbout.settlementLeaseData.find(
+ (item) => item.record_id === feeItem.number && item.product_id === feeItem.product_id,
+ );
+ if (!feeItem || !recordItem) return;
+ const data = {
+ settlement_id: settlementsId, //合同ID
+ movement: recordItem.movement, //出入库状态
+ date: recordItem.date, //时间
+ name: recordItem.product_name + '-' + feeItem.fee_product_label,
+ label: recordItem.product_label + '-' + feeItem.fee_product_label,
+ category: feeItem.fee_product_name, //费用类别
+ unit_price: feeItem.fee_price,
+ days: afterDays(recordItem.calc_type, recordItem.movement, feeItem.date, settlementAbout.end_date),
+ item_count: recordItem.product_count,
+ };
+ if (feeItem.conversion_logic_id === ConversionLogics.ActualWeight) {
+ if (!recordItem.group_weight && !recordItem.record_weight) return;
+ const itemCount = recordItem.group_weight || recordItem.record_weight;
+ if (feeItem.count_source === countCource.outProduct || feeItem.count_source === countCource.outItem) {
+ if (recordItem.movement === '1') return;
+ if (feeItem.count) {
+ data['count'] = feeItem.is_excluded ? itemCount - feeItem.count : itemCount;
+ }
+ } else if (
+ feeItem.count_source === countCource.enterProduct ||
+ feeItem.count_source === countCource.enterItem
+ ) {
+ if (recordItem.movement === '-1') return;
+ if (feeItem.count) {
+ data['count'] = feeItem.is_excluded ? itemCount - feeItem.count : itemCount;
+ }
+ } else {
+ return;
+ }
+ const { count, unit } = calcItemCount(recordItem, itemCount, feeItem);
+ let feeName = feeItem.belong_to_group_weight_name + '-' + recordItem.product_name;
+ let feeLabel = feeItem.belong_to_group_weight_name + '-' + recordItem.product_label;
+ if (feeItem.belong_to_group_weight_name === recordItem.product_name) feeName = recordItem.product_name;
+ feeLabel = recordItem.product_label;
+ data['count'] = count;
+ data['unit_name'] = unit;
+ data['name'] = feeName + '-' + feeItem.fee_product_label;
+ data['label'] = feeLabel + '-' + feeItem.fee_product_label;
+ } else {
+ //人工录入
+ if (
+ feeItem.count_source === countCource.artificial &&
+ feeItem.conversion_logic_id !== ConversionLogics.ActualWeight
+ ) {
+ if (!feeItem.count) return;
+ data['count'] = feeItem.count;
+ } //出库
+ else if (feeItem.count_source === countCource.outProduct || feeItem.count_source === countCource.outItem) {
+ if (recordItem.movement === '1') return;
+ } //入库
+ else if (feeItem.count_source === countCource.enterProduct || feeItem.count_source === countCource.enterItem) {
+ if (recordItem.movement === '-1') return;
+ } else {
+ return;
+ }
+ const { count, unit } = calcItemCount(recordItem, data['count'], feeItem);
+ data['count'] = count;
+ data['unit_name'] = unit;
+ }
+ data['amount'] = data['count'] * data['unit_price'] * data['days'];
+ createLeasDatas.push(data);
+ });
+
+ //计算无关联费用
+ settlementAbout.settlementFeeNoProductData?.forEach((nFeeItem) => {
+ const feeItem = [];
+ const is_excludedItems = [];
+ settlementAbout.settlementLeaseData.forEach((recordItem) => {
+ if (!dayjs(recordItem.date).isBetween(settlementAbout.start_date, settlementAbout.end_date, 'day', '[]'))
+ return;
+ const data = {
+ settlement_id: settlementsId, //合同ID
+ movement: nFeeItem.movement, //出入库状态
+ date: dayjs(recordItem.date).endOf('day'),
+ name: nFeeItem.fee_label,
+ label: nFeeItem.fee_label,
+ category: nFeeItem.fee_name, //费用类别
+ unit_price: nFeeItem.unit_price,
+ unit_name: nFeeItem.unit,
+ days: 0,
+ count: 0,
+ exist: false,
+ };
+ if (nFeeItem.conversion_logic_id > 4 && nFeeItem.weightRules) {
+ const weight_rules = nFeeItem.weightRules.find((value) => value.new_product_id === recordItem.product_id);
+ nFeeItem['weight_rules_weight'] = weight_rules?.weight;
+ nFeeItem['weight_rule_conversion_logic_id'] = weight_rules?.conversion_logic_id;
+ }
+ if (nFeeItem.conversion_logic_id === ConversionLogics.ActualWeight) {
+ if (
+ (!recordItem.record_weight && !recordItem.group_weight) ||
+ nFeeItem.count_source === countCource.artificial
+ )
+ return;
+ if (nFeeItem.count_source === countCource.outProduct || nFeeItem.count_source === countCource.outItem) {
+ if (recordItem.movement === '1') return;
+ data.movement = '-1';
+ } else if (
+ nFeeItem.count_source === countCource.enterProduct ||
+ nFeeItem.count_source === countCource.enterItem
+ ) {
+ if (recordItem.movement === '-1') return;
+ data.movement = '1';
+ }
+ if (recordItem.group_weight) {
+ const isRecord = feeItem.find(
+ (value) =>
+ value.record_number === recordItem.record_number &&
+ value.belong_to_group_weight_id === recordItem.belong_to_group_weight_id,
+ );
+ if (isRecord) return;
+ feeItem.push(recordItem);
+ data.count = recordItem.group_weight;
+ data.exist = true;
+ } else if (recordItem.record_weight) {
+ const isRecord = feeItem.find((value) => value.record_number === recordItem.record_number);
+ if (isRecord) return;
+ feeItem.push(recordItem);
+ data.count = recordItem.record_weight;
+ data.exist = true;
+ }
+ } else {
+ if (nFeeItem.count_source === countCource.artificial) {
+ const record = settlementAbout.settlementRecordFee.find(
+ (value) => value.number === recordItem.record_number && value.fee_product_id === nFeeItem.fee_product_id,
+ );
+ const isRecord = feeItem.find((value) => value.fee_product_id === record?.fee_product_id);
+ if (!record || isRecord) return;
+ feeItem.push(record);
+ data.count = record.count;
+ data.exist = true;
+ } else if (
+ nFeeItem.count_source === countCource.outProduct ||
+ nFeeItem.count_source === countCource.outItem
+ ) {
+ if (recordItem.movement === '1') return;
+ data.movement = '-1';
+ const { count } = calcItemCount(recordItem, recordItem.product_count, nFeeItem);
+ data.count = count;
+ data.exist = true;
+ } else if (
+ nFeeItem.count_source === countCource.enterProduct ||
+ nFeeItem.count_source === countCource.enterItem
+ ) {
+ if (recordItem.movement === '-1') return;
+ data.movement = '1';
+ const { count } = calcItemCount(recordItem, recordItem.product_count, nFeeItem);
+ data.count = count;
+ data.exist = true;
+ } else if (nFeeItem.count_source === countCource.product || nFeeItem.count_source === countCource.item) {
+ const { count } = calcItemCount(recordItem, recordItem.product_count, nFeeItem);
+ data.count = count;
+ data.exist = true;
+ }
+ }
+ if (nFeeItem.count_source !== countCource.artificial) {
+ const record = settlementAbout.settlementRecordFee?.find(
+ (value) => value.number === recordItem.record_number && value.fee_product_id === nFeeItem.fee_product_id,
+ );
+
+ const isRecord = is_excludedItems.find((value) => value.fee_product_id === record?.fee_product_id);
+ if (record && !isRecord) {
+ is_excludedItems.push(record);
+ data.count += record.is_excluded ? data.count - record.count : data.count;
+ }
+ }
+ if (
+ nFeeItem.count_source !== countCource.artificial &&
+ nFeeItem.conversion_logic_id !== ConversionLogics.ActualWeight
+ ) {
+ data.count = data.count / 1000;
+ }
+ if (data.exist) {
+ data['item_count'] = data.count;
+ data['amount'] = data.count * data.unit_price;
+ createFeesDatas.push(data);
+ }
+ });
+ });
+
+ createFeesDatas = createFeesDatas?.filter(Boolean);
+ createLeasDatas = createLeasDatas?.filter(Boolean);
+
+ const createCategoryDatasItem = screenData(createLeasDatas, settlementAbout, 'category');
+ const createProductDatasItem = screenData(createLeasDatas, settlementAbout, 'product');
+ const createCategoryFeeItem = screenData(createFeesDatas, settlementAbout, 'category');
+ const createProductFeeItem = screenData(createFeesDatas, settlementAbout, 'product');
+
+ //本期信息
+ const createDatas = [
+ ...createCategoryDatasItem.list,
+ ...createProductDatasItem.list,
+ ...createCategoryFeeItem.list,
+ ...createProductFeeItem.list,
+ ];
+ createDatas.sort((a, b) => {
+ return new Date(a.date).getTime() - new Date(b.date).getTime();
+ });
+ //筛选历史结存
+ createCategoryDatasItem.history = createCategoryDatasItem.history?.filter((value) => value.count);
+ createProductDatasItem.history = createProductDatasItem.history?.filter((value) => value.count);
+ //汇总项信息
+ const summaryCategoryItems = [];
+ for (const value in createCategoryDatasItem) {
+ createCategoryDatasItem[value].forEach((item) => {
+ if (!summaryCategoryItems.find((value) => value.name === item.name && item.category === '0')) {
+ summaryCategoryItems.push({
+ settlement_id: settlementsId,
+ name: item.name,
+ item_count: item.item_count,
+ count: item.count,
+ unit_name: item.unit_name,
+ type: 'category',
+ });
+ } else {
+ summaryCategoryItems.forEach((value) => {
+ if (value.name === item.name) {
+ value.count += item.count;
+ value.item_count += item.item_count;
+ }
+ });
+ }
+ });
+ }
+ const summaryProductItems = [];
+ for (const value in createProductDatasItem) {
+ createProductDatasItem[value].forEach((item) => {
+ if (!summaryProductItems.find((value) => value.name === item.name && item.category === '0')) {
+ summaryProductItems.push({
+ settlement_id: settlementsId,
+ name: item.name,
+ count: item.count,
+ unit_name: item.unit_name,
+ item_count: item.item_count,
+ type: 'product',
+ });
+ } else {
+ summaryProductItems.forEach((value) => {
+ if (value.name === item.name) {
+ value.count += item.count;
+ value.item_count += item.item_count;
+ }
+ });
+ }
+ });
+ }
+ const summaryItems = [...summaryCategoryItems, ...summaryProductItems];
+
+ //结算表信息
+ const summaryPeriod = {
+ rent: 0.0, //租金
+ maintenance: 0.0, //维修人工
+ n_compensate: 0.0, //无物赔偿
+ h_compensate: 0.0, //有物赔偿
+ loadfreight: 0.0, //装卸运费
+ current_expenses: 0.0, //本期费用
+ tax: 0.0, //税率
+ accumulate: 0.0, //累计费用
+ current_collection: 0.0, //本期收款
+ accumulate_collection: 0.0, //累计收款
+ status: '2',
+ };
+ // 结算表费用
+ createCategoryDatasItem.list.forEach((value) => {
+ switch (value.category) {
+ case Itemcategory.maintenance:
+ summaryPeriod.maintenance += value.amount;
+ break;
+ case Itemcategory.n_compensate:
+ summaryPeriod.n_compensate += value.amount;
+ break;
+ case Itemcategory.h_compensate:
+ summaryPeriod.h_compensate += value.amount;
+ break;
+ case Itemcategory.loadFreight:
+ summaryPeriod.loadfreight += value.amount;
+ break;
+ }
+ });
+ settlementAbout.settlementAddItems?.forEach((value) => {
+ switch (value.category) {
+ case AddItemsCategory.rent:
+ summaryPeriod.rent += value.amount;
+ break;
+ case AddItemsCategory.maintenance:
+ summaryPeriod.maintenance += value.amount;
+ break;
+ case AddItemsCategory.n_compensate:
+ summaryPeriod.n_compensate += value.amount;
+ break;
+ case AddItemsCategory.h_compensate:
+ summaryPeriod.h_compensate += value.amount;
+ break;
+ case AddItemsCategory.loadFreight:
+ summaryPeriod.loadfreight += value.amount;
+ break;
+ }
+ });
+ const tax_included = settlementAbout.settlementLeaseData[0]?.tax_included ?? 0;
+ const tax_rate = settlementAbout.settlementLeaseData[0]?.tax_rate ?? 0;
+ summaryPeriod.rent = createCategoryDatasItem.list.reduce((sum, curr) => sum + curr.amount, summaryPeriod.rent);
+ summaryPeriod.rent = createCategoryDatasItem.history.reduce((sum, curr) => sum + curr.amount, summaryPeriod.rent);
+ summaryPeriod.tax = tax_included ? 0 : tax_rate;
+ summaryPeriod.current_expenses =
+ (summaryPeriod.rent +
+ summaryPeriod.maintenance +
+ summaryPeriod.n_compensate +
+ summaryPeriod.h_compensate +
+ summaryPeriod.loadfreight) *
+ (summaryPeriod.tax + 1);
+ // const settlement = settlementAbout.settlements?.filter((value) =>
+ // dayjs(value.end_date).isBefore(settlementAbout.start_date),
+ // );
+
+ // summaryPeriod.accumulate = settlement.length
+ // ? settlement.reduce((sum, curr) => sum + curr.current_expenses, summaryPeriod.current_expenses)
+ // : summaryPeriod.current_expenses;
+ await this.db.sequelize.query(`delete from settlement_items where settlement_id=${settlementsId}`);
+ await this.db.sequelize.query(`delete from settlement_history_items where settlement_id=${settlementsId}`);
+ await this.db.sequelize.query(`delete from settlement_summary_items where settlement_id=${settlementsId}`);
+ //修改结算表数据
+ await this.db.getRepository('settlements').update({
+ values: summaryPeriod,
+ filter: {
+ id: settlementsId,
+ },
+ });
+ await this.db.getModel('settlement_items').bulkCreate(createDatas);
+ await this.db.getModel('settlement_history_items').bulkCreate(createCategoryDatasItem.history);
+ await this.db.getModel('settlement_history_items').bulkCreate(createProductDatasItem.history);
+ await this.db.getModel('settlement_summary_items').bulkCreate(summaryItems);
+ }
+}
+
+const calcItemCount = (recordItem, itemCount, feeItem?) => {
+ let count;
+ let unit;
+ const conversion_logic_id = feeItem ? feeItem.conversion_logic_id : recordItem.conversion_logic_id;
+ const weight_rules_conversion_logic_id = feeItem
+ ? feeItem.weight_rules_conversion_logic_id
+ : recordItem.weight_rules_conversion_logic_id;
+ const weight_rules_weight = feeItem ? feeItem.weight_rules_weight : recordItem.weight_rules_weight;
+ //1不换算
+ if (conversion_logic_id === ConversionLogics.Keep) {
+ count = itemCount;
+ unit = recordItem.product_unit;
+ } //2产品表换算
+ else if (conversion_logic_id === ConversionLogics.Product) {
+ count = recordItem.product_conbertible ? itemCount * recordItem.porduct_ratio : itemCount;
+ unit = recordItem.product_conbertible ? recordItem.product_convertible_unit : recordItem.product_unit;
+ } //4默认重量
+ else if (conversion_logic_id === ConversionLogics.ProductWeight) {
+ count = itemCount * recordItem.product_weight ?? 0;
+ } //重量表
+ else {
+ if (weight_rules_conversion_logic_id === ConversionLogics.Product) {
+ count = itemCount * weight_rules_weight ?? 0 * recordItem.porduct_ratio;
+ } else if (weight_rules_conversion_logic_id === ConversionLogics.Keep) {
+ count = itemCount * weight_rules_weight ?? 0;
+ } else {
+ count = 0;
+ }
+ unit = recordItem.product_conbertible ? recordItem.product_convertible_unit : recordItem.product_unit;
+ }
+ return { count, unit };
+};
+
+// 结存时间
+/**
+ * 租金天数计算
+ * @param { calc_type, movement, date } 租金计算方式，出入库，订单日期
+ * 2：计头计尾：出库多加一天
+ * 3：不计头不计尾：入库多加一天
+ * 0：计头不计尾：出入库都加一天
+ * 其他情况正常计算天数
+ * 1：计尾不计头：正常计算天数
+ * @returns days 根据租金计算方式返回租借天数
+ */
+const afterDays = (calc_type, movement, start, end) => {
+ const l = dayjs(end).startOf('day');
+ const r = dayjs(start).startOf('day');
+ let ofterDays = l.diff(r, 'day');
+ switch (calc_type) {
+ case CalcDateType.countHeads:
+ ofterDays += 1;
+ break;
+ case CalcDateType.countTails:
+ break;
+ case CalcDateType.countHT:
+ if (movement === '-1') {
+ ofterDays += 1;
+ }
+ break;
+ case CalcDateType.withoutHT:
+ if (movement === '1') {
+ ofterDays += 1;
+ }
+ break;
+ }
+ return ofterDays;
+};
+
+const formatNumber = (count) => {
+ const c = formatQuantity(count, 5);
+ return parseFloat(c.replace(/,/g, ''));
+};
+
+/**
+ * 筛选租赁信息处理条件
+ * @param data 当前需要处理的订单
+ * @param settlementAbout 合同中统计的信息
+ * @returns screenDatas 一个对象中包含了历史订单和当期订单
+ */
+const screenData = (data, settlementAbout, type) => {
+ const history = {};
+ const list = {};
+ const screenDatas = {
+ history: [],
+ list: [],
+ };
+ data.forEach((value) => {
+ let name = value.name;
+ let listKey = `${name}_${value.movement}_${converDate(value.date, 'YYYY-MM-DD')}`;
+ let historyKey = `${name}`;
+ switch (type) {
+ case 'category':
+ listKey = `${name}_${value.movement}_${converDate(value.date, 'YYYY-MM-DD')}`;
+ historyKey = `${name}`;
+ value.item_count = 0;
+ break;
+ case 'product':
+ listKey = `${value.label}_${value.movement}_${converDate(value.date, 'YYYY-MM-DD')}`;
+ historyKey = `${value.label}`;
+ name = value.label;
+ break;
+ }
+ if (dayjs(value.date).isBefore(settlementAbout.start_date)) {
+ if (!history[historyKey]) {
+ history[historyKey] = {
+ settlement_id: value.settlement_id,
+ amount: value.amount,
+ category: value.category,
+ count: value.count,
+ days: afterDays(data.calc_type, value.movement, settlementAbout.start_date, settlementAbout.end_date),
+ name: name,
+ unit_name: value.unit_name,
+ unit_price: value.unit_price,
+ item_count: value.item_count,
+ is_excluded: value.is_excluded,
+ type: type,
+ };
+ } else {
+ history[historyKey].count = formatNumber(history[historyKey].count) + formatNumber(value.count);
+ history[historyKey].amount = formatNumber(history[historyKey].amount) + formatNumber(value.amount);
+ history[historyKey].unit_price =
+ history[historyKey].amount / history[historyKey].count / history[historyKey].days;
+ history[historyKey].item_count = formatNumber(history[historyKey].item_count) + formatNumber(value.item_count);
+ }
+ } else {
+ if (!list[listKey]) {
+ list[listKey] = {
+ settlement_id: value.settlement_id,
+ movement: value.movement,
+ date: value.date,
+ amount: value.amount,
+ category: value.category,
+ count: value.count,
+ days: value.days || 0,
+ name: name,
+ unit_name: value.unit_name,
+ item_count: value.item_count,
+ unit_price: value.unit_price,
+ is_excluded: value.is_excluded,
+ type: type,
+ };
+ } else {
+ list[listKey].count = formatNumber(list[listKey].count) + formatNumber(value.count);
+ list[listKey].amount = formatNumber(list[listKey].amount) + formatNumber(value.amount);
+ list[listKey].unit_price = isNaN(list[listKey].amount / list[listKey].count / list[listKey].days)
+ ? 0
+ : list[listKey].amount / list[listKey].count / list[listKey].days;
+ list[listKey].item_count = formatNumber(list[listKey].item_count) + formatNumber(value.item_count);
+ }
+ }
+ });
+ screenDatas['history'].push(...Object.values(history));
+ screenDatas['list'].push(...Object.values(list));
+ return screenDatas;
+};
diff --git a/packages/plugins/@hera/plugin-rental/src/server/services/settlement-service.ts b/packages/plugins/@hera/plugin-rental/src/server/services/settlement-service.ts
index 7415a08ac..524e14c3d 100644
--- a/packages/plugins/@hera/plugin-rental/src/server/services/settlement-service.ts
+++ b/packages/plugins/@hera/plugin-rental/src/server/services/settlement-service.ts
@@ -1,5 +1,5 @@
-import { Db, Service } from '@nocobase/utils';
-import Database from '@nocobase/database';
+import { Db, Service } from '@tachybase/utils';
+import Database from '@tachybase/database';
import dayjs from 'dayjs';
import {
AddItemsCategory,
@@ -887,8 +887,8 @@ export class SettlementService {
});
calc.list.forEach((value) => {
const productDate = converDate(value.date, 'YYYY-MM-DD');
- if ((value.name as string).includes('-')) {
- const name = value.name.split('-')[0];
+ if ((value.name as string)?.includes('-')) {
+ const name = value.name?.split('-')[0];
const valueItem = calc.list.filter(
(item) => converDate(item.date, 'YYYY-MM-DD') === productDate && item.name === name,
)[0];
@@ -896,8 +896,8 @@ export class SettlementService {
value.date = dayjs(valueItem.date).add(1, 'seconds');
}
}
- if (value.name.includes('$$')) {
- value.name = value.name.replace('$$', '');
+ if (value.name?.includes('&&')) {
+ value.name = value.name.replace('&&', '');
}
});
calc.list?.sort((a, b) => {
diff --git a/packages/plugins/@hera/plugin-rental/src/server/services/vehicles-service.ts b/packages/plugins/@hera/plugin-rental/src/server/services/vehicles-service.ts
index 5c5e8b5dd..91a4d6c63 100644
--- a/packages/plugins/@hera/plugin-rental/src/server/services/vehicles-service.ts
+++ b/packages/plugins/@hera/plugin-rental/src/server/services/vehicles-service.ts
@@ -1,5 +1,5 @@
-import Database, { CreateOptions, MagicAttributeModel } from '@nocobase/database';
-import { Db, Service } from '@nocobase/utils';
+import Database, { CreateOptions, MagicAttributeModel } from '@tachybase/database';
+import { Db, Service } from '@tachybase/utils';
import validateLicensePlate from '../../utils/validateLIcensePlate';
@Service()
diff --git a/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record.sql b/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record.sql
deleted file mode 100644
index 891ce6a5b..000000000
--- a/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record.sql
+++ /dev/null
@@ -1,120 +0,0 @@
-SELECT
- r.*,
- -- ================================出入库信息================================
- (
- SELECT
- TO_JSONB(
- JSONB_SET(
- TO_JSONB(project),
- '{associated_company}',
- COALESCE(TO_JSONB(c2), '{}'::jsonb)
- )
- )
- FROM
- project
- LEFT JOIN company c2 ON project.associated_company_id = c2.id
- WHERE
- project.id = r.out_stock_id
- ) AS out_stock,
- -- 查订单入库方
- (
- SELECT
- TO_JSONB(
- JSONB_SET(
- TO_JSONB(project),
- '{associated_company}',
- COALESCE(TO_JSONB(c), '{}'::jsonb)
- )
- )
- FROM
- project
- LEFT JOIN company c ON project.associated_company_id = c.id
- WHERE
- project.id = r.in_stock_id
- ) AS in_stock,
- TO_JSONB(
- -- 项目/客户数据（只有租赁才有此项目，其他项目就是出入库数据）
- JSONB_SET(
- TO_JSONB(c),
- '{project}',
- (
- SELECT
- COALESCE(
- TO_JSONB(
- JSONB_SET(
- TO_JSONB(p3),
- '{associated_company}',
- CASE
- WHEN p3.associated_company_id IS NOT NULL THEN (
- SELECT
- COALESCE(TO_JSONB(c), '{}'::jsonb)
- FROM
- company c
- WHERE
- p3.associated_company_id = c.id
- )
- ELSE '{}'::jsonb
- END
- ) || JSONB_SET(
- TO_JSONB(p3),
- '{company}',
- (
- SELECT
- TO_JSONB(c)
- FROM
- company c
- WHERE
- p3.company_id = c.id
- )
- ) || JSONB_SET(
- TO_JSONB(p3),
- '{contacts}',
- (
- SELECT
- COALESCE(JSONB_AGG(c), '[]'::jsonb)
- FROM
- project_contacts pc
- JOIN contacts c ON pc.contact_id = c.id
- WHERE
- p3.id = pc.project_id
- )
- )
- ),
- '{}'::jsonb
- )
- FROM
- project p3
- WHERE
- c.project_id = p3.id
- )
- )
- ) AS contract,
- -- ==========================================车号==========================================
- (
- SELECT
- COALESCE(JSONB_AGG(v), '[]'::jsonb)
- FROM
- record_vehicles rv
- JOIN vehicles v ON rv.vehicle_id = v.id
- WHERE
- r.id = rv.record_id
- ) AS vehicles,
- -- 查询分组实际重量
- (
- SELECT
- JSONB_AGG(
- JSONB_SET(TO_JSONB(rgwi), '{category}', TO_JSONB(pc))
- )
- FROM
- record_group_weight_items rgwi
- JOIN record_group_weight_items_products rgwip ON rgwip.item_id = rgwi.id
- JOIN product_category pc ON rgwip.product_category_id = pc.id
- WHERE
- rgwi.record_id = r.id
- ) AS record_group_weight_items
-FROM
- records r
- -- 合同数据（租赁有合同）
- LEFT JOIN contracts c ON r.contract_id = c.id
-WHERE
- r.id = :recordId
diff --git a/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_fee.sql b/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_fee.sql
deleted file mode 100644
index 182d570a1..000000000
--- a/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_fee.sql
+++ /dev/null
@@ -1,122 +0,0 @@
-SELECT
- r.movement AS record_movement,
- r.weight AS record_weight,
- NULL AS actual_weight,
- NULL AS product_id,
- NULL AS product_count,
- NULL AS fee_count,
- NULL AS is_excluded,
- cpfi.fee_product_id,
- p.*,
- p.weight AS product_weight,
- NULL AS product_ratio,
- NULL AS convertible,
- NULL AS product_category_id,
- cpfi.unit_price,
- cpfi.conversion_logic_id,
- cpfi.unit,
- cpfi.count_source,
- cpfi."comment",
- cpfi.id,
- (
- SELECT
- JSONB_AGG(wr)
- FROM
- weight_rules wr
- WHERE
- wr.logic_id = cpfi.conversion_logic_id
- ) AS weight_rules
-FROM
- records r
- LEFT JOIN contracts c ON r.contract_id = c.id
- LEFT JOIN contract_items ci ON c.id = ci.contract_id
- AND ci.start_date <= r.date
- AND ci.end_date >= r."date"
- LEFT JOIN contract_plans cp ON ci.contract_plan_id = cp.id
- LEFT JOIN contract_plan_fee_items cpfi ON cp.id = cpfi.contract_plan_id --有lease_item_id证明是关联产品的费用
- JOIN product p ON p.id = cpfi.fee_product_id
- LEFT JOIN product_category pc3 ON p.category_id = pc3.id
- JOIN product_category pc ON pc.id = p.category_id
- JOIN unit_conversion_logics ucl ON ucl.id = cpfi.conversion_logic_id
-WHERE
- r.id = :recordId
-GROUP BY
- cpfi.id,
- p.id,
- r.id
-UNION
-SELECT
- r2.movement AS record_movement,
- r2.weight AS record_weight,
- rwi.weight AS actual_weight,
- ri.product_id,
- ri.count AS product_count,
- rifi.count AS fee_count,
- rifi.is_excluded AS is_excluded, -- 不计入合同
- cpfi2.fee_product_id,
- p1.*,
- p2.weight AS product_weight,
- p2.ratio AS product_ratio,
- pc2.convertible AS convertible,
- pc2.id AS product_category_id,
- cpfi2.unit_price,
- cpfi2.conversion_logic_id,
- cpfi2.unit,
- cpfi2.count_source,
- cpfi2."comment",
- cpfi2.id,
- (
- SELECT
- TO_JSONB(wr)
- FROM
- weight_rules wr
- WHERE
- ucl2.id > 4
- AND wr.logic_id = ucl2.id
- AND wr.product_id = ri.product_id
- LIMIT
- 1
- ) AS weight_rules
-FROM
- records r2
- LEFT JOIN contracts c2 ON r2.contract_id = c2.id
- LEFT JOIN contract_items ci2 ON c2.id = ci2.contract_id
- AND ci2.start_date <= r2.date
- AND ci2.end_date >= r2."date"
- LEFT JOIN contract_plans cp2 ON ci2.contract_plan_id = cp2.id
- LEFT JOIN contract_plan_lease_items cpli ON cp2.id = cpli.contract_plan_id -- 查租金
- JOIN contract_plan_lease_items_products cplip ON cplip.lease_item_id = cpli.id -- 查租金产品
- JOIN contract_plan_fee_items cpfi2 ON cpfi2.lease_item_id = cpli.id
- AND cpfi2.count_source = '0' -- 查费用
- JOIN unit_conversion_logics ucl2 ON ucl2.id = cpfi2.conversion_logic_id -- 查计算规则
- JOIN record_items ri ON ri.record_id = r2.id
- AND (
- ri.product_id = cplip.product_id
- OR (
- SELECT
- p.category_id
- FROM
- product p
- WHERE
- p.id = ri.product_id
- ) = cplip.product_id - 99999
- )
- LEFT JOIN (
- SELECT
- record_group_weight_items.id,
- COMMENT,
- weight,
- record_id,
- product_category_id
- FROM
- record_group_weight_items
- JOIN record_group_weight_items_products ON record_group_weight_items.id = record_group_weight_items_products.item_id
- ) rwi ON r2.id = rwi.record_id
- AND rwi.product_category_id = ri.product_id
- LEFT JOIN record_item_fee_items rifi ON ri.id = rifi.record_item_id
- AND rifi.product_id = cpfi2.fee_product_id
- JOIN product p1 ON p1.id = cpfi2.fee_product_id
- LEFT JOIN product p2 ON ri.product_id = p2.id
- LEFT JOIN product_category pc2 ON p2.category_id = pc2.id
-WHERE
- r2.id = :recordId
diff --git a/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_lease.sql b/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_lease.sql
deleted file mode 100644
index 8a92a97fc..000000000
--- a/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_lease.sql
+++ /dev/null
@@ -1,112 +0,0 @@
--- 租金
--- distinct说明：sql根据订单中产品去合同规则中找规则，如果合同存在单个产品多条规则，会连接查询出多条规则，所以需要distinct
--- 直接disinct掉，不会有任何影响，因为查询数据只关注点单产品数量，根换算逻辑，正好多条规则换算逻辑是一样的
-SELECT DISTINCT
- r.category,
- ri.comment AS item_comment,
- ri.count,
- ri.product_id,
- p.label,
- p.ratio,
- p.weight,
- p.category_id,
- pc.name AS product_category_name,
- pc.unit,
- pc.convertible,
- pc.conversion_unit,
- lr.unit_price AS price_price,
- vp."label" AS price_label,
- lr."comment" AS price_comment,
- rwi.product_category_id,
- CASE
- WHEN r.category = '0' THEN cpli.conversion_logic_id
- ELSE lr.conversion_logic_id
- END AS conversion_logic_id,
- CASE
- WHEN ucl.id > 4
- AND c.id IS NOT NULL THEN (
- SELECT
- TO_JSONB(wr)
- FROM
- weight_rules wr
- WHERE
- ucl.id = wr.logic_id
- AND (
- wr.product_id = p.id
- OR wr.product_id = pc.id + 99999
- )
- )
- WHEN lr.conversion_logic_id > 4
- AND c.id IS NULL THEN (
- SELECT
- TO_JSONB(wr2)
- FROM
- weight_rules wr2
- WHERE
- lr.conversion_logic_id = wr2.logic_id
- AND (
- wr2.product_id = p.id
- OR wr2.product_id = pc.id + 99999
- )
- )
- END AS wr
-FROM
- records r
- LEFT JOIN record_items ri ON r.id = ri.record_id
- LEFT JOIN product p ON ri.product_id = p.id
- LEFT JOIN product_category pc ON p.category_id = pc.id
- ---- 租赁找合同规则
- LEFT JOIN contracts c ON r.contract_id = c.id
- LEFT JOIN contract_items ci ON c.id = ci.contract_id
- AND ci.start_date <= r.date
- AND ci.end_date >= r."date"
- LEFT JOIN contract_plans cp ON ci.contract_plan_id = cp.id
- LEFT JOIN contract_plan_lease_items cpli ON cp.id = cpli.contract_plan_id
- LEFT JOIN unit_conversion_logics ucl ON cpli.conversion_logic_id = ucl.id
- AND cpli.conversion_logic_id > 4
- ------ 购销找租金定价
- LEFT JOIN lease_rules lr ON r.id = lr.record_id
- AND (
- lr.product_id = p.id
- OR lr.product_id = pc.id + 99999
- )
- LEFT JOIN view_products vp ON vp.id = lr.product_id
- LEFT JOIN (
- SELECT
- record_group_weight_items.id,
- COMMENT,
- weight,
- record_id,
- product_category_id
- FROM
- record_group_weight_items
- JOIN record_group_weight_items_products ON record_group_weight_items.id = record_group_weight_items_products.item_id
- ) rwi ON r.id = rwi.record_id
- AND rwi.product_category_id = pc.id
-WHERE
- r.id = :recordId
- AND (
- CASE
- WHEN c.id IS NOT NULL THEN (
- ri.product_id = (
- SELECT
- cplip.product_id
- FROM
- contract_plan_lease_items_products cplip
- WHERE
- cplip.lease_item_id = cpli.id
- AND cplip.product_id = p.id
- )
- OR pc.id + 99999 = (
- SELECT
- cplip.product_id
- FROM
- contract_plan_lease_items_products cplip
- WHERE
- cplip.lease_item_id = cpli.id
- AND cplip.product_id - 99999 = pc.id
- )
- )
- ELSE TRUE
- END
- )
diff --git a/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_no_porduct_fees.sql b/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_no_porduct_fees.sql
new file mode 100644
index 000000000..26aed2ae4
--- /dev/null
+++ b/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_no_porduct_fees.sql
@@ -0,0 +1,59 @@
+SELECT
+ p.weight,
+ p.ratio,
+ p2.convertible,
+ p2.unit,
+ p2.conversion_unit,
+ p2.name || '[' || p.name || ']' AS NAME,
+ p.custom_name,
+ cpfi.unit_price,
+ cpfi.conversion_logic_id,
+ cpfi.unit,
+ cpfi.count_source,
+ cpfi.new_fee_products_id AS fee_products_id,
+ rfin.count, -- 无关联手工录入数量
+ rfin.is_excluded,
+ wr2.weight AS wr_weight, --人工录入数量重量规则
+ wr2.conversion_logic_id AS wr_logic_id,
+ COALESCE(JSONB_AGG(wr), '[]'::jsonb) AS weight_rules -- 出库入库量的重量规则表
+FROM
+ contracts c
+ JOIN records r ON r.id = :recordId
+ JOIN contract_items ci ON c.id = ci.contract_id
+ AND ci.start_date <= r."date"
+ AND ci.end_date >= r."date"
+ JOIN contract_plans cp ON cp.id = ci.contract_plan_id
+ JOIN contract_plan_fee_items cpfi ON cpfi.contract_plan_id = cp.id
+ JOIN products p ON p.id = cpfi.new_fee_products_id
+ LEFT JOIN products p2 ON p."parentId" = p2.id
+ JOIN record_contract rc ON rc.record_id = r.id
+ AND rc.contract_id = c.id
+ JOIN record_fee_items_new rfin ON rfin.record_contract_id = rc.id
+ AND rfin.new_fee_product_id = cpfi.new_fee_products_id
+ AND cpfi.count_source = '0'
+ LEFT JOIN weight_rules wr ON cpfi.conversion_logic_id = wr.logic_id
+ AND cpfi.count_source != '0'
+ AND cpfi.conversion_logic_id > 4
+ LEFT JOIN weight_rules wr2 ON cpfi.conversion_logic_id = wr.logic_id
+ AND cpfi.new_fee_products_id = wr2.new_product_id
+ AND cpfi.count_source = '0'
+WHERE
+ c.id = :contractId
+GROUP BY --jsonb_agg需要分组
+ cpfi.unit_price,
+ cpfi.conversion_logic_id,
+ cpfi.unit,
+ cpfi.count_source,
+ cpfi.new_fee_products_id,
+ rfin.count,
+ p.weight,
+ p.ratio,
+ p2.convertible,
+ p2.unit,
+ p2.conversion_unit,
+ p.name,
+ p2.name,
+ p.custom_name,
+ wr2.weight,
+ wr2.conversion_logic_id,
+ rfin.is_excluded
diff --git a/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_product_fee_item.sql b/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_product_fee_item.sql
new file mode 100644
index 000000000..514118825
--- /dev/null
+++ b/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_product_fee_item.sql
@@ -0,0 +1,39 @@
+SELECT
+ ri.count,
+ rfin.count AS fee_count,
+ rfin.new_product_id AS products_id,
+ rfin.new_fee_product_id AS fee_product_id,
+ p2."name" || '[' || p."name" || ']' AS fee_product,
+ p.custom_name AS fee_custom_name,
+ p4.convertible AS fee_convertible,
+ p4.unit AS fee_unit,
+ p4.conversion_unit AS fee_conversion_unit,
+ p3.weight AS fee_weight,
+ p3.ratio AS fee_ratio,
+ rfin.is_excluded,
+ rfin."comment",
+ cpfi.count_source,
+ cpfi.conversion_logic_id,
+ cpfi.unit AS fee_rule_unit,
+ cpfi.unit_price
+FROM
+ record_contract rc
+ JOIN records r ON r.id = rc.record_id
+ JOIN contract_items ci ON ci.contract_id = rc.contract_id
+ AND ci.start_date <= r."date"
+ AND ci.end_date >= r."date"
+ JOIN contract_plans cp ON cp.id = ci.contract_plan_id
+ JOIN contract_plan_lease_items cpli ON cpli.contract_plan_id = cp.id
+ JOIN view_products_search_rule_special vpsrs ON cpli.new_products_id = ANY (vpsrs.parents)
+ JOIN record_fee_items_new rfin ON rfin.record_contract_id = rc.id
+ AND rfin.new_product_id = vpsrs.id
+ JOIN products p ON p.id = rfin.new_fee_product_id
+ LEFT JOIN products p2 ON p."parentId" = p2.id
+ JOIN contract_plan_fee_items cpfi ON cpfi.lease_item_id = cpli.id
+ AND cpfi.new_fee_products_id = rfin.new_fee_product_id
+ JOIN record_items ri ON ri.record_id = r.id
+ AND ri.new_product_id = vpsrs.id
+ JOIN products p3 ON p3.id = ri.new_product_id
+ LEFT JOIN products p4 ON p3."parentId" = p4.id
+WHERE
+ rc.id = :intermediateId
diff --git a/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_product_item.sql b/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_product_item.sql
new file mode 100644
index 000000000..b173939f3
--- /dev/null
+++ b/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_record_product_item.sql
@@ -0,0 +1,42 @@
+SELECT
+ r."date",
+ p.id AS products_id,
+ p2.id AS "parentId",
+ p2.name AS "parentName",
+ p2.name || '[' || p.name || ']' AS "name",
+ p2.unit,
+ p2.convertible,
+ p2.conversion_unit,
+ p.weight AS products_weight,
+ p.ratio AS products_ratio,
+ cpli.conversion_logic_id,
+ ri.count,
+ ri.comment,
+ wr.conversion_logic_id AS wr_logic_id,
+ wr.weight AS wr_weight,
+ cpli.unit_price
+FROM
+ records r
+ JOIN contracts c ON c.id = :contractId
+ LEFT JOIN contract_items ci ON c.id = ci.contract_id
+ AND ci.start_date <= r."date"
+ AND ci.end_date >= r."date"
+ LEFT JOIN contract_plans cp ON cp.id = ci.contract_plan_id
+ JOIN contract_plan_lease_items cpli ON (
+ cpli.contract_plan_id = cp.id
+ AND c.effectiveness = '0'
+ )
+ OR (
+ cpli.contract_id = c.id
+ AND c.effectiveness = '1'
+ )
+ JOIN view_products_search_rule_special vpsrs ON cpli.new_products_id = ANY (vpsrs.parents)
+ JOIN record_items ri ON ri.record_id = r.id
+ AND ri.new_product_id = vpsrs.id
+ JOIN products p ON p.id = ri.new_product_id
+ LEFT JOIN products p2 ON p."parentId" = p2.id
+ LEFT JOIN weight_rules wr ON cpli.conversion_logic_id = wr.logic_id
+ AND cpli.conversion_logic_id > 4
+ AND wr.new_product_id = ri.new_product_id
+WHERE
+ r.id = :recordId
diff --git a/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_waybills.sql b/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_waybills.sql
index d29f275bf..d5c9329d5 100644
--- a/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_waybills.sql
+++ b/packages/plugins/@hera/plugin-rental/src/server/sqls/pdf_waybills.sql
@@ -1,114 +1,64 @@
SELECT
+ r.number record_number,
+ w.arrival_date, -- 到货日期
+ w.off_date, -- 承运日期
+ w.weight_or_amount, -- 吨/趟
+ w.unit_price, -- 单价
+ w.additional_cost, -- 附加金额
+ w.pay_date, -- 付款日期
+ w.comment,
+ p."name" AS payer_name, -- 付款方
+ c."name" AS payer_company, -- 付款方公司
+ a."name" AS payee_account_name, -- 收款账户
+ a."number" AS payee_account_number, -- 收款账户
+ a.bank AS payee_account_bank, -- 收款名称
+ p2.address AS shipper_address, -- 发货方
+ p2."name" AS shipper_name, -- 发货方单位
+ c3.name AS shipper_company, -- 发货方单位
+ c4."name" AS shipper_contact, -- 发货方联系人
+ c4.phone AS shipper_contact_phone, -- 发货方联系人
+ c2."name" AS consignee_contact, -- 收款人
+ p3.name AS consignee_name, -- 收货方单位
+ p3.address AS consignee_address,
+ c5."name" AS consignee_company, -- 收货方单位
+ c6."name" AS consignee_contact, -- 收货人
+ c6.phone AS consignee_contact_phone,
+ c7.name AS carrier, -- 承运商
+ c8.name AS driver, -- 驾驶员
+ c8.phone AS driver_phone,
+ c8.id_card AS driver_idcard, --驾驶员
+ (
+ SELECT
+ STRING_AGG(v.number::TEXT, ', ')
+ FROM
+ record_vehicles rv
+ JOIN vehicles v ON rv.vehicle_id = v.id
+ WHERE
+ r.id = rv.record_id
+ ) AS vehicles,
(
SELECT
waybills_explain
FROM
basic_configuration
- ) side_information,
- w.*,
- TO_JSONB(
- JSONB_SET(
- TO_JSONB(payer),
- '{company}',
- (
- SELECT
- TO_JSONB(c2)
- FROM
- company c2
- WHERE
- payer.company_id = c2.id
- )
- )
- ) AS payer, -- 付款方， 查公司company_id
- TO_JSONB(payee_account) AS payee_account, -- 收款方账号
- TO_JSONB(shipper_contact) AS shipper_contact, -- 发货方联系人
- TO_JSONB(consignee_contact) AS consignee_contact, -- 收货方联系人
- TO_JSONB(carrier) AS carrier, -- 承运商
- TO_JSONB(driver) AS driver, --司机
- TO_JSONB(
- JSONB_SET(
- TO_JSONB(in_stock),
- '{company}',
- (
- SELECT
- TO_JSONB(c)
- FROM
- company c
- WHERE
- in_stock.company_id = c.id
- )
- )
- ) AS in_stock,
- TO_JSONB(
- JSONB_SET(
- TO_JSONB(out_stock),
- '{company}',
- (
- SELECT
- TO_JSONB(c)
- FROM
- company c
- WHERE
- out_stock.company_id = c.id
- )
- )
- ) AS out_stock,
- TO_JSONB(records.*) || JSONB_BUILD_OBJECT(
- 'items',
- (
- SELECT
- JSONB_AGG(
- TO_JSONB(record_items) || JSONB_BUILD_OBJECT(
- 'product',
- TO_JSONB(product.*) || JSONB_BUILD_OBJECT('category', TO_JSONB(product_category.*))
- )
- )
- FROM
- record_items
- LEFT JOIN product ON record_items.product_id = product.id
- LEFT JOIN product_category ON product.category_id = product_category.id
- WHERE
- records.id = record_items.record_id
- ),
- 'vehicles',
- (
- SELECT
- COALESCE(JSONB_AGG(v), '[]'::jsonb)
- FROM
- record_vehicles rv
- JOIN vehicles v ON rv.vehicle_id = v.id
- WHERE
- records.id = rv.record_id
- )
- ) AS record
+ ) side_information
FROM
waybills w
- LEFT JOIN
- -- 付款方
- project payer ON w.payer_id = payer.id
- LEFT JOIN
- -- 收款方账户
- account payee_account ON w.payee_account_id = payee_account.id
- LEFT JOIN
- -- 发货方联系人
- contacts shipper_contact ON w.shipper_contact_id = shipper_contact.id
- LEFT JOIN
- -- 收货方联系人
- contacts consignee_contact ON w.consignee_contact_id = consignee_contact.id
- LEFT JOIN
- -- 承运商
- company carrier ON w.carrier_id = carrier.id
- LEFT JOIN
- -- 司机
- contacts driver ON w.driver_id = driver.id
- JOIN
- -- 订单信息
- records ON w.record_id = records.id
- JOIN record_items ON record_items.record_id = w.record_id
- JOIN product ON product.id = record_items.product_id
- JOIN product_category ON product_category.id = product.category_id
- LEFT JOIN record_vehicles ON records.id = record_vehicles.record_id
- LEFT JOIN project in_stock ON records.in_stock_id = in_stock.id
- LEFT JOIN project out_stock ON records.out_stock_id = out_stock.id
+ JOIN records r ON r.id = w.record_id
+ LEFT JOIN record_contract rc ON r.id = rc.record_id
+ LEFT JOIN project p ON w.payer_id = p.id
+ LEFT JOIN company c ON p.company_id = c.id
+ LEFT JOIN account a ON w.payee_account_id = a.id
+ LEFT JOIN contacts c2 ON w.consignee_contact_id = c2.id
+ JOIN project p2 ON r.out_stock_id = p2.id -- 发货方
+ LEFT JOIN company c3 ON p2.company_id = c3.id
+ LEFT JOIN contacts c4 ON w.shipper_contact_id = c4.id
+ JOIN project p3 ON r.in_stock_id = p3.id -- 收货方
+ LEFT JOIN company c5 ON p3.company_id = c5.id
+ LEFT JOIN contacts c6 ON w.consignee_contact_id = c6.id
+ LEFT JOIN company c7 ON w.carrier_id = c7.id
+ LEFT JOIN contacts c8 ON w.driver_id = c8.id
WHERE
w.id = :recordId
+LIMIT
+ 1 --rc数量不为1
diff --git a/packages/plugins/@hera/plugin-rental/src/server/sqls/products_search_rule_special.sql b/packages/plugins/@hera/plugin-rental/src/server/sqls/products_search_rule_special.sql
new file mode 100644
index 000000000..70bdebd11
--- /dev/null
+++ b/packages/plugins/@hera/plugin-rental/src/server/sqls/products_search_rule_special.sql
@@ -0,0 +1,24 @@
+CREATE OR REPLACE VIEW
+ public.view_products_search_rule_special AS
+WITH RECURSIVE
+ tree_nodes AS (
+ SELECT
+ id,
+ ARRAY[id] AS parents
+ FROM
+ products
+ WHERE
+ "parentId" IS NULL
+ UNION ALL
+ SELECT
+ t.id,
+ tn.parents || t.id
+ FROM
+ products t
+ JOIN tree_nodes tn ON t."parentId" = tn.id
+ )
+SELECT DISTINCT
+ id,
+ parents
+FROM
+ tree_nodes
diff --git a/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc.sql b/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc.sql
deleted file mode 100644
index 201d44314..000000000
--- a/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc.sql
+++ /dev/null
@@ -1,276 +0,0 @@
-SELECT
- s.*,
- TO_JSONB(
- JSONB_SET(
- TO_JSONB(c),
- '{rule_items}',
- (
- SELECT
- JSONB_AGG(
- JSONB_SET(
- TO_JSONB(ci),
- '{rule}',
- TO_JSONB(
- -- 租金
- JSONB_SET(
- TO_JSONB(cp),
- '{lease_items}',
- (
- SELECT
- JSONB_AGG(
- JSONB_SET(
- TO_JSONB(cpli),
- '{ucl}',
- TO_JSONB(
- JSONB_SET(
- TO_JSONB(ucl),
- '{weight_items}',
- (
- SELECT
- COALESCE(JSONB_AGG(wr), '[]'::jsonb)
- FROM
- weight_rules wr
- WHERE
- ucl.id = wr.logic_id
- AND ucl.id > 4
- )
- )
- )
- ) || JSONB_SET(
- TO_JSONB(cpli),
- '{product_fee}',
- (
- SELECT
- COALESCE(
- JSONB_AGG(
- JSONB_SET(TO_JSONB(cpfi), '{product}', TO_JSONB(product)) || JSONB_SET(
- TO_JSONB(cpfi),
- '{weight_items}',
- (
- SELECT
- COALESCE(JSONB_AGG(wrs), '[]'::jsonb)
- FROM
- weight_rules wrs
- WHERE
- wrs.logic_id = cpfi.conversion_logic_id
- AND cpfi.conversion_logic_id > 4
- )
- )
- ),
- '[]'::jsonb
- )
- FROM
- contract_plan_fee_items cpfi
- JOIN product ON cpfi.fee_product_id = product.id
- WHERE
- cpfi.lease_item_id = cpli.id
- )
- ) || JSONB_SET(
- TO_JSONB(cpli),
- '{products}',
- (
- SELECT
- JSONB_AGG(cplip)
- FROM
- contract_plan_lease_items_products cplip
- WHERE
- cplip.lease_item_id = cpli.id
- )
- )
- )
- FROM
- contract_plan_lease_items cpli
- JOIN unit_conversion_logics ucl ON ucl.id = cpli.conversion_logic_id
- WHERE
- cpli.contract_plan_id = cp.id
- )
- ) ||
- -- 费用
- JSONB_SET(
- TO_JSONB(cp),
- '{fee_item}',
- (
- SELECT
- COALESCE(
- JSONB_AGG(
- JSONB_SET(
- TO_JSONB(cpfi),
- '{ucl}',
- TO_JSONB(
- JSONB_SET(
- TO_JSONB(ucl),
- '{weight_items}',
- (
- SELECT
- COALESCE(JSONB_AGG(wr), '[]'::jsonb)
- FROM
- weight_rules wr
- WHERE
- cpfi.conversion_logic_id = wr.logic_id
- AND cpfi.conversion_logic_id > 4
- )
- )
- )
- ) || JSONB_SET(
- TO_JSONB(cpfi),
- '{product}',
- (
- SELECT
- TO_JSONB(product)
- FROM
- product
- WHERE
- cpfi.fee_product_id = product.id
- )
- )
- ),
- '[]'::jsonb
- )
- FROM
- contract_plan_fee_items cpfi
- JOIN unit_conversion_logics ucl ON ucl.id = cpfi.conversion_logic_id
- WHERE
- cpfi.contract_plan_id = cp.id
- )
- )
- )
- )
- )
- FROM
- contract_items ci
- LEFT JOIN contract_plans cp ON ci.contract_plan_id = cp.id
- WHERE
- ci.contract_id = COALESCE(main.id, c.id)
- AND ci.start_date IS NOT NULL
- AND ci.end_date IS NOT NULL
- )
- )
- ) AS contracts,
- (
- SELECT
- JSONB_AGG(
- JSONB_SET(
- TO_JSONB(r),
- '{record_items}',
- (
- SELECT
- COALESCE(
- JSONB_AGG(
- JSONB_SET(
- TO_JSONB(ri),
- '{product}',
- -- 产品
- (
- SELECT
- TO_JSONB(
- JSONB_SET(
- TO_JSONB(p),
- '{product_category}',
- -- 产品分类
- TO_JSONB(pc)
- )
- )
- FROM
- product p
- JOIN product_category pc ON p.category_id = pc.id
- WHERE
- p.id = ri.product_id
- )
- ) || JSONB_SET(
- TO_JSONB(ri),
- '{record_item_fee_items}',
- (
- SELECT
- COALESCE(
- JSONB_AGG(
- JSONB_SET(TO_JSONB(rifi), '{product}', TO_JSONB(p))
- ),
- '[]'::jsonb
- )
- FROM
- record_item_fee_items rifi
- JOIN product p ON rifi.product_id = p.id
- WHERE
- rifi.record_item_id = ri.id
- )
- )
- ),
- '[]'::jsonb
- )
- FROM
- record_items ri
- WHERE
- ri.record_id = r.id
- )
- ) || JSONB_SET(
- -- 维修赔偿（无产品关联，如：运费）
- TO_JSONB(r),
- '{fee_item}',
- (
- SELECT
- COALESCE(
- JSONB_AGG(
- JSONB_SET(TO_JSONB(rfi), '{product}', TO_JSONB(p))
- ),
- '[]'::jsonb
- )
- FROM
- record_fee_items rfi
- JOIN product p ON rfi.product_id = p.id
- WHERE
- rfi.record_id = r.id
- )
- ) || JSONB_SET(
- TO_JSONB(r),
- '{weight_items}',
- (
- SELECT
- COALESCE(JSONB_AGG(rwi), '[]'::jsonb)
- FROM
- (
- SELECT
- record_group_weight_items.id,
- COMMENT,
- weight,
- record_id,
- product_category_id
- FROM
- record_group_weight_items
- JOIN record_group_weight_items_products ON record_group_weight_items.id = record_group_weight_items_products.item_id
- ) rwi
- WHERE
- rwi.record_id = r.id
- )
- )
- )
- FROM
- records r
- WHERE
- r.contract_id = COALESCE(main.id, c.id)
- AND r.category = '0'
- AND (s.end_date + INTERVAL '1 day - 1 millisecond') >= r.date
- ) AS records,
- (
- SELECT
- COALESCE(JSONB_AGG(sai), '[]'::jsonb)
- FROM
- settlement_add_items sai
- WHERE
- s.id = sai.add_id
- ) AS settlement_add_items,
- (
- SELECT
- JSONB_AGG(s1)
- FROM
- settlements s1
- WHERE
- s1.contract_id = c.id
- ) AS settlements
-FROM
- settlements s
- JOIN
- -- 合同 一对一
- contracts c ON c.id = s.contract_id
- LEFT JOIN contracts main ON main.id = c.alternative_contract_id
-WHERE
- s.id = :settlementsId
diff --git a/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_fee_no_products.sql b/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_fee_no_products.sql
new file mode 100644
index 000000000..54e98bb80
--- /dev/null
+++ b/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_fee_no_products.sql
@@ -0,0 +1,21 @@
+SELECT
+ cpfi.conversion_logic_id,
+ cpfi.count_source,
+ cpfi.unit_price,
+ cpfi.unit,
+ p.id AS fee_product_id,
+ p2.name AS fee_name,
+ p2.name || '[' || p.name || ']' AS fee_label
+FROM
+ settlements s
+ -- 开始查产品费用规则
+ JOIN contracts c ON c.id = s.contract_id
+ JOIN contract_items ci ON c.id = ci.contract_id
+ AND ci.start_date <= s.start_date
+ AND ci.end_date >= s.start_date
+ JOIN contract_plans cp ON cp.id = ci.contract_plan_id
+ JOIN contract_plan_fee_items cpfi ON cpfi.contract_plan_id = cp.id
+ JOIN products p ON p.id = cpfi.new_fee_products_id
+ LEFT JOIN products p2 ON p."parentId" = p2.id
+WHERE
+ s.id = :settlementsId
diff --git a/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_fee_products.sql b/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_fee_products.sql
new file mode 100644
index 000000000..575410fad
--- /dev/null
+++ b/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_fee_products.sql
@@ -0,0 +1,59 @@
+SELECT
+ rc.movement,
+ r.number,
+ ri.new_product_id AS product_id,
+ p2."name" AS fee_product_name,
+ p."name" AS fee_product_label,
+ cpfi.unit_price AS fee_price,
+ cpfi.conversion_logic_id,
+ cpfi.unit,
+ cpfi.count_source,
+ rifi.count,
+ wr.conversion_logic_id AS weight_rule_conversion_logic_id,
+ wr.weight AS weight_rules_weight,
+ rgwi.weight AS group_weight,
+ rgwi.new_product_id AS belong_to_group_weight_id,
+ p3.name AS belong_to_group_weight_name,
+ r.weight AS records_weight,
+ c.calc_type,
+ r.date,
+ rifi.is_excluded
+FROM
+ settlements s
+ -- 开始查产品费用规则
+ JOIN contracts c ON c.id = s.contract_id
+ JOIN contract_items ci ON c.id = ci.contract_id
+ AND ci.start_date <= s.start_date
+ AND ci.end_date >= s.start_date
+ JOIN contract_plans cp ON cp.id = ci.contract_plan_id
+ JOIN contract_plan_lease_items cpli ON cpli.contract_plan_id = cp.id
+ JOIN contract_plan_fee_items cpfi ON cpfi.lease_item_id = cpli.id
+ -- 产品费用查询完毕
+ -- 新版产品匹配处理join
+ JOIN view_products_search_rule_special vpsrs ON cpli.new_products_id = ANY (vpsrs.parents)
+ -- 新版产品匹配处理join end
+ -- 开始查询订单相关，产品赔偿等
+ JOIN record_contract rc ON rc.contract_id = c.id
+ JOIN records r ON r.id = rc.record_id
+ AND (s.end_date + INTERVAL '1 day - 1 millisecond') >= r.date
+ JOIN record_items ri ON ri.record_id = r.id
+ AND ri.new_product_id = vpsrs.id
+ -- 要做的是查订单item中的赔偿要跟cpfi中费用产品join
+ JOIN record_item_fee_items rifi ON rifi.record_item_id = ri.id
+ AND rifi.new_product_id = cpfi.new_fee_products_id
+ JOIN products p ON p.id = rifi.new_product_id
+ LEFT JOIN products p2 ON p."parentId" = p2.id
+ -- 开始查询订单相关，产品等，结束
+ -- 实际重量查询
+ LEFT JOIN record_group_weight_items rgwi ON rgwi.record_id = r.id
+ AND cpfi.conversion_logic_id = 3
+ AND rgwi.new_product_id = ANY (vpsrs.parents)
+ JOIN products p3 ON p3.id = rgwi.new_product_id
+ -- 实际重量查询结束
+ -- 重量表情况
+ LEFT JOIN weight_rules wr ON cpfi.conversion_logic_id = wr.logic_id
+ AND cpfi.conversion_logic_id > 4
+ AND wr.new_product_id = ri.new_product_id
+ -- 重量表情况结束
+WHERE
+ s.id = :settlementsId
diff --git a/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_products.sql b/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_products.sql
new file mode 100644
index 000000000..95ef479ab
--- /dev/null
+++ b/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_products.sql
@@ -0,0 +1,60 @@
+SELECT
+ rc.movement,
+ r.id AS record_id,
+ r.number AS record_number,
+ r.weight AS record_weight,
+ p.id AS product_id,
+ ri.count AS product_count,
+ p2."name" AS product_name,
+ p2."name" || '[' || p.name || ']' AS product_label,
+ p2.convertible AS product_conbertible,
+ p2.unit AS product_unit,
+ p2.conversion_unit AS product_convertible_unit,
+ p.weight AS product_weight,
+ p.ratio AS porduct_ratio,
+ rgwi.weight AS group_weight,
+ wr.conversion_logic_id AS weight_rules_conversion_logic_id,
+ wr.weight AS weight_rules_weight,
+ cpli.conversion_logic_id,
+ cpli.unit_price,
+ c.calc_type,
+ c.tax_included,
+ c.tax_rate,
+ r.date,
+ rgwi.new_product_id AS belong_to_group_weight_id,
+ p3.name AS belong_to_group_weight_name
+FROM
+ settlements s
+ -- 开始查租金规则
+ JOIN contracts c ON c.id = s.contract_id
+ JOIN contract_items ci ON c.id = ci.contract_id
+ AND ci.start_date <= s.start_date
+ AND ci.end_date >= s.start_date
+ JOIN contract_plans cp ON cp.id = ci.contract_plan_id
+ JOIN contract_plan_lease_items cpli ON cpli.contract_plan_id = cp.id
+ -- 租金规则查询完毕
+ -- 新版产品匹配处理join
+ JOIN view_products_search_rule_special vpsrs ON cpli.new_products_id = ANY (vpsrs.parents)
+ -- 新版产品匹配处理join end
+ -- 开始查询订单相关，产品等
+ JOIN record_contract rc ON rc.contract_id = c.id
+ JOIN records r ON r.id = rc.record_id
+ AND (s.end_date + INTERVAL '1 day - 1 millisecond') >= r.date
+ JOIN record_items ri ON ri.record_id = r.id
+ AND ri.new_product_id = vpsrs.id
+ JOIN products p ON p.id = ri.new_product_id
+ LEFT JOIN products p2 ON p."parentId" = p2.id
+ -- 开始查询订单相关，产品等，结束
+ -- 实际重量查询
+ LEFT JOIN record_group_weight_items rgwi ON rgwi.record_id = r.id
+ AND cpli.conversion_logic_id = 3
+ AND rgwi.new_product_id = ANY (vpsrs.parents)
+ LEFT JOIN products p3 ON p3.id = rgwi.new_product_id
+ -- 实际重量查询结束
+ -- 重量表情况
+ LEFT JOIN weight_rules wr ON cpli.conversion_logic_id = wr.logic_id
+ AND cpli.conversion_logic_id > 4
+ AND wr.new_product_id = ri.new_product_id
+ -- 重量表情况结束
+WHERE
+ s.id = :settlementsId
diff --git a/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_record_fee_products.sql b/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_record_fee_products.sql
new file mode 100644
index 000000000..877614c3e
--- /dev/null
+++ b/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_calc_record_fee_products.sql
@@ -0,0 +1,19 @@
+SELECT
+ r.id,
+ r.date,
+ r.number,
+ r."date",
+ rc.movement,
+ rfi.is_excluded,
+ rfi.count,
+ p.name,
+ p.id AS fee_product_id
+FROM
+ settlements s
+ JOIN record_contract rc ON rc.contract_id = s.contract_id
+ JOIN records r ON r.id = rc.record_id
+ AND (s.end_date + INTERVAL '1 day - 1 millisecond') >= r.date
+ JOIN record_fee_items rfi ON rfi.record_id = r.id
+ JOIN products p ON p.id = rfi.new_product_id
+WHERE
+ s.id = :settlementsId
diff --git a/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_select.sql b/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_select.sql
index 7fe182edf..b41c0528e 100644
--- a/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_select.sql
+++ b/packages/plugins/@hera/plugin-rental/src/server/sqls/settlement_select.sql
@@ -48,6 +48,28 @@ SELECT
WHERE
contracts."updatedById" = u.id
)
+ ) || JSONB_SET(
+ TO_JSONB(contracts),
+ '{first_party}',
+ (
+ SELECT
+ TO_JSONB(c)
+ FROM
+ company c
+ WHERE
+ c.id = contracts.first_party_id
+ )
+ ) || JSONB_SET(
+ TO_JSONB(contracts),
+ '{party_b}',
+ (
+ SELECT
+ TO_JSONB(c)
+ FROM
+ company c
+ WHERE
+ c.id = contracts.party_b_id
+ )
)
) AS contracts,
(
diff --git a/packages/plugins/@hera/plugin-rental/src/server/sqls/view_records_contracts.sql b/packages/plugins/@hera/plugin-rental/src/server/sqls/view_records_contracts.sql
new file mode 100644
index 000000000..f57cbd7a4
--- /dev/null
+++ b/packages/plugins/@hera/plugin-rental/src/server/sqls/view_records_contracts.sql
@@ -0,0 +1,56 @@
+CREATE OR REPLACE VIEW
+ public.view_records_contracts AS
+SELECT
+ c.id AS contract_id,
+ r.id AS record_id,
+ CAST('c_' || rc.id AS VARCHAR) AS id,
+ rc.id AS rc_id, -- 页面更新中间表存根联/回根联用
+ rc.movement,
+ c1.id AS company_id,
+ p.id AS project_id,
+ rc.has_receipt,
+ rc.has_stub,
+ c.record_category
+FROM
+ records r
+ JOIN record_contract rc ON rc.record_id = r.id
+ JOIN contracts c ON c.id = rc.contract_id
+ JOIN company c1 ON c1.id = c.first_party_id
+ JOIN project p ON p.id = (
+ CASE
+ WHEN rc.movement = '1' THEN r.out_stock_id
+ ELSE r.in_stock_id
+ END
+ )
+UNION ALL
+SELECT
+ NULL AS contract_id,
+ r.id AS record_id,
+ CAST('r_' || r.id AS VARCHAR) AS id,
+ NULL AS rc_id,
+ (
+ CASE
+ WHEN p3.id = r.in_stock_id THEN '1'
+ ELSE '-1'
+ END
+ ) AS movement,
+ c.id AS company_id,
+ p3.id AS project_id,
+ rc.has_receipt,
+ rc.has_stub,
+ '2' AS record_category
+FROM
+ records r
+ LEFT JOIN record_contract rc ON rc.record_id = r.id
+ JOIN project p ON p.id = r.in_stock_id
+ JOIN project p2 ON p2.id = r.out_stock_id
+ JOIN company c ON c.roles @> '["associated"]'
+ AND c.id = p.company_id
+ OR c.id = p2.company_id
+ JOIN project p3 ON p3.company_id = c.id
+ AND p3.id = p.id
+ OR p3.id = p2.id
+WHERE
+ rc.id IS NULL
+ AND r.in_stock_id IS NOT NULL
+ AND r.out_stock_id IS NOT NULL
diff --git a/packages/plugins/@hera/plugin-rental/src/server/sqls/waybills_products.sql b/packages/plugins/@hera/plugin-rental/src/server/sqls/waybills_products.sql
new file mode 100644
index 000000000..00cf6f48a
--- /dev/null
+++ b/packages/plugins/@hera/plugin-rental/src/server/sqls/waybills_products.sql
@@ -0,0 +1,19 @@
+SELECT
+ p2."name" || '/' || p.name AS products_name,
+ p2.convertible,
+ p2.unit,
+ p2.conversion_unit,
+ p.ratio,
+ ri.count,
+ CASE
+ WHEN p2.convertible THEN ri.count * COALESCE(p.ratio, 1)
+ ELSE ri.count
+ END AS total
+FROM
+ waybills w
+ JOIN record_items ri ON ri.record_id = w.record_id
+ JOIN products p ON p.id = ri.new_product_id
+ JOIN products p2 ON p2.id = p."parentId"
+WHERE
+ w.id = :recordId
+ -- 运输单相关产品查询
diff --git a/packages/plugins/@hera/plugin-rental/src/utils/constants.ts b/packages/plugins/@hera/plugin-rental/src/utils/constants.ts
index 8f4a4201a..953e51bbb 100644
--- a/packages/plugins/@hera/plugin-rental/src/utils/constants.ts
+++ b/packages/plugins/@hera/plugin-rental/src/utils/constants.ts
@@ -84,18 +84,6 @@ export enum SourcesType {
* 3 出入库量
*/
inAndOut = '3',
- /**
- * 4 出库单数
- */
- outboundNumber = '4',
- /**
- * 5 入库单数
- */
- inboundNumber = '5',
- /**
- * 6 出入库单数
- */
- inAndOutNumber = '6',
}
export enum PromptText {
diff --git a/packages/plugins/@hera/plugin-sancongtou/package.json b/packages/plugins/@hera/plugin-sancongtou/package.json
index 7acb17e5b..cb6be327f 100644
--- a/packages/plugins/@hera/plugin-sancongtou/package.json
+++ b/packages/plugins/@hera/plugin-sancongtou/package.json
@@ -9,9 +9,9 @@
"antd-mobile": "^5.35.0"
},
"peerDependencies": {
- "@nocobase/client": "0.x",
- "@nocobase/server": "0.x",
- "@nocobase/test": "0.x"
+ "@tachybase/client": "0.x",
+ "@tachybase/server": "0.x",
+ "@tachybase/test": "0.x"
},
"description.zh-CN": "提供移动端: 定制化的三聪头项目页面,.",
"displayName.zh-CN": "移动端: 三聪头,定制化页面配置"
diff --git a/packages/plugins/@hera/plugin-sancongtou/src/client/index.tsx b/packages/plugins/@hera/plugin-sancongtou/src/client/index.tsx
index aaaa43283..8da09673c 100644
--- a/packages/plugins/@hera/plugin-sancongtou/src/client/index.tsx
+++ b/packages/plugins/@hera/plugin-sancongtou/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import { ProductDetail } from './pages/ProductDetail';
import { ShareProduct } from './components/ShareProduct';
diff --git a/packages/plugins/@hera/plugin-sancongtou/src/client/pages/ProductDetail.tsx b/packages/plugins/@hera/plugin-sancongtou/src/client/pages/ProductDetail.tsx
index 1389cf101..2f7ad61f9 100644
--- a/packages/plugins/@hera/plugin-sancongtou/src/client/pages/ProductDetail.tsx
+++ b/packages/plugins/@hera/plugin-sancongtou/src/client/pages/ProductDetail.tsx
@@ -2,7 +2,7 @@ import { NavBar, Image } from 'antd-mobile';
import React from 'react';
import detailHeaderImpage from '../assets/detail_lt_header.png';
import detailContentImage from '../assets/detail_lt_content.png';
-import { css } from '@nocobase/client';
+import { css } from '@tachybase/client';
export const ProductDetail = () => {
const onBack = () => {
diff --git a/packages/plugins/@hera/plugin-sancongtou/src/server/plugin.ts b/packages/plugins/@hera/plugin-sancongtou/src/server/plugin.ts
index 802f9ec23..8ff487392 100644
--- a/packages/plugins/@hera/plugin-sancongtou/src/server/plugin.ts
+++ b/packages/plugins/@hera/plugin-sancongtou/src/server/plugin.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/server';
+import { Plugin } from '@tachybase/server';
export class PluginSancongtouServer extends Plugin {
async afterAdd() {}
diff --git a/packages/plugins/@nocobase/plugin-acl/package.json b/packages/plugins/@nocobase/plugin-acl/package.json
index 88b1be4d4..c28f0c2bd 100644
--- a/packages/plugins/@nocobase/plugin-acl/package.json
+++ b/packages/plugins/@nocobase/plugin-acl/package.json
@@ -30,14 +30,14 @@
"react-i18next": "^11.15.1"
},
"peerDependencies": {
- "@nocobase/acl": "workspace:*",
- "@nocobase/actions": "workspace:*",
- "@nocobase/cache": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/acl": "workspace:*",
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/cache": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "基于角色、资源和操作的权限控制，可以精确控制界面配置权限、数据操作权限、菜单访问权限、插件权限。",
"displayName.zh-CN": "权限控制",
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/NewRole.tsx b/packages/plugins/@nocobase/plugin-acl/src/client/NewRole.tsx
index ca48e4c04..4d07a2454 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/NewRole.tsx
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/NewRole.tsx
@@ -1,4 +1,4 @@
-import { SchemaComponent, useActionContext, useRequest } from '@nocobase/client';
+import { SchemaComponent, useActionContext, useRequest } from '@tachybase/client';
import React from 'react';
import { useACLTranslation } from './locale';
import { uid } from '@tachybase/schema';
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/RolesManagement.tsx b/packages/plugins/@nocobase/plugin-acl/src/client/RolesManagement.tsx
index d6ce33faa..a133ff8cf 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/RolesManagement.tsx
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/RolesManagement.tsx
@@ -7,7 +7,7 @@ import {
SchemaComponentContext,
usePlugin,
useSchemaComponentContext,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { ISchema, Schema } from '@tachybase/schema';
import { RolesMenu } from './RolesMenu';
import { useACLTranslation } from './locale';
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/RolesMenu.tsx b/packages/plugins/@nocobase/plugin-acl/src/client/RolesMenu.tsx
index 54e113473..a46e2ba4e 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/RolesMenu.tsx
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/RolesMenu.tsx
@@ -4,7 +4,7 @@ import {
SchemaComponent,
useAPIClient,
useResourceActionContext,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { Menu, Empty, Dropdown, App, Tag, Row, Col, Spin } from 'antd';
import { TagOutlined, MoreOutlined } from '@ant-design/icons';
import React, { useCallback, useContext, useEffect, useMemo, useRef, useState } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/association.test.ts b/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/association.test.ts
index 27a376d8f..28841b811 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/association.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/association.test.ts
@@ -1,4 +1,4 @@
-import { expect, test } from '@nocobase/test/e2e';
+import { expect, test } from '@tachybase/test/e2e';
import { oneTableBlock } from './utils';
test.describe('view', () => {
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/collection.test.ts b/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/collection.test.ts
index c23b86510..11fc1afac 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/collection.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/collection.test.ts
@@ -1,4 +1,4 @@
-import { expect, test } from '@nocobase/test/e2e';
+import { expect, test } from '@tachybase/test/e2e';
import { oneTableBlock, newTableBlock } from './utils';
test.describe('view', () => {
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/configure.test.ts b/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/configure.test.ts
index b84d78a38..d89b47074 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/configure.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/configure.test.ts
@@ -1,4 +1,4 @@
-import { expect, test } from '@nocobase/test/e2e';
+import { expect, test } from '@tachybase/test/e2e';
import { oneTableBlock } from './utils';
test('allows to configure interface', async ({ page, mockPage, mockRole, updateRole }) => {
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/menu.test.ts b/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/menu.test.ts
index deb78f6a9..08f16c651 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/menu.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/menu.test.ts
@@ -1,4 +1,4 @@
-import { expect, test } from '@nocobase/test/e2e';
+import { expect, test } from '@tachybase/test/e2e';
test('menu permission ', async ({ page, mockPage, mockRole, updateRole }) => {
const page2 = mockPage({ name: 'page2' });
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/utils.ts b/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/utils.ts
index c67278a46..6b180f821 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/utils.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/__e2e__/utils.ts
@@ -1,4 +1,4 @@
-import { general, PageConfig } from '@nocobase/test/e2e';
+import { general, PageConfig } from '@tachybase/test/e2e';
/**
* 页面中有一个空的 Table 区块，并且配有字段:普通字段和关系字段
*/
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/index.ts b/packages/plugins/@nocobase/plugin-acl/src/client/index.ts
index cec44c813..07765ce52 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/index.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/index.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import { RolesManagement } from './RolesManagement';
import { RolesManager } from './roles-manager';
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/ActionPermissions.tsx b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/ActionPermissions.tsx
index ab60918e3..b3f58b6b2 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/ActionPermissions.tsx
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/ActionPermissions.tsx
@@ -11,7 +11,7 @@ import {
useRecord,
useRequest,
useResourceActionContext,
-} from '@nocobase/client';
+} from '@tachybase/client';
import React, { useContext, useEffect } from 'react';
import { RolesManagerContext } from '../RolesManagerProvider';
import { roleCollectionsSchema } from '../schemas/roles';
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/AvailableActions.tsx b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/AvailableActions.tsx
index 1bbee689f..7b44291b4 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/AvailableActions.tsx
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/AvailableActions.tsx
@@ -1,4 +1,4 @@
-import { useRequest } from '@nocobase/client';
+import { useRequest } from '@tachybase/client';
import { Spin } from 'antd';
import React, { createContext, useContext } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/GeneralPermissions.tsx b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/GeneralPermissions.tsx
index 07c76295c..c1b569900 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/GeneralPermissions.tsx
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/GeneralPermissions.tsx
@@ -1,6 +1,6 @@
import { onFormValuesChange, createForm, Form } from '@tachybase/schema';
import { connect } from '@tachybase/schema';
-import { SchemaComponent, useAPIClient, useRequest } from '@nocobase/client';
+import { SchemaComponent, useAPIClient, useRequest } from '@tachybase/client';
import { Checkbox, message } from 'antd';
import uniq from 'lodash/uniq';
import React, { useContext, useMemo } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/MenuItemsProvider.tsx b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/MenuItemsProvider.tsx
index fc5469eb8..dab6b8590 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/MenuItemsProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/MenuItemsProvider.tsx
@@ -1,4 +1,4 @@
-import { useAdminSchemaUid, useRequest } from '@nocobase/client';
+import { useAdminSchemaUid, useRequest } from '@tachybase/client';
import { Spin } from 'antd';
import React, { createContext, useContext } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/MenuPermissions.tsx b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/MenuPermissions.tsx
index c79eee4a6..4ee0c4ad9 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/MenuPermissions.tsx
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/MenuPermissions.tsx
@@ -4,7 +4,7 @@ import { uniq } from 'lodash';
import React, { useContext, useState, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { uid } from '@tachybase/schema';
-import { useAPIClient, SchemaComponent, useRequest } from '@nocobase/client';
+import { useAPIClient, SchemaComponent, useRequest } from '@tachybase/client';
import { useStyles } from './style';
import { useMemoizedFn } from 'ahooks';
import { RolesManagerContext } from '../RolesManagerProvider';
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/Permissions.tsx b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/Permissions.tsx
index 8b28cdbda..e39eee239 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/Permissions.tsx
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/Permissions.tsx
@@ -1,4 +1,4 @@
-import { useApp, useRequest, useAPIClient } from '@nocobase/client';
+import { useApp, useRequest, useAPIClient } from '@tachybase/client';
import { Tabs } from 'antd';
import React, { useContext, useEffect, useMemo } from 'react';
import { RolesManagerContext } from '../RolesManagerProvider';
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/PluginPermissions.tsx b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/PluginPermissions.tsx
index f42090efb..8bc6cb71e 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/PluginPermissions.tsx
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/PluginPermissions.tsx
@@ -1,4 +1,4 @@
-import { useAPIClient, useApp, useCompile, useCollectionRecord, useRequest } from '@nocobase/client';
+import { useAPIClient, useApp, useCompile, useCollectionRecord, useRequest } from '@tachybase/client';
import { Checkbox, message, Table } from 'antd';
import React, { useContext, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/RolesResourcesActions.tsx b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/RolesResourcesActions.tsx
index cc5e4fbf9..004cb5d25 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/RolesResourcesActions.tsx
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/RolesResourcesActions.tsx
@@ -7,7 +7,7 @@ import {
useCompile,
useCollectionRecord,
useRecord,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { Checkbox, Table, Tag } from 'antd';
import { isEmpty } from 'lodash';
import React, { createContext } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/ScopeSelect.tsx b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/ScopeSelect.tsx
index f905d402b..909e6d12d 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/ScopeSelect.tsx
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/ScopeSelect.tsx
@@ -1,6 +1,6 @@
import { createForm } from '@tachybase/schema';
import React, { createContext, useContext, useMemo, useState } from 'react';
-import { FormProvider, SchemaComponent } from '@nocobase/client';
+import { FormProvider, SchemaComponent } from '@tachybase/client';
import { scopesSchema } from '../schemas/scopes';
const RolesResourcesScopesSelectedRowKeysContext = createContext(null);
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/StrategyActions.tsx b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/StrategyActions.tsx
index 2f45ed3ae..e49971866 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/permissions/StrategyActions.tsx
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/permissions/StrategyActions.tsx
@@ -3,7 +3,7 @@ import { connect, useField } from '@tachybase/schema';
import { Checkbox, Select, Table, Tag } from 'antd';
import React from 'react';
import { useTranslation } from 'react-i18next';
-import { useCompile } from '@nocobase/client';
+import { useCompile } from '@tachybase/client';
import { useAvailableActions } from './AvailableActions';
const toScopes = (value) => {
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/roles-manager.ts b/packages/plugins/@nocobase/plugin-acl/src/client/roles-manager.ts
index 6b3e800d7..203168e85 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/roles-manager.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/roles-manager.ts
@@ -1,4 +1,4 @@
-import { Registry } from '@nocobase/utils/client';
+import { Registry } from '@tachybase/utils/client';
export type RolesManagerOptions = {
title: string;
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/schemas/roles.ts b/packages/plugins/@nocobase/plugin-acl/src/client/schemas/roles.ts
index 2f444b574..3bf80ac76 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/schemas/roles.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/schemas/roles.ts
@@ -1,5 +1,5 @@
import { uid } from '@tachybase/schema';
-import { useActionContext, useCollectionRecord, useRecord, useRequest } from '@nocobase/client';
+import { useActionContext, useCollectionRecord, useRecord, useRequest } from '@tachybase/client';
import { useEffect } from 'react';
import pick from 'lodash/pick';
import { ISchema } from '@tachybase/schema';
diff --git a/packages/plugins/@nocobase/plugin-acl/src/client/schemas/scopes.ts b/packages/plugins/@nocobase/plugin-acl/src/client/schemas/scopes.ts
index 3ec00dca3..35cf190c1 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/client/schemas/scopes.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/client/schemas/scopes.ts
@@ -1,5 +1,5 @@
import { ISchema } from '@tachybase/schema';
-import { VariableInput, useFilterOptions, useFormBlockContext } from '@nocobase/client';
+import { VariableInput, useFilterOptions, useFormBlockContext } from '@tachybase/client';
import { useContext, useEffect } from 'react';
import { RoleResourceCollectionContext } from '../permissions/RolesResourcesActions';
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/acl.test.ts b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/acl.test.ts
index 82f4ed122..f4dd02087 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/acl.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/acl.test.ts
@@ -1,8 +1,8 @@
-import { ACL } from '@nocobase/acl';
-import { Database } from '@nocobase/database';
+import { ACL } from '@tachybase/acl';
+import { Database } from '@tachybase/database';
import { UiSchemaRepository } from '@nocobase/plugin-ui-schema-storage';
import UsersPlugin from '@nocobase/plugin-users';
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import { prepareApp } from './prepare';
describe('acl', () => {
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/actions.test.ts b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/actions.test.ts
index a5b2fb17a..ab81fe9a7 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/actions.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/actions.test.ts
@@ -1,4 +1,4 @@
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import { prepareApp } from './prepare';
describe('destroy action with acl', () => {
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/association-field.test.ts b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/association-field.test.ts
index 70da330a6..95d1a91a8 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/association-field.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/association-field.test.ts
@@ -1,7 +1,7 @@
-import { ACL } from '@nocobase/acl';
-import { Database, HasManyRepository } from '@nocobase/database';
+import { ACL } from '@tachybase/acl';
+import { Database, HasManyRepository } from '@tachybase/database';
import UsersPlugin from '@nocobase/plugin-users';
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import { prepareApp } from './prepare';
describe('association test', () => {
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/configuration.test.ts b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/configuration.test.ts
index c19c4f231..d32012bcd 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/configuration.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/configuration.test.ts
@@ -1,6 +1,6 @@
-import { Database } from '@nocobase/database';
+import { Database } from '@tachybase/database';
import UsersPlugin from '@nocobase/plugin-users';
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import { prepareApp } from './prepare';
describe('configuration', () => {
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/list-action.test.ts b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/list-action.test.ts
index c71c958b2..6da933328 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/list-action.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/list-action.test.ts
@@ -1,5 +1,5 @@
-import { Database } from '@nocobase/database';
-import { MockServer } from '@nocobase/test';
+import { Database } from '@tachybase/database';
+import { MockServer } from '@tachybase/test';
import { prepareApp } from './prepare';
describe('list action with acl', () => {
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/middleware.test.ts b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/middleware.test.ts
index 1014ee3ac..6f73280c9 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/middleware.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/middleware.test.ts
@@ -1,7 +1,7 @@
-import { ACL } from '@nocobase/acl';
-import { Database, Model } from '@nocobase/database';
+import { ACL } from '@tachybase/acl';
+import { Database, Model } from '@tachybase/database';
import UsersPlugin from '@nocobase/plugin-users';
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import { prepareApp } from './prepare';
describe('middleware', () => {
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/own.test.ts b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/own.test.ts
index a26099bcd..587e37ea7 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/own.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/own.test.ts
@@ -1,7 +1,7 @@
-import { ACL } from '@nocobase/acl';
-import { Database } from '@nocobase/database';
+import { ACL } from '@tachybase/acl';
+import { Database } from '@tachybase/database';
import PluginUser from '@nocobase/plugin-users';
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import { prepareApp } from './prepare';
describe('own test', () => {
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/prepare.ts b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/prepare.ts
index babf2b5aa..85d2aa806 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/prepare.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/prepare.ts
@@ -1,4 +1,4 @@
-import { createMockServer, MockServer } from '@nocobase/test';
+import { createMockServer, MockServer } from '@tachybase/test';
export async function prepareApp(): Promise {
const app = await createMockServer({
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/role-check.test.ts b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/role-check.test.ts
index 280d727d8..6bd6be9b0 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/role-check.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/role-check.test.ts
@@ -1,5 +1,5 @@
-import { Database } from '@nocobase/database';
-import { MockServer } from '@nocobase/test';
+import { Database } from '@tachybase/database';
+import { MockServer } from '@tachybase/test';
import { prepareApp } from './prepare';
import { CollectionRepository } from '@nocobase/plugin-collection-manager';
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/role-resource.test.ts b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/role-resource.test.ts
index f303626f0..251c4f7ea 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/role-resource.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/role-resource.test.ts
@@ -1,7 +1,7 @@
-import { Database, Model } from '@nocobase/database';
+import { Database, Model } from '@tachybase/database';
import { CollectionRepository } from '@nocobase/plugin-collection-manager';
import UsersPlugin from '@nocobase/plugin-users';
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import { prepareApp } from './prepare';
describe('role resource api', () => {
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/role-user.test.ts b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/role-user.test.ts
index b8613579e..89f85b8a3 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/role-user.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/role-user.test.ts
@@ -1,6 +1,6 @@
-import Database, { BelongsToManyRepository } from '@nocobase/database';
+import Database, { BelongsToManyRepository } from '@tachybase/database';
import UsersPlugin from '@nocobase/plugin-users';
-import { createMockServer, MockServer } from '@nocobase/test';
+import { createMockServer, MockServer } from '@tachybase/test';
import jwt from 'jsonwebtoken';
describe('role', () => {
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/role.test.ts b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/role.test.ts
index fee341fa3..a956de3fa 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/role.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/role.test.ts
@@ -1,6 +1,6 @@
-import { ArrayFieldRepository, Database, Model } from '@nocobase/database';
+import { ArrayFieldRepository, Database, Model } from '@tachybase/database';
import UsersPlugin from '@nocobase/plugin-users';
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import { prepareApp } from './prepare';
describe('role api', () => {
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/scope.test.ts b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/scope.test.ts
index 9c56177ba..2f57e6bb9 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/scope.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/scope.test.ts
@@ -1,6 +1,6 @@
-import { Database } from '@nocobase/database';
+import { Database } from '@tachybase/database';
import UsersPlugin from '@nocobase/plugin-users';
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import { prepareApp } from './prepare';
describe('scope api', () => {
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/setCurrentRole.test.ts b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/setCurrentRole.test.ts
index d0e98b09f..902119150 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/setCurrentRole.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/setCurrentRole.test.ts
@@ -1,7 +1,7 @@
import { vi } from 'vitest';
-import Database from '@nocobase/database';
+import Database from '@tachybase/database';
import UsersPlugin from '@nocobase/plugin-users';
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import { setCurrentRole } from '../middlewares/setCurrentRole';
import { prepareApp } from './prepare';
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/snippets.test.ts b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/snippets.test.ts
index dd6bcaa97..d67ef1bae 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/snippets.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/snippets.test.ts
@@ -1,4 +1,4 @@
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import { prepareApp } from './prepare';
describe('snippet', () => {
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/users.test.ts b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/users.test.ts
index e8ab3dbbf..6c7021800 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/users.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/users.test.ts
@@ -1,5 +1,5 @@
-import Database from '@nocobase/database';
-import { MockServer } from '@nocobase/test';
+import Database from '@tachybase/database';
+import { MockServer } from '@tachybase/test';
import { prepareApp } from './prepare';
describe('actions', () => {
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/write-role-to-acl.test.ts b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/write-role-to-acl.test.ts
index 9e9ad281e..bbe5095d7 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/write-role-to-acl.test.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/__tests__/write-role-to-acl.test.ts
@@ -1,5 +1,5 @@
-import { MockServer } from '@nocobase/test';
-import { Database } from '@nocobase/database';
+import { MockServer } from '@tachybase/test';
+import { Database } from '@tachybase/database';
import { prepareApp } from './prepare';
describe('write role to acl', () => {
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/actions/role-collections.ts b/packages/plugins/@nocobase/plugin-acl/src/server/actions/role-collections.ts
index a6c4356bb..1f47053d6 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/actions/role-collections.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/actions/role-collections.ts
@@ -1,4 +1,4 @@
-import { Database } from '@nocobase/database';
+import { Database } from '@tachybase/database';
type UsingConfigType = 'strategy' | 'resourceAction';
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/actions/user-setDefaultRole.ts b/packages/plugins/@nocobase/plugin-acl/src/server/actions/user-setDefaultRole.ts
index 740010597..e1acc5608 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/actions/user-setDefaultRole.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/actions/user-setDefaultRole.ts
@@ -1,4 +1,4 @@
-import { Context, Next } from '@nocobase/actions';
+import { Context, Next } from '@tachybase/actions';
export async function setDefaultRole(ctx: Context, next: Next) {
const {
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/collections/roles-users.ts b/packages/plugins/@nocobase/plugin-acl/src/server/collections/roles-users.ts
index c82a431df..f4ac085b3 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/collections/roles-users.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/collections/roles-users.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
name: 'rolesUsers',
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/collections/roles.ts b/packages/plugins/@nocobase/plugin-acl/src/server/collections/roles.ts
index c3bab89d6..d0d54d884 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/collections/roles.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/collections/roles.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
origin: '@nocobase/plugin-acl',
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/collections/rolesResources.ts b/packages/plugins/@nocobase/plugin-acl/src/server/collections/rolesResources.ts
index a03b1f7f6..a43382249 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/collections/rolesResources.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/collections/rolesResources.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
dumpRules: 'required',
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/collections/rolesResourcesActions.ts b/packages/plugins/@nocobase/plugin-acl/src/server/collections/rolesResourcesActions.ts
index 05da21007..a4e43515c 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/collections/rolesResourcesActions.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/collections/rolesResourcesActions.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
dumpRules: 'required',
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/collections/rolesResourcesScopes.ts b/packages/plugins/@nocobase/plugin-acl/src/server/collections/rolesResourcesScopes.ts
index 1ff4ea708..18f411df9 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/collections/rolesResourcesScopes.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/collections/rolesResourcesScopes.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
dumpRules: 'required',
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/collections/users.ts b/packages/plugins/@nocobase/plugin-acl/src/server/collections/users.ts
index 00a9056b4..359aee4e7 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/collections/users.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/collections/users.ts
@@ -1,4 +1,4 @@
-import { extendCollection } from '@nocobase/database';
+import { extendCollection } from '@tachybase/database';
export default extendCollection({
name: 'users',
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/middlewares/setCurrentRole.ts b/packages/plugins/@nocobase/plugin-acl/src/server/middlewares/setCurrentRole.ts
index 5c7502124..be74c5742 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/middlewares/setCurrentRole.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/middlewares/setCurrentRole.ts
@@ -1,6 +1,6 @@
-import { Context } from '@nocobase/actions';
-import { Cache } from '@nocobase/cache';
-import { Model, Repository } from '@nocobase/database';
+import { Context } from '@tachybase/actions';
+import { Cache } from '@tachybase/cache';
+import { Model, Repository } from '@tachybase/database';
export async function setCurrentRole(ctx: Context, next) {
const currentRole = ctx.get('X-Role');
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/middlewares/with-acl-meta.ts b/packages/plugins/@nocobase/plugin-acl/src/server/middlewares/with-acl-meta.ts
index 5af8e929d..6664734ad 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/middlewares/with-acl-meta.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/middlewares/with-acl-meta.ts
@@ -1,6 +1,6 @@
import lodash from 'lodash';
-import { NoPermissionError } from '@nocobase/acl';
-import { snakeCase } from '@nocobase/database';
+import { NoPermissionError } from '@tachybase/acl';
+import { snakeCase } from '@tachybase/database';
function createWithACLMetaMiddleware() {
return async (ctx: any, next) => {
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/migrations/20221214072638-set-role-snippets.ts b/packages/plugins/@nocobase/plugin-acl/src/server/migrations/20221214072638-set-role-snippets.ts
index 5b98163f8..bce0fbcbe 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/migrations/20221214072638-set-role-snippets.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/migrations/20221214072638-set-role-snippets.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
export default class extends Migration {
appVersion = '<0.9.0-alpha.1';
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/model/RoleModel.ts b/packages/plugins/@nocobase/plugin-acl/src/server/model/RoleModel.ts
index e6a2b40fe..f69d086f9 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/model/RoleModel.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/model/RoleModel.ts
@@ -1,5 +1,5 @@
-import { Model } from '@nocobase/database';
-import { ACL } from '@nocobase/acl';
+import { Model } from '@tachybase/database';
+import { ACL } from '@tachybase/acl';
export class RoleModel extends Model {
writeToAcl(options: { acl: ACL; withOutStrategy?: boolean }) {
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/model/RoleResourceActionModel.ts b/packages/plugins/@nocobase/plugin-acl/src/server/model/RoleResourceActionModel.ts
index be2456875..bd87fd769 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/model/RoleResourceActionModel.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/model/RoleResourceActionModel.ts
@@ -1,5 +1,5 @@
-import { ACL, ACLRole } from '@nocobase/acl';
-import { Database, Model } from '@nocobase/database';
+import { ACL, ACLRole } from '@tachybase/acl';
+import { Database, Model } from '@tachybase/database';
import { AssociationFieldAction, AssociationFieldsActions, GrantHelper } from '../server';
export class RoleResourceActionModel extends Model {
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/model/RoleResourceModel.ts b/packages/plugins/@nocobase/plugin-acl/src/server/model/RoleResourceModel.ts
index 48f5e349d..a93d0725c 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/model/RoleResourceModel.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/model/RoleResourceModel.ts
@@ -1,5 +1,5 @@
-import { ACL, ACLResource, ACLRole } from '@nocobase/acl';
-import { Model } from '@nocobase/database';
+import { ACL, ACLResource, ACLRole } from '@tachybase/acl';
+import { Model } from '@tachybase/database';
import { AssociationFieldsActions, GrantHelper } from '../server';
import { RoleResourceActionModel } from './RoleResourceActionModel';
diff --git a/packages/plugins/@nocobase/plugin-acl/src/server/server.ts b/packages/plugins/@nocobase/plugin-acl/src/server/server.ts
index 807773a0d..bec9222ce 100644
--- a/packages/plugins/@nocobase/plugin-acl/src/server/server.ts
+++ b/packages/plugins/@nocobase/plugin-acl/src/server/server.ts
@@ -1,7 +1,7 @@
-import { Context, utils as actionUtils } from '@nocobase/actions';
-import { Cache } from '@nocobase/cache';
-import { Collection, RelationField } from '@nocobase/database';
-import { Plugin } from '@nocobase/server';
+import { Context, utils as actionUtils } from '@tachybase/actions';
+import { Cache } from '@tachybase/cache';
+import { Collection, RelationField } from '@tachybase/database';
+import { Plugin } from '@tachybase/server';
import { Mutex } from 'async-mutex';
import lodash from 'lodash';
import { resolve } from 'path';
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json b/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json
index f00ed04e6..561fcee54 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/package.json
@@ -20,10 +20,10 @@
"react-router-dom": "^6.11.2"
},
"peerDependencies": {
- "@nocobase/client": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/client": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "对全部数据或选中的数据进行批量编辑。",
"displayName.zh-CN": "操作：批量编辑",
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditAction.Settings.tsx b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditAction.Settings.tsx
index c9c9621ae..f734177e2 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditAction.Settings.tsx
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditAction.Settings.tsx
@@ -10,7 +10,7 @@ import {
useCompile,
useDesignable,
useSchemaToolbar,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { ModalProps } from 'antd';
import React from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditActionInitializer.tsx b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditActionInitializer.tsx
index 581a8ed49..145f815a6 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditActionInitializer.tsx
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditActionInitializer.tsx
@@ -1,4 +1,4 @@
-import { BlockInitializer, useSchemaInitializerItem } from '@nocobase/client';
+import { BlockInitializer, useSchemaInitializerItem } from '@tachybase/client';
import React from 'react';
export const BulkEditActionInitializer = () => {
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditBlockInitializers.tsx b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditBlockInitializers.tsx
index 61607416c..22bcfed8c 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditBlockInitializers.tsx
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditBlockInitializers.tsx
@@ -1,4 +1,4 @@
-import { CompatibleSchemaInitializer, SchemaInitializer, gridRowColWrap } from '@nocobase/client';
+import { CompatibleSchemaInitializer, SchemaInitializer, gridRowColWrap } from '@tachybase/client';
import { CreateFormBulkEditBlockInitializer } from './CreateFormBulkEditBlockInitializer';
/**
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditFormActionInitializers.tsx b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditFormActionInitializers.tsx
index 2b5257745..a5f14d234 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditFormActionInitializers.tsx
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditFormActionInitializers.tsx
@@ -1,4 +1,4 @@
-import { CompatibleSchemaInitializer, SchemaInitializer } from '@nocobase/client';
+import { CompatibleSchemaInitializer, SchemaInitializer } from '@tachybase/client';
import { BulkEditSubmitActionInitializer } from './BulkEditSubmitActionInitializer';
/**
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditFormItemInitializers.tsx b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditFormItemInitializers.tsx
index 9f42168e4..b492b37a4 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditFormItemInitializers.tsx
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditFormItemInitializers.tsx
@@ -1,4 +1,4 @@
-import { CompatibleSchemaInitializer, gridRowColWrap } from '@nocobase/client';
+import { CompatibleSchemaInitializer, gridRowColWrap } from '@tachybase/client';
import { useCustomBulkEditFormItemInitializerFields } from './utils';
/**
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditSubmitActionInitializer.tsx b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditSubmitActionInitializer.tsx
index 878deb997..89271fb1a 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditSubmitActionInitializer.tsx
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/BulkEditSubmitActionInitializer.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { ActionInitializer } from '@nocobase/client';
+import { ActionInitializer } from '@tachybase/client';
export const BulkEditSubmitActionInitializer = (props) => {
const schema = {
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/CreateFormBulkEditBlockInitializer.tsx b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/CreateFormBulkEditBlockInitializer.tsx
index ab2291b42..d819ddebf 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/CreateFormBulkEditBlockInitializer.tsx
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/CreateFormBulkEditBlockInitializer.tsx
@@ -8,7 +8,7 @@ import {
useSchemaInitializer,
useSchemaInitializerItem,
useSchemaTemplateManager,
-} from '@nocobase/client';
+} from '@tachybase/client';
import React from 'react';
import { createBulkEditBlockUISchema } from './createBulkEditBlockUISchema';
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/schemaInitailizer.test.ts b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/schemaInitailizer.test.ts
index 248b13c7b..9e30ad809 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/schemaInitailizer.test.ts
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/schemaInitailizer.test.ts
@@ -1,4 +1,4 @@
-import { expect, oneEmptyTableBlockWithActions, test } from '@nocobase/test/e2e';
+import { expect, oneEmptyTableBlockWithActions, test } from '@tachybase/test/e2e';
import { oneEmptyGantt } from './utils';
test.describe('TableActionInitializers & GanttActionInitializers & MapActionInitializers should add bulk edit action', () => {
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/schemaSettings.test.ts
index 9e424c76b..4d1767c50 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/schemaSettings.test.ts
@@ -1,4 +1,4 @@
-import { expect, test } from '@nocobase/test/e2e';
+import { expect, test } from '@tachybase/test/e2e';
import { oneEmptyTableBlockWithCustomizeActions } from './utils';
test.describe('bulk edit action setting', () => {
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/utils.ts b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/utils.ts
index 75af4dd96..93b117a08 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/utils.ts
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/__e2e__/utils.ts
@@ -1,4 +1,4 @@
-import { CollectionSetting, PageConfig } from '@nocobase/test/e2e';
+import { CollectionSetting, PageConfig } from '@tachybase/test/e2e';
/**
* 1. 创建一个名为 general 的 collection，其包含 时间、Percent 类型的字段
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/bulkEditFormItemSettings.ts b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/bulkEditFormItemSettings.ts
index 66fcbdec7..19655a9b0 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/bulkEditFormItemSettings.ts
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/bulkEditFormItemSettings.ts
@@ -11,7 +11,7 @@ import {
useFormBlockContext,
useIsFormReadPretty,
useValidateSchema,
-} from '@nocobase/client';
+} from '@tachybase/client';
import _ from 'lodash';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/component/BulkEditField.tsx b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/component/BulkEditField.tsx
index 58e6c8ac8..df487d391 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/component/BulkEditField.tsx
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/component/BulkEditField.tsx
@@ -9,7 +9,7 @@ import {
useCompile,
useComponent,
useFormBlockContext,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { Checkbox, Select, Space } from 'antd';
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/index.tsx b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/index.tsx
index b64ac562d..dd0ad0463 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin, useCollection_deprecated } from '@nocobase/client';
+import { Plugin, useCollection_deprecated } from '@tachybase/client';
import { bulkEditActionSettings, deprecatedBulkEditActionSettings } from './BulkEditAction.Settings';
import { BulkEditActionInitializer } from './BulkEditActionInitializer';
import {
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/locale/index.ts b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/locale/index.ts
index da9aa4d92..3fc5e83ab 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/locale/index.ts
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/locale/index.ts
@@ -1,4 +1,4 @@
-import { i18n } from '@nocobase/client';
+import { i18n } from '@tachybase/client';
import { useTranslation } from 'react-i18next';
export const NAMESPACE = '@nocobase/plugin-bulk-edit';
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/utils.tsx b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/utils.tsx
index 6ee05b0b1..d7f6b596b 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/utils.tsx
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/client/utils.tsx
@@ -8,13 +8,13 @@ import {
useCompile,
useTableBlockContext,
TableFieldResource,
-} from '@nocobase/client';
+} from '@tachybase/client';
import React, { useContext } from 'react';
import { App, message } from 'antd';
import { useNavigate } from 'react-router-dom';
import { SchemaExpressionScopeContext, useField, useForm } from '@tachybase/schema';
import { cloneDeep } from 'lodash';
-import { isURL } from '@nocobase/utils/client';
+import { isURL } from '@tachybase/utils/client';
import { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { BulkEditFormItemValueType } from './component/BulkEditField';
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/server/plugin.ts
index fdf463f46..30623a3c0 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-edit/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-action-bulk-edit/src/server/plugin.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/server';
+import { Plugin } from '@tachybase/server';
export class PluginActionBulkEditServer extends Plugin {}
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/package.json b/packages/plugins/@nocobase/plugin-action-bulk-update/package.json
index c1baae778..38c0604d4 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-update/package.json
+++ b/packages/plugins/@nocobase/plugin-action-bulk-update/package.json
@@ -16,10 +16,10 @@
"react-router-dom": "^6.11.2"
},
"peerDependencies": {
- "@nocobase/client": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/client": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "对全部数据或选中的数据进行批量更新。",
"displayName.zh-CN": "操作：批量更新",
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/BulkUpdateAction.Settings.tsx b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/BulkUpdateAction.Settings.tsx
index 21b147b08..f454b0623 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/BulkUpdateAction.Settings.tsx
+++ b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/BulkUpdateAction.Settings.tsx
@@ -9,7 +9,7 @@ import {
AssignedFieldValues,
useDesignable,
useSchemaToolbar,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { useTranslation } from 'react-i18next';
import React from 'react';
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/BulkUpdateActionInitializer.tsx b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/BulkUpdateActionInitializer.tsx
index fa89e0cab..ee2d33d6c 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/BulkUpdateActionInitializer.tsx
+++ b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/BulkUpdateActionInitializer.tsx
@@ -1,4 +1,4 @@
-import { BlockInitializer, useSchemaInitializerItem } from '@nocobase/client';
+import { BlockInitializer, useSchemaInitializerItem } from '@tachybase/client';
import React from 'react';
export const BulkUpdateActionInitializer = () => {
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/CustomizeActionInitializer.tsx b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/CustomizeActionInitializer.tsx
index 482095fbc..6196fdff6 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/CustomizeActionInitializer.tsx
+++ b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/CustomizeActionInitializer.tsx
@@ -1,4 +1,4 @@
-import { BlockInitializer, useSchemaInitializerItem } from '@nocobase/client';
+import { BlockInitializer, useSchemaInitializerItem } from '@tachybase/client';
import React from 'react';
export const CustomizeActionInitializer = () => {
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/__e2e__/schemaInitailizer.test.ts b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/__e2e__/schemaInitailizer.test.ts
index d29899c60..d9289c06a 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/__e2e__/schemaInitailizer.test.ts
+++ b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/__e2e__/schemaInitailizer.test.ts
@@ -1,4 +1,4 @@
-import { expect, oneEmptyTableBlockWithCustomizeActions, test } from '@nocobase/test/e2e';
+import { expect, oneEmptyTableBlockWithCustomizeActions, test } from '@tachybase/test/e2e';
import { oneEmptyGantt } from './utils';
test.describe('TableActionInitializers & GanttActionInitializers & MapActionInitializers ', () => {
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/__e2e__/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/__e2e__/schemaSettings.test.ts
index af5097940..7b0ec3c9e 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/__e2e__/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/__e2e__/schemaSettings.test.ts
@@ -1,4 +1,4 @@
-import { expect, test } from '@nocobase/test/e2e';
+import { expect, test } from '@tachybase/test/e2e';
import { oneEmptyTableBlockWithCustomizeUpdate } from './utils';
test.describe('data will be updated && Assign field values && after successful submission', () => {
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/__e2e__/utils.ts b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/__e2e__/utils.ts
index 61f7aaae9..c27fed361 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/__e2e__/utils.ts
+++ b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/__e2e__/utils.ts
@@ -1,4 +1,4 @@
-import { CollectionSetting, PageConfig, generalWithM2oSingleSelect } from '@nocobase/test/e2e';
+import { CollectionSetting, PageConfig, generalWithM2oSingleSelect } from '@tachybase/test/e2e';
/**
* 1. 创建一个名为 general 的 collection，其包含 时间、Percent 类型的字段
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/index.tsx b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/index.tsx
index e8ee9a03e..dbdbd84dc 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin, useCollection_deprecated } from '@nocobase/client';
+import { Plugin, useCollection_deprecated } from '@tachybase/client';
import { bulkUpdateActionSettings, deprecatedBulkUpdateActionSettings } from './BulkUpdateAction.Settings';
import { BulkUpdateActionInitializer } from './BulkUpdateActionInitializer';
import { CustomizeActionInitializer } from './CustomizeActionInitializer';
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/locale/index.ts b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/locale/index.ts
index 2028aa4a4..1b29304e1 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/locale/index.ts
+++ b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/locale/index.ts
@@ -1,4 +1,4 @@
-import { i18n } from '@nocobase/client';
+import { i18n } from '@tachybase/client';
import { useTranslation } from 'react-i18next';
export const NAMESPACE = 'bulk-update';
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/utils.tsx b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/utils.tsx
index ff6d77205..7bd2fe63d 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/utils.tsx
+++ b/packages/plugins/@nocobase/plugin-action-bulk-update/src/client/utils.tsx
@@ -10,8 +10,8 @@ import {
useRecord,
useTableBlockContext,
useVariables,
-} from '@nocobase/client';
-import { isURL } from '@nocobase/utils/client';
+} from '@tachybase/client';
+import { isURL } from '@tachybase/utils/client';
import { App, message } from 'antd';
import { useContext } from 'react';
import { useNavigate } from 'react-router-dom';
diff --git a/packages/plugins/@nocobase/plugin-action-bulk-update/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-action-bulk-update/src/server/plugin.ts
index 7292c86de..de486ae54 100644
--- a/packages/plugins/@nocobase/plugin-action-bulk-update/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-action-bulk-update/src/server/plugin.ts
@@ -1,4 +1,4 @@
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { InstallOptions, Plugin } from '@tachybase/server';
export class PluginActionBulkUpdateServer extends Plugin {
afterAdd() {}
diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/package.json b/packages/plugins/@nocobase/plugin-action-duplicate/package.json
index 72de9eb6f..a79279441 100644
--- a/packages/plugins/@nocobase/plugin-action-duplicate/package.json
+++ b/packages/plugins/@nocobase/plugin-action-duplicate/package.json
@@ -17,9 +17,9 @@
"react-i18next": "^11.15.1"
},
"peerDependencies": {
- "@nocobase/client": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*"
+ "@tachybase/client": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*"
},
"description.zh-CN": "复制一条记录，可以复制到表单中编辑后再提交，也可以直接复制并生成一条新记录。",
"displayName.zh-CN": "操作：复制记录",
diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.Settings.tsx b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.Settings.tsx
index 0b9fcfaa5..f29212bbf 100644
--- a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.Settings.tsx
+++ b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.Settings.tsx
@@ -13,7 +13,7 @@ import {
useSchemaToolbar,
useSyncFromForm,
SchemaSettings,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { Tree as AntdTree } from 'antd';
import { cloneDeep } from 'lodash';
import React, { useCallback, useEffect, useMemo, useState } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.tsx b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.tsx
index c2c89b0ff..7ec7eb406 100644
--- a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.tsx
+++ b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateAction.tsx
@@ -16,7 +16,7 @@ import {
useCollectionParentRecordData,
useRecord,
useCollection,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { App, Button } from 'antd';
import React, { useState } from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateActionInitializer.tsx b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateActionInitializer.tsx
index 917c9e641..83a7934bf 100644
--- a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateActionInitializer.tsx
+++ b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicateActionInitializer.tsx
@@ -1,4 +1,4 @@
-import { ActionInitializer } from '@nocobase/client';
+import { ActionInitializer } from '@tachybase/client';
import React from 'react';
export const DuplicateActionInitializer = (props) => {
diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicatePluginProvider.tsx b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicatePluginProvider.tsx
index 1d6f717ce..7d646975a 100644
--- a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicatePluginProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/DuplicatePluginProvider.tsx
@@ -1,4 +1,4 @@
-import { SchemaComponentOptions } from '@nocobase/client';
+import { SchemaComponentOptions } from '@tachybase/client';
import React from 'react';
import { DuplicateActionInitializer } from './DuplicateActionInitializer';
import { DuplicateAction } from './DuplicateAction';
diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/__e2e__/schemaInitailizer.test.ts b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/__e2e__/schemaInitailizer.test.ts
index a9d77f2d6..6ebd7073d 100644
--- a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/__e2e__/schemaInitailizer.test.ts
+++ b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/__e2e__/schemaInitailizer.test.ts
@@ -4,7 +4,7 @@ import {
oneEmptyTableBlockWithActions,
oneEmptyTableBlockWithCustomizeActions,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
test.describe('TableActionColumnInitializers & DetailsActionInitializers & ReadPrettyFormActionInitializers should add duplication action', () => {
test('duplication action in TableActionColumnInitializers', async ({ page, mockPage, mockRecords }) => {
diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/__e2e__/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/__e2e__/schemaSettings.test.ts
index d74999e27..7d973a8fe 100644
--- a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/__e2e__/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/__e2e__/schemaSettings.test.ts
@@ -1,4 +1,4 @@
-import { expect, test } from '@nocobase/test/e2e';
+import { expect, test } from '@tachybase/test/e2e';
import { oneEmptyTableBlockWithDuplicateActions } from './utils';
test.describe('direct duplicate & copy into the form and continue to fill in', () => {
diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/__e2e__/utils.ts b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/__e2e__/utils.ts
index 19c0498c1..4af2a05a9 100644
--- a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/__e2e__/utils.ts
+++ b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/__e2e__/utils.ts
@@ -1,4 +1,4 @@
-import { CollectionSetting, PageConfig, general } from '@nocobase/test/e2e';
+import { CollectionSetting, PageConfig, general } from '@tachybase/test/e2e';
/**
* 1. 创建一个名为 general 的 collection，其包含 时间、Percent 类型的字段
diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/index.ts b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/index.ts
index 264e405ad..492d4541c 100644
--- a/packages/plugins/@nocobase/plugin-action-duplicate/src/client/index.ts
+++ b/packages/plugins/@nocobase/plugin-action-duplicate/src/client/index.ts
@@ -1,4 +1,4 @@
-import { Plugin, useCollection_deprecated } from '@nocobase/client';
+import { Plugin, useCollection_deprecated } from '@tachybase/client';
import { DuplicateAction } from './DuplicateAction';
import { deprecatedDuplicateActionSettings, duplicateActionSettings } from './DuplicateAction.Settings';
import { DuplicateActionInitializer } from './DuplicateActionInitializer';
diff --git a/packages/plugins/@nocobase/plugin-action-duplicate/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-action-duplicate/src/server/plugin.ts
index 683a87443..70675cefd 100644
--- a/packages/plugins/@nocobase/plugin-action-duplicate/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-action-duplicate/src/server/plugin.ts
@@ -1,4 +1,4 @@
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { InstallOptions, Plugin } from '@tachybase/server';
export class PluginActionDuplicateServer extends Plugin {
afterAdd() {}
diff --git a/packages/plugins/@nocobase/plugin-action-print/package.json b/packages/plugins/@nocobase/plugin-action-print/package.json
index dc071ec17..3dc612ee1 100644
--- a/packages/plugins/@nocobase/plugin-action-print/package.json
+++ b/packages/plugins/@nocobase/plugin-action-print/package.json
@@ -13,9 +13,9 @@
"react-to-print": "^2.14.7"
},
"peerDependencies": {
- "@nocobase/client": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*"
+ "@tachybase/client": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*"
},
"description.zh-CN": "调用浏览器的打印功能实现单条数据的打印。",
"displayName.zh-CN": "操作：打印",
diff --git a/packages/plugins/@nocobase/plugin-action-print/src/client/PrintAction.Settings.tsx b/packages/plugins/@nocobase/plugin-action-print/src/client/PrintAction.Settings.tsx
index b853efa5b..3702e94f0 100644
--- a/packages/plugins/@nocobase/plugin-action-print/src/client/PrintAction.Settings.tsx
+++ b/packages/plugins/@nocobase/plugin-action-print/src/client/PrintAction.Settings.tsx
@@ -5,7 +5,7 @@ import {
SchemaSettingsLinkageRules,
useCollection_deprecated,
useSchemaToolbar,
-} from '@nocobase/client';
+} from '@tachybase/client';
const schemaSettingsItems: SchemaSettingsItemType[] = [
{
diff --git a/packages/plugins/@nocobase/plugin-action-print/src/client/PrintActionInitializer.tsx b/packages/plugins/@nocobase/plugin-action-print/src/client/PrintActionInitializer.tsx
index 09f8fbd16..4ae290a36 100644
--- a/packages/plugins/@nocobase/plugin-action-print/src/client/PrintActionInitializer.tsx
+++ b/packages/plugins/@nocobase/plugin-action-print/src/client/PrintActionInitializer.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { ActionInitializer } from '@nocobase/client';
+import { ActionInitializer } from '@tachybase/client';
export const PrintActionInitializer = (props) => {
const schema = {
diff --git a/packages/plugins/@nocobase/plugin-action-print/src/client/PrintActionPluginProvider.tsx b/packages/plugins/@nocobase/plugin-action-print/src/client/PrintActionPluginProvider.tsx
index 0c9b8de49..c42d45a17 100644
--- a/packages/plugins/@nocobase/plugin-action-print/src/client/PrintActionPluginProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-action-print/src/client/PrintActionPluginProvider.tsx
@@ -1,4 +1,4 @@
-import { SchemaComponentOptions } from '@nocobase/client';
+import { SchemaComponentOptions } from '@tachybase/client';
import React from 'react';
import { PrintActionInitializer } from './PrintActionInitializer';
import { useDetailPrintActionProps } from './utils';
diff --git a/packages/plugins/@nocobase/plugin-action-print/src/client/__e2e__/schemaInitailizer.test.ts b/packages/plugins/@nocobase/plugin-action-print/src/client/__e2e__/schemaInitailizer.test.ts
index 16182a2ab..193585685 100644
--- a/packages/plugins/@nocobase/plugin-action-print/src/client/__e2e__/schemaInitailizer.test.ts
+++ b/packages/plugins/@nocobase/plugin-action-print/src/client/__e2e__/schemaInitailizer.test.ts
@@ -1,4 +1,4 @@
-import { expect, test } from '@nocobase/test/e2e';
+import { expect, test } from '@tachybase/test/e2e';
import { oneCalenderWithViewAction, oneTableWithViewAction } from './utils';
test.describe('ReadPrettyFormActionInitializers & CalendarFormActionInitializers should add print action', () => {
diff --git a/packages/plugins/@nocobase/plugin-action-print/src/client/__e2e__/utils.ts b/packages/plugins/@nocobase/plugin-action-print/src/client/__e2e__/utils.ts
index 84ab88f58..126bc38ac 100644
--- a/packages/plugins/@nocobase/plugin-action-print/src/client/__e2e__/utils.ts
+++ b/packages/plugins/@nocobase/plugin-action-print/src/client/__e2e__/utils.ts
@@ -1,4 +1,4 @@
-import { CollectionSetting, PageConfig } from '@nocobase/test/e2e';
+import { CollectionSetting, PageConfig } from '@tachybase/test/e2e';
/**
* 1. 创建一个名为 general 的 collection，其包含 时间、Percent 类型的字段
diff --git a/packages/plugins/@nocobase/plugin-action-print/src/client/index.tsx b/packages/plugins/@nocobase/plugin-action-print/src/client/index.tsx
index 645845abd..98e92f167 100644
--- a/packages/plugins/@nocobase/plugin-action-print/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-action-print/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import { deprecatedPrintActionSettings, printActionSettings } from './PrintAction.Settings';
import { PrintActionPluginProvider } from './PrintActionPluginProvider';
export class PluginActionPrintClient extends Plugin {
diff --git a/packages/plugins/@nocobase/plugin-action-print/src/client/utils.ts b/packages/plugins/@nocobase/plugin-action-print/src/client/utils.ts
index 1412c6f97..9f15aeb3e 100644
--- a/packages/plugins/@nocobase/plugin-action-print/src/client/utils.ts
+++ b/packages/plugins/@nocobase/plugin-action-print/src/client/utils.ts
@@ -1,4 +1,4 @@
-import { useDetailsBlockContext } from '@nocobase/client';
+import { useDetailsBlockContext } from '@tachybase/client';
import { useReactToPrint } from 'react-to-print';
export const useDetailPrintActionProps = () => {
diff --git a/packages/plugins/@nocobase/plugin-action-print/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-action-print/src/server/plugin.ts
index e16415b66..8d00199b5 100644
--- a/packages/plugins/@nocobase/plugin-action-print/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-action-print/src/server/plugin.ts
@@ -1,4 +1,4 @@
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { InstallOptions, Plugin } from '@tachybase/server';
export class PluginActionPrintServer extends Plugin {
afterAdd() {}
diff --git a/packages/plugins/@nocobase/plugin-api-doc/package.json b/packages/plugins/@nocobase/plugin-api-doc/package.json
index 15d8eae42..bc03841ef 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/package.json
+++ b/packages/plugins/@nocobase/plugin-api-doc/package.json
@@ -20,12 +20,12 @@
"swagger-ui-dist": "^5.3.1"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/sdk": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/sdk": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "NocoBase HTTP API 的 OpenAPI 文档生成器。",
"displayName.zh-CN": "API 文档",
diff --git a/packages/plugins/@nocobase/plugin-api-doc/src/client/Document.tsx b/packages/plugins/@nocobase/plugin-api-doc/src/client/Document.tsx
index 2110468d4..d5e36a457 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/src/client/Document.tsx
+++ b/packages/plugins/@nocobase/plugin-api-doc/src/client/Document.tsx
@@ -1,5 +1,5 @@
-import { css, useAPIClient, useApp, useRequest } from '@nocobase/client';
-import { getSubAppName } from '@nocobase/sdk';
+import { css, useAPIClient, useApp, useRequest } from '@tachybase/client';
+import { getSubAppName } from '@tachybase/sdk';
import { Select, Space, Spin, Typography } from 'antd';
import React, { useEffect, useRef, useState } from 'react';
import SwaggerUIBundle from 'swagger-ui-dist/swagger-ui-bundle';
diff --git a/packages/plugins/@nocobase/plugin-api-doc/src/client/index.tsx b/packages/plugins/@nocobase/plugin-api-doc/src/client/index.tsx
index bc8779b50..cd8be6cae 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-api-doc/src/client/index.tsx
@@ -1,5 +1,5 @@
import { RightOutlined } from '@ant-design/icons';
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import { Button, Tooltip } from 'antd';
import { createStyles } from 'antd-style';
import React, { lazy } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-api-doc/src/locale/index.ts b/packages/plugins/@nocobase/plugin-api-doc/src/locale/index.ts
index c5ea2761f..7d4b5754d 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/src/locale/index.ts
+++ b/packages/plugins/@nocobase/plugin-api-doc/src/locale/index.ts
@@ -1,4 +1,4 @@
-import { i18n } from '@nocobase/client';
+import { i18n } from '@tachybase/client';
import { useTranslation as useT } from 'react-i18next';
export const NAMESPACE = 'api-doc';
diff --git a/packages/plugins/@nocobase/plugin-api-doc/src/server/server.ts b/packages/plugins/@nocobase/plugin-api-doc/src/server/server.ts
index a052885f5..388ac40c5 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/src/server/server.ts
+++ b/packages/plugins/@nocobase/plugin-api-doc/src/server/server.ts
@@ -1,5 +1,5 @@
-import { Context } from '@nocobase/actions';
-import { Plugin } from '@nocobase/server';
+import { Context } from '@tachybase/actions';
+import { Plugin } from '@tachybase/server';
import { SwaggerManager } from './swagger';
export class PluginAPIDocServer extends Plugin {
diff --git a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/components/field-type-map.ts b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/components/field-type-map.ts
index 86cf7bb72..cbd0a2529 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/components/field-type-map.ts
+++ b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/components/field-type-map.ts
@@ -1,4 +1,4 @@
-import { Field } from '@nocobase/database';
+import { Field } from '@tachybase/database';
const fieldTypeMap = {
bigint: {
diff --git a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/components/index.ts b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/components/index.ts
index 056b9a404..c3ffe1ac5 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/components/index.ts
+++ b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/components/index.ts
@@ -1,4 +1,4 @@
-import { Collection } from '@nocobase/database';
+import { Collection } from '@tachybase/database';
import schemas from './schemas';
import parameters from './parameters';
diff --git a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/components/parameters.ts b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/components/parameters.ts
index 5fb37c8e1..769ef32fd 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/components/parameters.ts
+++ b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/components/parameters.ts
@@ -1,4 +1,4 @@
-import { Collection } from '@nocobase/database';
+import { Collection } from '@tachybase/database';
import { getTypeByField } from './field-type-map';
export default (collection: Collection) => {
diff --git a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/components/schemas.ts b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/components/schemas.ts
index eed1b7af5..cf823be2b 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/components/schemas.ts
+++ b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/components/schemas.ts
@@ -1,4 +1,4 @@
-import { Collection, Field, RelationField } from '@nocobase/database';
+import { Collection, Field, RelationField } from '@tachybase/database';
import { getTypeByField } from './field-type-map';
import { associationFields } from '../paths/associations';
diff --git a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/index.ts b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/index.ts
index e873888dd..df2946553 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/index.ts
+++ b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/index.ts
@@ -1,4 +1,4 @@
-import { Collection } from '@nocobase/database';
+import { Collection } from '@tachybase/database';
import paths from './paths';
import components from './components';
import tags from './tags';
diff --git a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/paths/associations/index.ts b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/paths/associations/index.ts
index 763ed8565..8cf082e43 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/paths/associations/index.ts
+++ b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/paths/associations/index.ts
@@ -5,7 +5,7 @@ import {
HasManyField,
HasOneField,
RelationField,
-} from '@nocobase/database';
+} from '@tachybase/database';
import multipleAssociation from './multiple-association';
import singleAssociation from './single-association';
import { isViewCollection } from '..';
diff --git a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/paths/associations/multiple-association.ts b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/paths/associations/multiple-association.ts
index dc01c79ec..08e01bb16 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/paths/associations/multiple-association.ts
+++ b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/paths/associations/multiple-association.ts
@@ -1,4 +1,4 @@
-import { BelongsToManyField, Collection, HasManyField } from '@nocobase/database';
+import { BelongsToManyField, Collection, HasManyField } from '@tachybase/database';
import {
CreateActionTemplate,
DestroyActionTemplate,
diff --git a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/paths/associations/single-association.ts b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/paths/associations/single-association.ts
index 0c6f25ea3..6c8702985 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/paths/associations/single-association.ts
+++ b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/paths/associations/single-association.ts
@@ -1,4 +1,4 @@
-import { BelongsToField, Collection, HasOneField } from '@nocobase/database';
+import { BelongsToField, Collection, HasOneField } from '@tachybase/database';
import { appendCollectionIndexParams } from './multiple-association';
import { CreateActionTemplate, DestroyActionTemplate, GetActionTemplate, UpdateActionTemplate } from '../collection';
diff --git a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/paths/collection.ts b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/paths/collection.ts
index 487da1c50..13557f66a 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/paths/collection.ts
+++ b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/paths/collection.ts
@@ -1,4 +1,4 @@
-import { Collection, RelationField } from '@nocobase/database';
+import { Collection, RelationField } from '@tachybase/database';
import { hasSortField, readOnlyCollection } from './index';
type TemplateOptions = {
diff --git a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/paths/index.ts b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/paths/index.ts
index 39e66bf7d..43dfd4f2e 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/paths/index.ts
+++ b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/paths/index.ts
@@ -1,4 +1,4 @@
-import { Collection } from '@nocobase/database';
+import { Collection } from '@tachybase/database';
import list from './collection';
import associations from './associations';
diff --git a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/tags/index.ts b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/tags/index.ts
index 32adcf5ac..ca3cd2303 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/tags/index.ts
+++ b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/collections/tags/index.ts
@@ -1,4 +1,4 @@
-import { Collection } from '@nocobase/database';
+import { Collection } from '@tachybase/database';
import { associationFields } from '../paths/associations';
import { relationTypeToString } from '../paths/collection';
diff --git a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/index.ts b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/index.ts
index 3f56f4daf..e4186735c 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/index.ts
+++ b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/index.ts
@@ -23,7 +23,7 @@ export class SwaggerManager {
async generateSwagger(options: { plugins?: string[] } = {}) {
const base = await this.getBaseSwagger();
- const core = options.plugins ? {} : await loadSwagger('@nocobase/server');
+ const core = options.plugins ? {} : await loadSwagger('@tachybase/server');
const plugins = await this.loadSwaggers(options.plugins);
return merge(merge(core, plugins), base);
}
@@ -78,7 +78,7 @@ export class SwaggerManager {
}
async getCoreSwagger() {
- return merge(await this.getBaseSwagger(), await loadSwagger('@nocobase/server'));
+ return merge(await this.getBaseSwagger(), await loadSwagger('@tachybase/server'));
}
getURL(pathname: string) {
diff --git a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/loader.ts b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/loader.ts
index bb81d941d..8a17c5676 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/loader.ts
+++ b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/loader.ts
@@ -1,4 +1,4 @@
-import { requireModule } from '@nocobase/utils';
+import { requireModule } from '@tachybase/utils';
import { merge } from './merge';
export const loadSwagger = (packageName: string) => {
diff --git a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/merge.ts b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/merge.ts
index 0aadb68ba..83bf84813 100644
--- a/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/merge.ts
+++ b/packages/plugins/@nocobase/plugin-api-doc/src/server/swagger/merge.ts
@@ -1,4 +1,4 @@
-import { merge as deepmerge } from '@nocobase/utils';
+import { merge as deepmerge } from '@tachybase/utils';
const overwriteMerge = (destinationArray, sourceArray, options) => sourceArray.concat(destinationArray);
diff --git a/packages/plugins/@nocobase/plugin-api-keys/package.json b/packages/plugins/@nocobase/plugin-api-keys/package.json
index ca7e285cb..e26a23d9e 100644
--- a/packages/plugins/@nocobase/plugin-api-keys/package.json
+++ b/packages/plugins/@nocobase/plugin-api-keys/package.json
@@ -20,13 +20,13 @@
"react-i18next": "^11.15.1"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/resourcer": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/resourcer": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "允许用户使用 API 密钥访问应用的 HTTP API",
"displayName.zh-CN": "认证：API 密钥",
diff --git a/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/ExpiresSelect.tsx b/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/ExpiresSelect.tsx
index 24bb495cd..25d358fd5 100644
--- a/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/ExpiresSelect.tsx
+++ b/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/ExpiresSelect.tsx
@@ -1,5 +1,5 @@
import { connect, mapProps, mapReadPretty } from '@tachybase/schema';
-import { css, useRecord } from '@nocobase/client';
+import { css, useRecord } from '@tachybase/client';
import { useBoolean } from 'ahooks';
import { DatePicker, Select, Space, Typography } from 'antd';
import dayjs from 'dayjs';
diff --git a/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/index.tsx b/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/index.tsx
index b36ef33b5..f3b8a5096 100644
--- a/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/index.tsx
+++ b/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/index.tsx
@@ -1,5 +1,5 @@
import { RecursionField } from '@tachybase/schema';
-import { SchemaComponentOptions, useCurrentRoles } from '@nocobase/client';
+import { SchemaComponentOptions, useCurrentRoles } from '@tachybase/client';
import React from 'react';
import { ExpiresSelect } from './ExpiresSelect';
import { configurationSchema } from './schema';
diff --git a/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/roles.ts b/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/roles.ts
index 00cb23733..6d60bab84 100644
--- a/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/roles.ts
+++ b/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/roles.ts
@@ -1,4 +1,4 @@
-import { useCurrentRoles } from '@nocobase/client';
+import { useCurrentRoles } from '@tachybase/client';
export const useCurrentRolesProps = () => {
const options = useCurrentRoles();
diff --git a/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/schema.tsx b/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/schema.tsx
index 27999bbf4..ae59731a6 100644
--- a/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/schema.tsx
+++ b/packages/plugins/@nocobase/plugin-api-keys/src/client/Configuration/schema.tsx
@@ -1,6 +1,6 @@
import { ISchema, useForm } from '@tachybase/schema';
import { uid } from '@tachybase/schema';
-import { useActionContext, useBlockRequestContext, useRecord } from '@nocobase/client';
+import { useActionContext, useBlockRequestContext, useRecord } from '@tachybase/client';
import { Alert, Modal, Space, Typography } from 'antd';
import React from 'react';
import { generateNTemplate } from '../../locale';
diff --git a/packages/plugins/@nocobase/plugin-api-keys/src/client/index.tsx b/packages/plugins/@nocobase/plugin-api-keys/src/client/index.tsx
index c16d4168e..15522bc64 100644
--- a/packages/plugins/@nocobase/plugin-api-keys/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-api-keys/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import { NAMESPACE } from '../constants';
import { Configuration } from './Configuration';
diff --git a/packages/plugins/@nocobase/plugin-api-keys/src/client/locale/index.ts b/packages/plugins/@nocobase/plugin-api-keys/src/client/locale/index.ts
index 2b9163b19..9e1ac18ef 100644
--- a/packages/plugins/@nocobase/plugin-api-keys/src/client/locale/index.ts
+++ b/packages/plugins/@nocobase/plugin-api-keys/src/client/locale/index.ts
@@ -1,4 +1,4 @@
-import { i18n } from '@nocobase/client';
+import { i18n } from '@tachybase/client';
import { useTranslation as useT } from 'react-i18next';
import { NAMESPACE } from '../../constants';
diff --git a/packages/plugins/@nocobase/plugin-api-keys/src/collections/apiKeys.ts b/packages/plugins/@nocobase/plugin-api-keys/src/collections/apiKeys.ts
index 2a75a757f..7655b84b2 100644
--- a/packages/plugins/@nocobase/plugin-api-keys/src/collections/apiKeys.ts
+++ b/packages/plugins/@nocobase/plugin-api-keys/src/collections/apiKeys.ts
@@ -1,4 +1,4 @@
-import type { CollectionOptions } from '@nocobase/database';
+import type { CollectionOptions } from '@tachybase/database';
import { generateNTemplate } from '../locale';
export default {
diff --git a/packages/plugins/@nocobase/plugin-api-keys/src/server/__tests__/actions.test.ts b/packages/plugins/@nocobase/plugin-api-keys/src/server/__tests__/actions.test.ts
index 88dcf192b..448252cb3 100644
--- a/packages/plugins/@nocobase/plugin-api-keys/src/server/__tests__/actions.test.ts
+++ b/packages/plugins/@nocobase/plugin-api-keys/src/server/__tests__/actions.test.ts
@@ -1,5 +1,5 @@
-import Database, { Repository } from '@nocobase/database';
-import { createMockServer, MockServer } from '@nocobase/test';
+import Database, { Repository } from '@tachybase/database';
+import { createMockServer, MockServer } from '@tachybase/test';
describe('actions', () => {
let app: MockServer;
diff --git a/packages/plugins/@nocobase/plugin-api-keys/src/server/actions/api-keys.ts b/packages/plugins/@nocobase/plugin-api-keys/src/server/actions/api-keys.ts
index 8bfe82639..05c18a59b 100644
--- a/packages/plugins/@nocobase/plugin-api-keys/src/server/actions/api-keys.ts
+++ b/packages/plugins/@nocobase/plugin-api-keys/src/server/actions/api-keys.ts
@@ -1,5 +1,5 @@
-import actions, { Context, Next } from '@nocobase/actions';
-import { Repository } from '@nocobase/database';
+import actions, { Context, Next } from '@tachybase/actions';
+import { Repository } from '@tachybase/database';
export async function create(ctx: Context, next: Next) {
const { values } = ctx.action.params;
diff --git a/packages/plugins/@nocobase/plugin-api-keys/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-api-keys/src/server/plugin.ts
index 6314e8579..9858f3910 100644
--- a/packages/plugins/@nocobase/plugin-api-keys/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-api-keys/src/server/plugin.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/server';
+import { Plugin } from '@tachybase/server';
import { create, destroy } from './actions/api-keys';
export class PluginAPIKeysServer extends Plugin {
diff --git a/packages/plugins/@nocobase/plugin-auth/README.md b/packages/plugins/@nocobase/plugin-auth/README.md
index 7fb8535a6..8e4cefdd0 100644
--- a/packages/plugins/@nocobase/plugin-auth/README.md
+++ b/packages/plugins/@nocobase/plugin-auth/README.md
@@ -37,7 +37,7 @@ Nocobase内核提供了扩展登录方式的接入和管理。扩展登录插件
参考`core/auth/auth.ts`
```TypeScript
-import { Auth } from '@nocobase/auth';
+import { Auth } from '@tachybase/auth';
class CustomAuth extends Auth {
set user(user) {}
@@ -51,7 +51,7 @@ class CustomAuth extends Auth {
多数情况下，扩展的用户登录方式也将沿用现有的jwt逻辑来生成用户访问API的凭证，插件也可以继承`BaseAuth`类以便复用部分逻辑代码，如`check`, `signIn`接口。
```TypeScript
-import { BaseAuth } from '@nocobase/auth';
+import { BaseAuth } from '@tachybase/auth';
class CustomAuth extends BaseAuth {
constructor(config: AuthConfig) {
diff --git a/packages/plugins/@nocobase/plugin-auth/package.json b/packages/plugins/@nocobase/plugin-auth/package.json
index d51d5d473..b2f591664 100644
--- a/packages/plugins/@nocobase/plugin-auth/package.json
+++ b/packages/plugins/@nocobase/plugin-auth/package.json
@@ -20,14 +20,14 @@
"react-router-dom": "^6.11.2"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/auth": "workspace:*",
- "@nocobase/cache": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/auth": "workspace:*",
+ "@tachybase/cache": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "用户认证管理，包括基础的密码认证、短信认证、SSO 协议的认证等，可扩展。",
"displayName.zh-CN": "用户认证",
diff --git a/packages/plugins/@nocobase/plugin-auth/src/client/AuthProvider.tsx b/packages/plugins/@nocobase/plugin-auth/src/client/AuthProvider.tsx
index e5597ac7e..e433d0f50 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/client/AuthProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-auth/src/client/AuthProvider.tsx
@@ -1,4 +1,4 @@
-import { useAPIClient } from '@nocobase/client';
+import { useAPIClient } from '@tachybase/client';
import React, { useEffect } from 'react';
import { useLocation } from 'react-router-dom';
diff --git a/packages/plugins/@nocobase/plugin-auth/src/client/__e2e__/auth.test.ts b/packages/plugins/@nocobase/plugin-auth/src/client/__e2e__/auth.test.ts
index 6d25e9ff2..507d80198 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/client/__e2e__/auth.test.ts
+++ b/packages/plugins/@nocobase/plugin-auth/src/client/__e2e__/auth.test.ts
@@ -1,4 +1,4 @@
-import { expect, test } from '@nocobase/test/e2e';
+import { expect, test } from '@tachybase/test/e2e';
test.describe('auth', () => {
// 重置登录状态
diff --git a/packages/plugins/@nocobase/plugin-auth/src/client/basic/Options.tsx b/packages/plugins/@nocobase/plugin-auth/src/client/basic/Options.tsx
index 93a99d0c6..fd25aafd0 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/client/basic/Options.tsx
+++ b/packages/plugins/@nocobase/plugin-auth/src/client/basic/Options.tsx
@@ -1,4 +1,4 @@
-import { SchemaComponent } from '@nocobase/client';
+import { SchemaComponent } from '@tachybase/client';
import React from 'react';
import { useAuthTranslation } from '../locale';
import { Alert } from 'antd';
diff --git a/packages/plugins/@nocobase/plugin-auth/src/client/basic/SignInForm.tsx b/packages/plugins/@nocobase/plugin-auth/src/client/basic/SignInForm.tsx
index 766c49dfb..372a47dfe 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/client/basic/SignInForm.tsx
+++ b/packages/plugins/@nocobase/plugin-auth/src/client/basic/SignInForm.tsx
@@ -1,5 +1,5 @@
import { ISchema } from '@tachybase/schema';
-import { SchemaComponent, useAPIClient, useCurrentUserContext } from '@nocobase/client';
+import { SchemaComponent, useAPIClient, useCurrentUserContext } from '@tachybase/client';
import React, { useCallback } from 'react';
import { useAuthTranslation } from '../locale';
import { useNavigate, useSearchParams } from 'react-router-dom';
diff --git a/packages/plugins/@nocobase/plugin-auth/src/client/basic/SignUpForm.tsx b/packages/plugins/@nocobase/plugin-auth/src/client/basic/SignUpForm.tsx
index f4ad4402a..3734cc9ce 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/client/basic/SignUpForm.tsx
+++ b/packages/plugins/@nocobase/plugin-auth/src/client/basic/SignUpForm.tsx
@@ -1,9 +1,9 @@
-import { SchemaComponent } from '@nocobase/client';
+import { SchemaComponent } from '@tachybase/client';
import { ISchema } from '@tachybase/schema';
import React from 'react';
import { uid } from '@tachybase/schema';
import { useAuthTranslation } from '../locale';
-import { useAPIClient } from '@nocobase/client';
+import { useAPIClient } from '@tachybase/client';
import { useForm } from '@tachybase/schema';
import { useNavigate, Navigate } from 'react-router-dom';
import { message } from 'antd';
diff --git a/packages/plugins/@nocobase/plugin-auth/src/client/index.tsx b/packages/plugins/@nocobase/plugin-auth/src/client/index.tsx
index bf5ec0971..c5a706e7f 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-auth/src/client/index.tsx
@@ -1,5 +1,5 @@
-import { Plugin } from '@nocobase/client';
-import { Registry } from '@nocobase/utils/client';
+import { Plugin } from '@tachybase/client';
+import { Registry } from '@tachybase/utils/client';
import { ComponentType } from 'react';
import { presetAuthType } from '../preset';
import { AuthProvider } from './AuthProvider';
diff --git a/packages/plugins/@nocobase/plugin-auth/src/client/pages/AuthLayout.tsx b/packages/plugins/@nocobase/plugin-auth/src/client/pages/AuthLayout.tsx
index 096af3fd5..37fd23c08 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/client/pages/AuthLayout.tsx
+++ b/packages/plugins/@nocobase/plugin-auth/src/client/pages/AuthLayout.tsx
@@ -1,7 +1,7 @@
import { css } from '@emotion/css';
import React from 'react';
import { Outlet } from 'react-router-dom';
-import { useSystemSettings, PoweredByV2 as PoweredBy, useRequest, useAPIClient } from '@nocobase/client';
+import { useSystemSettings, PoweredByV2 as PoweredBy, useRequest, useAPIClient } from '@tachybase/client';
import { AuthenticatorsContext } from '../authenticator';
export function AuthLayout(props: any) {
diff --git a/packages/plugins/@nocobase/plugin-auth/src/client/pages/SignInPage.tsx b/packages/plugins/@nocobase/plugin-auth/src/client/pages/SignInPage.tsx
index 9ad740b69..84c416681 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/client/pages/SignInPage.tsx
+++ b/packages/plugins/@nocobase/plugin-auth/src/client/pages/SignInPage.tsx
@@ -1,7 +1,7 @@
import { css } from '@emotion/css';
import { Space, Tabs } from 'antd';
import React, { createElement, useContext } from 'react';
-import { useCurrentDocumentTitle, usePlugin, useViewport } from '@nocobase/client';
+import { useCurrentDocumentTitle, usePlugin, useViewport } from '@tachybase/client';
import AuthPlugin, { AuthOptions } from '..';
import { Authenticator, AuthenticatorsContext } from '../authenticator';
import { useAuthTranslation } from '../locale';
diff --git a/packages/plugins/@nocobase/plugin-auth/src/client/pages/SignUpPage.tsx b/packages/plugins/@nocobase/plugin-auth/src/client/pages/SignUpPage.tsx
index b95f54a41..96b9d8dd0 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/client/pages/SignUpPage.tsx
+++ b/packages/plugins/@nocobase/plugin-auth/src/client/pages/SignUpPage.tsx
@@ -1,4 +1,4 @@
-import { useCurrentDocumentTitle, usePlugin, useViewport } from '@nocobase/client';
+import { useCurrentDocumentTitle, usePlugin, useViewport } from '@tachybase/client';
import React, { useContext, createContext, FunctionComponent, createElement } from 'react';
import { Navigate, useSearchParams } from 'react-router-dom';
import AuthPlugin, { AuthOptions } from '..';
diff --git a/packages/plugins/@nocobase/plugin-auth/src/client/settings/Authenticator.tsx b/packages/plugins/@nocobase/plugin-auth/src/client/settings/Authenticator.tsx
index 4a613d05c..a0c6d50d8 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/client/settings/Authenticator.tsx
+++ b/packages/plugins/@nocobase/plugin-auth/src/client/settings/Authenticator.tsx
@@ -5,7 +5,7 @@ import {
useActionContext,
useAsyncData,
useRequest,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { Card } from 'antd';
import React, { useState } from 'react';
import { authenticatorsSchema, createFormSchema } from './schemas/authenticators';
diff --git a/packages/plugins/@nocobase/plugin-auth/src/client/settings/Options.tsx b/packages/plugins/@nocobase/plugin-auth/src/client/settings/Options.tsx
index 5b1780820..00fb2687c 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/client/settings/Options.tsx
+++ b/packages/plugins/@nocobase/plugin-auth/src/client/settings/Options.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { observer, useForm } from '@tachybase/schema';
-import { useActionContext, usePlugin, useRecord, useRequest } from '@nocobase/client';
+import { useActionContext, usePlugin, useRecord, useRequest } from '@tachybase/client';
import { useEffect } from 'react';
import AuthPlugin from '..';
diff --git a/packages/plugins/@nocobase/plugin-auth/src/client/settings/schemas/authenticators.ts b/packages/plugins/@nocobase/plugin-auth/src/client/settings/schemas/authenticators.ts
index fe14caf1a..7276c0300 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/client/settings/schemas/authenticators.ts
+++ b/packages/plugins/@nocobase/plugin-auth/src/client/settings/schemas/authenticators.ts
@@ -1,6 +1,6 @@
import { ISchema } from '@tachybase/schema';
import { uid } from '@tachybase/schema';
-import { i18n, useAPIClient, useActionContext, useRequest } from '@nocobase/client';
+import { i18n, useAPIClient, useActionContext, useRequest } from '@tachybase/client';
import { message } from 'antd';
import { useContext } from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@nocobase/plugin-auth/src/server/__tests__/actions.test.ts b/packages/plugins/@nocobase/plugin-auth/src/server/__tests__/actions.test.ts
index ae8cf0d4d..2108669a4 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/server/__tests__/actions.test.ts
+++ b/packages/plugins/@nocobase/plugin-auth/src/server/__tests__/actions.test.ts
@@ -1,5 +1,5 @@
-import Database, { Repository } from '@nocobase/database';
-import { createMockServer, MockServer } from '@nocobase/test';
+import Database, { Repository } from '@tachybase/database';
+import { createMockServer, MockServer } from '@tachybase/test';
describe('actions', () => {
describe('authenticators', () => {
diff --git a/packages/plugins/@nocobase/plugin-auth/src/server/__tests__/auth.test.ts b/packages/plugins/@nocobase/plugin-auth/src/server/__tests__/auth.test.ts
index d1fb37171..9d1daf7f7 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/server/__tests__/auth.test.ts
+++ b/packages/plugins/@nocobase/plugin-auth/src/server/__tests__/auth.test.ts
@@ -1,6 +1,6 @@
-import { BaseAuth } from '@nocobase/auth';
-import { Database, Model } from '@nocobase/database';
-import { MockServer, createMockServer } from '@nocobase/test';
+import { BaseAuth } from '@tachybase/auth';
+import { Database, Model } from '@tachybase/database';
+import { MockServer, createMockServer } from '@tachybase/test';
describe('auth', () => {
let auth: BaseAuth;
diff --git a/packages/plugins/@nocobase/plugin-auth/src/server/__tests__/storer.test.ts b/packages/plugins/@nocobase/plugin-auth/src/server/__tests__/storer.test.ts
index 98500dbf2..8cc4eb50f 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/server/__tests__/storer.test.ts
+++ b/packages/plugins/@nocobase/plugin-auth/src/server/__tests__/storer.test.ts
@@ -1,4 +1,4 @@
-import { Cache, CacheManager } from '@nocobase/cache';
+import { Cache, CacheManager } from '@tachybase/cache';
import { Storer } from '../storer';
class MockDB {
diff --git a/packages/plugins/@nocobase/plugin-auth/src/server/__tests__/token-blacklist.test.ts b/packages/plugins/@nocobase/plugin-auth/src/server/__tests__/token-blacklist.test.ts
index a885cc1b0..fa21fc91a 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/server/__tests__/token-blacklist.test.ts
+++ b/packages/plugins/@nocobase/plugin-auth/src/server/__tests__/token-blacklist.test.ts
@@ -1,6 +1,6 @@
-import { ITokenBlacklistService } from '@nocobase/auth';
-import Database, { Repository } from '@nocobase/database';
-import { MockServer, createMockServer } from '@nocobase/test';
+import { ITokenBlacklistService } from '@tachybase/auth';
+import Database, { Repository } from '@tachybase/database';
+import { MockServer, createMockServer } from '@tachybase/test';
describe('token-blacklist', () => {
let app: MockServer;
diff --git a/packages/plugins/@nocobase/plugin-auth/src/server/actions/auth.ts b/packages/plugins/@nocobase/plugin-auth/src/server/actions/auth.ts
index ed204a5d9..62eb9b4e0 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/server/actions/auth.ts
+++ b/packages/plugins/@nocobase/plugin-auth/src/server/actions/auth.ts
@@ -1,4 +1,4 @@
-import { Context, Next } from '@nocobase/actions';
+import { Context, Next } from '@tachybase/actions';
export default {
lostPassword: async (ctx: Context, next: Next) => {
diff --git a/packages/plugins/@nocobase/plugin-auth/src/server/actions/authenticators.ts b/packages/plugins/@nocobase/plugin-auth/src/server/actions/authenticators.ts
index 7510b8008..2e54001e0 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/server/actions/authenticators.ts
+++ b/packages/plugins/@nocobase/plugin-auth/src/server/actions/authenticators.ts
@@ -1,7 +1,7 @@
-import { Context, Next } from '@nocobase/actions';
-import { Model, Repository } from '@nocobase/database';
+import { Context, Next } from '@tachybase/actions';
+import { Model, Repository } from '@tachybase/database';
import { namespace } from '../../preset';
-import { AuthManager } from '@nocobase/auth';
+import { AuthManager } from '@tachybase/auth';
async function checkCount(repository: Repository, id: number[]) {
// TODO(yangqia): This is a temporary solution, may cause concurrency problem.
diff --git a/packages/plugins/@nocobase/plugin-auth/src/server/basic-auth.ts b/packages/plugins/@nocobase/plugin-auth/src/server/basic-auth.ts
index 053e20561..633517464 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/server/basic-auth.ts
+++ b/packages/plugins/@nocobase/plugin-auth/src/server/basic-auth.ts
@@ -1,5 +1,5 @@
-import { AuthConfig, BaseAuth } from '@nocobase/auth';
-import { PasswordField } from '@nocobase/database';
+import { AuthConfig, BaseAuth } from '@tachybase/auth';
+import { PasswordField } from '@tachybase/database';
import crypto from 'crypto';
import { namespace } from '../preset';
diff --git a/packages/plugins/@nocobase/plugin-auth/src/server/collections/authenticators.ts b/packages/plugins/@nocobase/plugin-auth/src/server/collections/authenticators.ts
index e77e07e69..8109dcd8a 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/server/collections/authenticators.ts
+++ b/packages/plugins/@nocobase/plugin-auth/src/server/collections/authenticators.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
/**
* Collection for extended authentication methods,
diff --git a/packages/plugins/@nocobase/plugin-auth/src/server/collections/token-blacklist.ts b/packages/plugins/@nocobase/plugin-auth/src/server/collections/token-blacklist.ts
index d3bb3d866..af5abecf4 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/server/collections/token-blacklist.ts
+++ b/packages/plugins/@nocobase/plugin-auth/src/server/collections/token-blacklist.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
dumpRules: {
diff --git a/packages/plugins/@nocobase/plugin-auth/src/server/collections/users-authenticators.ts b/packages/plugins/@nocobase/plugin-auth/src/server/collections/users-authenticators.ts
index 3111710a3..24b7249df 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/server/collections/users-authenticators.ts
+++ b/packages/plugins/@nocobase/plugin-auth/src/server/collections/users-authenticators.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
/**
* Collection for user information of extended authentication methods,
diff --git a/packages/plugins/@nocobase/plugin-auth/src/server/migrations/20230506152253-basic-authenticator.ts b/packages/plugins/@nocobase/plugin-auth/src/server/migrations/20230506152253-basic-authenticator.ts
index a9e7a4ce6..40fc874d6 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/server/migrations/20230506152253-basic-authenticator.ts
+++ b/packages/plugins/@nocobase/plugin-auth/src/server/migrations/20230506152253-basic-authenticator.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
import { presetAuthType, presetAuthenticator } from '../../preset';
export default class AddBasicAuthMigration extends Migration {
diff --git a/packages/plugins/@nocobase/plugin-auth/src/server/migrations/20230607174500-update-basic.ts b/packages/plugins/@nocobase/plugin-auth/src/server/migrations/20230607174500-update-basic.ts
index e2a887cb6..00e4eefe1 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/server/migrations/20230607174500-update-basic.ts
+++ b/packages/plugins/@nocobase/plugin-auth/src/server/migrations/20230607174500-update-basic.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
import { presetAuthenticator } from '../../preset';
export default class UpdateBasicAuthMigration extends Migration {
diff --git a/packages/plugins/@nocobase/plugin-auth/src/server/migrations/20231218132032-fix-allow-signup.ts b/packages/plugins/@nocobase/plugin-auth/src/server/migrations/20231218132032-fix-allow-signup.ts
index ecab69d83..198ba88c4 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/server/migrations/20231218132032-fix-allow-signup.ts
+++ b/packages/plugins/@nocobase/plugin-auth/src/server/migrations/20231218132032-fix-allow-signup.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
import { presetAuthType } from '../../preset';
export default class FixAllowSignUpMigration extends Migration {
diff --git a/packages/plugins/@nocobase/plugin-auth/src/server/model/authenticator.ts b/packages/plugins/@nocobase/plugin-auth/src/server/model/authenticator.ts
index 5c2c2ed1f..d5414a45d 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/server/model/authenticator.ts
+++ b/packages/plugins/@nocobase/plugin-auth/src/server/model/authenticator.ts
@@ -1,5 +1,5 @@
-import { Authenticator } from '@nocobase/auth';
-import { Database, Model } from '@nocobase/database';
+import { Authenticator } from '@tachybase/auth';
+import { Database, Model } from '@tachybase/database';
export class AuthModel extends Model implements Authenticator {
declare authType: string;
diff --git a/packages/plugins/@nocobase/plugin-auth/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-auth/src/server/plugin.ts
index 5c42e737e..1d3725ac5 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-auth/src/server/plugin.ts
@@ -1,6 +1,6 @@
-import { Cache } from '@nocobase/cache';
-import { Model } from '@nocobase/database';
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { Cache } from '@tachybase/cache';
+import { Model } from '@tachybase/database';
+import { InstallOptions, Plugin } from '@tachybase/server';
import { resolve } from 'path';
import { namespace, presetAuthType, presetAuthenticator } from '../preset';
import authActions from './actions/auth';
@@ -55,8 +55,8 @@ export class PluginAuthServer extends Plugin {
title: 'Password',
});
// Register actions
- Object.entries(authActions).forEach(
- ([action, handler]) => this.app.resourcer.getResource('auth')?.addAction(action, handler),
+ Object.entries(authActions).forEach(([action, handler]) =>
+ this.app.resourcer.getResource('auth')?.addAction(action, handler),
);
Object.entries(authenticatorsActions).forEach(([action, handler]) =>
this.app.resourcer.registerAction(`authenticators:${action}`, handler),
diff --git a/packages/plugins/@nocobase/plugin-auth/src/server/storer.ts b/packages/plugins/@nocobase/plugin-auth/src/server/storer.ts
index 3d1703a9e..9d273b383 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/server/storer.ts
+++ b/packages/plugins/@nocobase/plugin-auth/src/server/storer.ts
@@ -1,6 +1,6 @@
-import { Storer as IStorer } from '@nocobase/auth';
-import { Cache } from '@nocobase/cache';
-import { Database, Model } from '@nocobase/database';
+import { Storer as IStorer } from '@tachybase/auth';
+import { Cache } from '@tachybase/cache';
+import { Database, Model } from '@tachybase/database';
import { AuthModel } from './model/authenticator';
export class Storer implements IStorer {
diff --git a/packages/plugins/@nocobase/plugin-auth/src/server/token-blacklist.ts b/packages/plugins/@nocobase/plugin-auth/src/server/token-blacklist.ts
index 56b498003..168cf87f3 100644
--- a/packages/plugins/@nocobase/plugin-auth/src/server/token-blacklist.ts
+++ b/packages/plugins/@nocobase/plugin-auth/src/server/token-blacklist.ts
@@ -1,8 +1,8 @@
-import { ITokenBlacklistService } from '@nocobase/auth';
-import { Repository } from '@nocobase/database';
+import { ITokenBlacklistService } from '@tachybase/auth';
+import { Repository } from '@tachybase/database';
import { CronJob } from 'cron';
import AuthPlugin from './plugin';
-import { BloomFilter } from '@nocobase/cache';
+import { BloomFilter } from '@tachybase/cache';
export class TokenBlacklistService implements ITokenBlacklistService {
repo: Repository;
diff --git a/packages/plugins/@nocobase/plugin-backup-restore/package.json b/packages/plugins/@nocobase/plugin-backup-restore/package.json
index 405ce1fc4..407698f55 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/package.json
+++ b/packages/plugins/@nocobase/plugin-backup-restore/package.json
@@ -38,12 +38,12 @@
"tar": "^6.1.13"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "备份和还原应用，可用于应用的复制、迁移、升级等场景。",
"displayName.zh-CN": "应用的备份与还原",
diff --git a/packages/plugins/@nocobase/plugin-backup-restore/src/client/Configuration.tsx b/packages/plugins/@nocobase/plugin-backup-restore/src/client/Configuration.tsx
index e0113cc4e..b4e2c5bcf 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/src/client/Configuration.tsx
+++ b/packages/plugins/@nocobase/plugin-backup-restore/src/client/Configuration.tsx
@@ -1,6 +1,6 @@
import { InboxOutlined, PlusOutlined, ReloadOutlined, UploadOutlined } from '@ant-design/icons';
import { FormItem } from '@tachybase/components';
-import { Checkbox, DatePicker, useAPIClient, useCompile } from '@nocobase/client';
+import { Checkbox, DatePicker, useAPIClient, useCompile } from '@tachybase/client';
import { Alert, App, Button, Card, Divider, Modal, Space, Spin, Table, Tabs, Upload, UploadProps, message } from 'antd';
import { saveAs } from 'file-saver';
import React, { useEffect, useMemo, useState } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-backup-restore/src/client/DuplicatorProvider.tsx b/packages/plugins/@nocobase/plugin-backup-restore/src/client/DuplicatorProvider.tsx
index 4ea6cb9d1..e5f546b35 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/src/client/DuplicatorProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-backup-restore/src/client/DuplicatorProvider.tsx
@@ -1,4 +1,4 @@
-import { SchemaComponentOptions, CurrentAppInfoProvider } from '@nocobase/client';
+import { SchemaComponentOptions, CurrentAppInfoProvider } from '@tachybase/client';
import React, { FC } from 'react';
export const DuplicatorProvider: FC = function (props) {
diff --git a/packages/plugins/@nocobase/plugin-backup-restore/src/client/index.tsx b/packages/plugins/@nocobase/plugin-backup-restore/src/client/index.tsx
index 8ea08dbb2..2d9c5888f 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-backup-restore/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import { BackupAndRestoreList } from './Configuration';
import { DuplicatorProvider } from './DuplicatorProvider';
import { NAMESPACE } from './locale';
diff --git a/packages/plugins/@nocobase/plugin-backup-restore/src/client/locale/index.ts b/packages/plugins/@nocobase/plugin-backup-restore/src/client/locale/index.ts
index 8f2d42f15..fc15d6208 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/src/client/locale/index.ts
+++ b/packages/plugins/@nocobase/plugin-backup-restore/src/client/locale/index.ts
@@ -1,4 +1,4 @@
-import { i18n } from '@nocobase/client';
+import { i18n } from '@tachybase/client';
import { useTranslation } from 'react-i18next';
export const NAMESPACE = 'backup-restore';
diff --git a/packages/plugins/@nocobase/plugin-backup-restore/src/server/__tests__/api.test.ts b/packages/plugins/@nocobase/plugin-backup-restore/src/server/__tests__/api.test.ts
index 691a6584a..903aa8046 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/src/server/__tests__/api.test.ts
+++ b/packages/plugins/@nocobase/plugin-backup-restore/src/server/__tests__/api.test.ts
@@ -1,4 +1,4 @@
-import { MockServer, waitSecond } from '@nocobase/test';
+import { MockServer, waitSecond } from '@tachybase/test';
import { Dumper } from '../dumper';
import createApp from './index';
@@ -169,7 +169,7 @@ describe('backup files', () => {
name: 'test',
title: '测试',
group: 'custom',
- origin:'@nocobase/plugin-collection-manager',
+ origin: '@nocobase/plugin-collection-manager',
});
});
});
diff --git a/packages/plugins/@nocobase/plugin-backup-restore/src/server/__tests__/dump-action.test.ts b/packages/plugins/@nocobase/plugin-backup-restore/src/server/__tests__/dump-action.test.ts
index 8cd0772af..e4ed5d28f 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/src/server/__tests__/dump-action.test.ts
+++ b/packages/plugins/@nocobase/plugin-backup-restore/src/server/__tests__/dump-action.test.ts
@@ -1,5 +1,5 @@
-import { Database } from '@nocobase/database';
-import { MockServer, createMockServer } from '@nocobase/test';
+import { Database } from '@tachybase/database';
+import { MockServer, createMockServer } from '@tachybase/test';
import fsPromises from 'fs/promises';
import * as os from 'os';
import path from 'path';
diff --git a/packages/plugins/@nocobase/plugin-backup-restore/src/server/__tests__/dumper.test.ts b/packages/plugins/@nocobase/plugin-backup-restore/src/server/__tests__/dumper.test.ts
index 4b3952ec2..e1c3f5c23 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/src/server/__tests__/dumper.test.ts
+++ b/packages/plugins/@nocobase/plugin-backup-restore/src/server/__tests__/dumper.test.ts
@@ -1,5 +1,5 @@
-import { Database } from '@nocobase/database';
-import { MockServer } from '@nocobase/test';
+import { Database } from '@tachybase/database';
+import { MockServer } from '@tachybase/test';
import fs from 'fs';
import path from 'path';
import { Dumper } from '../dumper';
@@ -806,7 +806,7 @@ describe('dumper', () => {
const dumpableCollections = await dumper.dumpableCollections();
const applicationPlugins = dumpableCollections.find(({ name }) => name === 'applicationPlugins');
- expect(applicationPlugins.origin).toBe('@nocobase/server');
+ expect(applicationPlugins.origin).toBe('@tachybase/server');
});
it('should get custom collections group', async () => {
diff --git a/packages/plugins/@nocobase/plugin-backup-restore/src/server/__tests__/index.ts b/packages/plugins/@nocobase/plugin-backup-restore/src/server/__tests__/index.ts
index 83672fccf..fc4247279 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/src/server/__tests__/index.ts
+++ b/packages/plugins/@nocobase/plugin-backup-restore/src/server/__tests__/index.ts
@@ -1,4 +1,4 @@
-import { createMockServer } from '@nocobase/test';
+import { createMockServer } from '@tachybase/test';
export default async function createApp() {
const app = await createMockServer({
diff --git a/packages/plugins/@nocobase/plugin-backup-restore/src/server/__tests__/on-dump.test.ts b/packages/plugins/@nocobase/plugin-backup-restore/src/server/__tests__/on-dump.test.ts
index aace1da75..52529c571 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/src/server/__tests__/on-dump.test.ts
+++ b/packages/plugins/@nocobase/plugin-backup-restore/src/server/__tests__/on-dump.test.ts
@@ -1,5 +1,5 @@
-import { MockServer } from '@nocobase/test';
-import { Collection, Database } from '@nocobase/database';
+import { MockServer } from '@tachybase/test';
+import { Collection, Database } from '@tachybase/database';
import createApp from './index';
import { Dumper } from '../dumper';
import { Restorer } from '../restorer';
diff --git a/packages/plugins/@nocobase/plugin-backup-restore/src/server/app-migrator.ts b/packages/plugins/@nocobase/plugin-backup-restore/src/server/app-migrator.ts
index 49a1eacf1..291537802 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/src/server/app-migrator.ts
+++ b/packages/plugins/@nocobase/plugin-backup-restore/src/server/app-migrator.ts
@@ -1,5 +1,5 @@
-import { Application } from '@nocobase/server';
-import { applyMixins, AsyncEmitter } from '@nocobase/utils';
+import { Application } from '@tachybase/server';
+import { applyMixins, AsyncEmitter } from '@tachybase/utils';
import crypto from 'crypto';
import EventEmitter from 'events';
import fsPromises from 'fs/promises';
diff --git a/packages/plugins/@nocobase/plugin-backup-restore/src/server/collection-group-manager.ts b/packages/plugins/@nocobase/plugin-backup-restore/src/server/collection-group-manager.ts
index 40bda315f..f707ff704 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/src/server/collection-group-manager.ts
+++ b/packages/plugins/@nocobase/plugin-backup-restore/src/server/collection-group-manager.ts
@@ -1,4 +1,4 @@
-import { CollectionGroup } from '@nocobase/database';
+import { CollectionGroup } from '@tachybase/database';
export class CollectionGroupManager {
static collectionGroups: CollectionGroup[] = [];
diff --git a/packages/plugins/@nocobase/plugin-backup-restore/src/server/commands/restore-command.ts b/packages/plugins/@nocobase/plugin-backup-restore/src/server/commands/restore-command.ts
index f8800d80f..e1e51bd20 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/src/server/commands/restore-command.ts
+++ b/packages/plugins/@nocobase/plugin-backup-restore/src/server/commands/restore-command.ts
@@ -1,6 +1,6 @@
-import { Application, AppSupervisor } from '@nocobase/server';
+import { Application, AppSupervisor } from '@tachybase/server';
import { Restorer } from '../restorer';
-import { DumpRulesGroupType } from '@nocobase/database';
+import { DumpRulesGroupType } from '@tachybase/database';
export default function addRestoreCommand(app: Application) {
app
diff --git a/packages/plugins/@nocobase/plugin-backup-restore/src/server/dumper.ts b/packages/plugins/@nocobase/plugin-backup-restore/src/server/dumper.ts
index dbcfd373d..2ba5feb75 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/src/server/dumper.ts
+++ b/packages/plugins/@nocobase/plugin-backup-restore/src/server/dumper.ts
@@ -1,4 +1,8 @@
-import { Collection, CollectionGroupManager as DBCollectionGroupManager, DumpRulesGroupType } from '@nocobase/database';
+import {
+ Collection,
+ CollectionGroupManager as DBCollectionGroupManager,
+ DumpRulesGroupType,
+} from '@tachybase/database';
import archiver from 'archiver';
import dayjs from 'dayjs';
import fs from 'fs';
diff --git a/packages/plugins/@nocobase/plugin-backup-restore/src/server/field-value-writer.ts b/packages/plugins/@nocobase/plugin-backup-restore/src/server/field-value-writer.ts
index 946a679c7..bf5df6f1a 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/src/server/field-value-writer.ts
+++ b/packages/plugins/@nocobase/plugin-backup-restore/src/server/field-value-writer.ts
@@ -1,4 +1,4 @@
-import { DataTypes, Field } from '@nocobase/database';
+import { DataTypes, Field } from '@tachybase/database';
import lodash from 'lodash';
type WriterFunc = (val: any) => any;
diff --git a/packages/plugins/@nocobase/plugin-backup-restore/src/server/resourcers/backup-files.ts b/packages/plugins/@nocobase/plugin-backup-restore/src/server/resourcers/backup-files.ts
index e8f5a5bb7..4edfbeb4f 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/src/server/resourcers/backup-files.ts
+++ b/packages/plugins/@nocobase/plugin-backup-restore/src/server/resourcers/backup-files.ts
@@ -1,12 +1,12 @@
import { Dumper } from '../dumper';
-import { DumpRulesGroupType } from '@nocobase/database';
+import { DumpRulesGroupType } from '@tachybase/database';
import fs from 'fs';
-import { koaMulter as multer } from '@nocobase/utils';
+import { koaMulter as multer } from '@tachybase/utils';
import os from 'os';
import path from 'path';
import fsPromises from 'fs/promises';
import { Restorer } from '../restorer';
-import { DEFAULT_PAGE, DEFAULT_PER_PAGE } from '@nocobase/actions';
+import { DEFAULT_PAGE, DEFAULT_PER_PAGE } from '@tachybase/actions';
export default {
name: 'backupFiles',
diff --git a/packages/plugins/@nocobase/plugin-backup-restore/src/server/restorer.ts b/packages/plugins/@nocobase/plugin-backup-restore/src/server/restorer.ts
index c545d3600..94ebcf3ac 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/src/server/restorer.ts
+++ b/packages/plugins/@nocobase/plugin-backup-restore/src/server/restorer.ts
@@ -4,8 +4,8 @@ import fsPromises from 'fs/promises';
import path from 'path';
import { AppMigrator, AppMigratorOptions } from './app-migrator';
import { readLines } from './utils';
-import { Application } from '@nocobase/server';
-import { DataTypes, DumpRulesGroupType } from '@nocobase/database';
+import { Application } from '@tachybase/server';
+import { DataTypes, DumpRulesGroupType } from '@tachybase/database';
import lodash, { isPlainObject } from 'lodash';
import { FieldValueWriter } from './field-value-writer';
import * as Topo from '@hapi/topo';
diff --git a/packages/plugins/@nocobase/plugin-backup-restore/src/server/server.ts b/packages/plugins/@nocobase/plugin-backup-restore/src/server/server.ts
index 4b75c4908..359386707 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/src/server/server.ts
+++ b/packages/plugins/@nocobase/plugin-backup-restore/src/server/server.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/server';
+import { Plugin } from '@tachybase/server';
import backupFilesResourcer from './resourcers/backup-files';
export default class PluginBackupRestoreServer extends Plugin {
diff --git a/packages/plugins/@nocobase/plugin-backup-restore/src/server/utils.ts b/packages/plugins/@nocobase/plugin-backup-restore/src/server/utils.ts
index 4897b33ef..70fc59e84 100644
--- a/packages/plugins/@nocobase/plugin-backup-restore/src/server/utils.ts
+++ b/packages/plugins/@nocobase/plugin-backup-restore/src/server/utils.ts
@@ -1,5 +1,5 @@
import lodash from 'lodash';
-import { Database } from '@nocobase/database';
+import { Database } from '@tachybase/database';
import fs from 'fs';
import readline from 'readline';
diff --git a/packages/plugins/@nocobase/plugin-calendar/package.json b/packages/plugins/@nocobase/plugin-calendar/package.json
index 6fa7e52e8..ee1880f9b 100644
--- a/packages/plugins/@nocobase/plugin-calendar/package.json
+++ b/packages/plugins/@nocobase/plugin-calendar/package.json
@@ -32,10 +32,10 @@
"solarlunar-es": "^1.0.9"
},
"peerDependencies": {
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*"
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*"
},
"description.zh-CN": "提供日历数据表模板和区块，用于管理日期数据，通常用于事件、约会、任务等与日期/时间相关的信息。",
"displayName.zh-CN": "日历",
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/__e2e__/schemaInitializer.test.ts b/packages/plugins/@nocobase/plugin-calendar/src/client/__e2e__/schemaInitializer.test.ts
index 8a6f3143f..8851c62a1 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/__e2e__/schemaInitializer.test.ts
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/__e2e__/schemaInitializer.test.ts
@@ -1,4 +1,4 @@
-import { test, expect } from '@nocobase/test/e2e';
+import { test, expect } from '@tachybase/test/e2e';
import { emptyPageWithCalendarCollection, oneTableWithCalendarCollection } from './templates';
test.describe('where can be added', () => {
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/__e2e__/templates.ts b/packages/plugins/@nocobase/plugin-calendar/src/client/__e2e__/templates.ts
index 9198108de..6f38d19fd 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/__e2e__/templates.ts
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/__e2e__/templates.ts
@@ -1,4 +1,4 @@
-import { PageConfig } from '@nocobase/test/e2e';
+import { PageConfig } from '@tachybase/test/e2e';
const calendarCollection = {
name: 'calendar',
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/__tests__/calendar.test.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/__tests__/calendar.test.tsx
index ec2538f5e..af0b96d89 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/__tests__/calendar.test.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/__tests__/calendar.test.tsx
@@ -1,4 +1,4 @@
-import { render, screen, waitFor } from '@nocobase/test/client';
+import { render, screen, waitFor } from '@tachybase/test/client';
import dayjs from 'dayjs';
import React from 'react';
import App1 from '../calendar/demos/demo1';
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.Designer.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.Designer.tsx
index b48b97529..a233c8edb 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.Designer.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.Designer.tsx
@@ -1,4 +1,4 @@
-import { GeneralSchemaDesigner, useCollection, useSchemaTemplate } from '@nocobase/client';
+import { GeneralSchemaDesigner, useCollection, useSchemaTemplate } from '@tachybase/client';
import React from 'react';
export const CalendarDesigner = () => {
const { name, title } = useCollection();
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx
index f9920e1d7..411750560 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx
@@ -6,7 +6,7 @@ import {
useCollectionParentRecordData,
useProps,
withDynamicSchemaProps,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { parseExpression } from 'cron-parser';
import type { Dayjs } from 'dayjs';
import dayjs from 'dayjs';
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calender.Settings.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calender.Settings.tsx
index 7c8e24f14..896c02ed6 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calender.Settings.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calender.Settings.tsx
@@ -14,7 +14,7 @@ import {
removeNullCondition,
SchemaSettingsTemplate,
useCollectionManager_deprecated,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { useTranslation } from '../../locale';
import { useCalendarBlockContext } from '../schema-initializer/CalendarBlockProvider';
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/DeleteEvent.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/DeleteEvent.tsx
index 927dc3b70..38b3a97a3 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/DeleteEvent.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/DeleteEvent.tsx
@@ -5,7 +5,7 @@ import React, { useContext, useState } from 'react';
import { createPortal } from 'react-dom';
import { DeleteEventContext } from './Calendar';
import { formatDate } from './utils';
-import { useActionContext, useRecord, useFilterByTk, useBlockRequestContext } from '@nocobase/client';
+import { useActionContext, useRecord, useFilterByTk, useBlockRequestContext } from '@tachybase/client';
import { useTranslation } from '../../locale';
const { Text } = Typography;
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Nav.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Nav.tsx
index 57b537a41..cc8706ff0 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Nav.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Nav.tsx
@@ -4,7 +4,7 @@ import { Button } from 'antd';
import React, { useContext } from 'react';
import { Navigate } from 'react-big-calendar/dist/react-big-calendar.esm';
import { CalendarToolbarContext } from './context';
-import { useDesignable } from '@nocobase/client';
+import { useDesignable } from '@tachybase/client';
export const Nav = observer(
() => {
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Title.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Title.tsx
index c69988a51..f4c5a8815 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Title.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Title.tsx
@@ -3,7 +3,7 @@ import { Button } from 'antd';
import React, { useContext, useMemo } from 'react';
import { CalendarToolbarContext } from './context';
import { getLunarDay } from './utils';
-import { useDesignable } from '@nocobase/client';
+import { useDesignable } from '@tachybase/client';
export const Title = observer(
() => {
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Today.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Today.tsx
index 603bd81e4..9efa8fc06 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Today.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Today.tsx
@@ -3,7 +3,7 @@ import { Button } from 'antd';
import React, { useContext } from 'react';
import { Navigate } from 'react-big-calendar/dist/react-big-calendar.esm';
import { CalendarToolbarContext } from './context';
-import { useDesignable } from '@nocobase/client';
+import { useDesignable } from '@tachybase/client';
import { useTranslation } from '../../locale';
export const Today = observer(
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/ViewSelect.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/ViewSelect.tsx
index c9cfe4bc0..ea1e7e78d 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/ViewSelect.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/ViewSelect.tsx
@@ -2,7 +2,7 @@ import { observer } from '@tachybase/schema';
import { Select } from 'antd';
import React, { useContext } from 'react';
import { CalendarToolbarContext } from './context';
-import { useDesignable } from '@nocobase/client';
+import { useDesignable } from '@tachybase/client';
export const ViewSelect = observer(
(props) => {
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/demos/demo1.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/demos/demo1.tsx
index 227650c1d..3a6e5c32b 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/demos/demo1.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/demos/demo1.tsx
@@ -7,7 +7,7 @@ import {
AntdSchemaComponentProvider,
SchemaComponent,
SchemaComponentProvider,
-} from '@nocobase/client';
+} from '@tachybase/client';
import React from 'react';
import defaultValues from './defaultValues';
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/demos/demo2.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/demos/demo2.tsx
index 870548377..1ddb670ce 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/demos/demo2.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/demos/demo2.tsx
@@ -8,7 +8,7 @@ import {
SchemaComponent,
SchemaComponentProvider,
ExtendCollectionsProvider,
-} from '@nocobase/client';
+} from '@tachybase/client';
import MockAdapter from 'axios-mock-adapter';
import React from 'react';
import collections from './collections';
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/index.ts b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/index.ts
index b5ddca3e5..85b13414c 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/index.ts
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/index.ts
@@ -1,4 +1,4 @@
-import { ActionBar } from '@nocobase/client';
+import { ActionBar } from '@tachybase/client';
import { Calendar } from './Calendar';
import { CalendarDesigner } from './Calendar.Designer';
import DeleteEvent from './DeleteEvent';
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/style.ts b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/style.ts
index 26b950927..df553b72b 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/style.ts
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/calendar/style.ts
@@ -1,4 +1,4 @@
-import { genStyleHook } from '@nocobase/client';
+import { genStyleHook } from '@tachybase/client';
export default genStyleHook('nb-calendar', (token) => {
const { componentCls } = token;
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/collection-templates/calendar.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/collection-templates/calendar.tsx
index fcf335499..be58c103e 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/collection-templates/calendar.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/collection-templates/calendar.tsx
@@ -1,4 +1,4 @@
-import { CollectionTemplate, ICollectionTemplate, getConfigurableProperties } from '@nocobase/client';
+import { CollectionTemplate, ICollectionTemplate, getConfigurableProperties } from '@tachybase/client';
import { generateNTemplate } from '../../locale';
export const calendar: ICollectionTemplate = {
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/hooks/useCalendarBlockDecoratorProps.ts b/packages/plugins/@nocobase/plugin-calendar/src/client/hooks/useCalendarBlockDecoratorProps.ts
index 7e29575ec..9e5de08c9 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/hooks/useCalendarBlockDecoratorProps.ts
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/hooks/useCalendarBlockDecoratorProps.ts
@@ -1,4 +1,4 @@
-import { useParentRecordCommon } from '@nocobase/client';
+import { useParentRecordCommon } from '@tachybase/client';
import { useCalendarBlockParams } from './useCalendarBlockParams';
export function useCalendarBlockDecoratorProps(props) {
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/index.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/index.tsx
index bf19d1cf5..8ede82f29 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import { generateNTemplate } from '../locale';
import { CalendarV2 } from './calendar';
import { calendarBlockSettings } from './calendar/Calender.Settings';
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/CalendarBlockProvider.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/CalendarBlockProvider.tsx
index 095cb33b5..b41906d80 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/CalendarBlockProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/CalendarBlockProvider.tsx
@@ -6,7 +6,7 @@ import {
useBlockRequestContext,
useParsedFilter,
withDynamicSchemaProps,
-} from '@nocobase/client';
+} from '@tachybase/client';
import _ from 'lodash';
import React, { createContext, useContext, useEffect, useMemo } from 'react';
import { useCalendarBlockParams } from '../hooks/useCalendarBlockParams';
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/initializers/CalendarActionInitializers.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/initializers/CalendarActionInitializers.tsx
index 23df1f694..11b1c46e7 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/initializers/CalendarActionInitializers.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/initializers/CalendarActionInitializers.tsx
@@ -1,4 +1,4 @@
-import { CompatibleSchemaInitializer, useCollection_deprecated } from '@nocobase/client';
+import { CompatibleSchemaInitializer, useCollection_deprecated } from '@tachybase/client';
import { generateNTemplate } from '../../../locale';
/**
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/initializers/CalendarFormActionInitializers.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/initializers/CalendarFormActionInitializers.tsx
index 631456477..5e179c1de 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/initializers/CalendarFormActionInitializers.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/initializers/CalendarFormActionInitializers.tsx
@@ -1,4 +1,4 @@
-import { SchemaInitializer, SchemaInitializerItemType, useCollection_deprecated } from '@nocobase/client';
+import { SchemaInitializer, SchemaInitializerItemType, useCollection_deprecated } from '@tachybase/client';
import { generateNTemplate } from '../../../locale';
export const deleteEventActionInitializer: SchemaInitializerItemType = {
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/items/CalendarBlockInitializer.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/items/CalendarBlockInitializer.tsx
index 6f84e13cd..d037aabf0 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/items/CalendarBlockInitializer.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/items/CalendarBlockInitializer.tsx
@@ -12,7 +12,7 @@ import {
useGlobalTheme,
useSchemaInitializer,
useSchemaInitializerItem,
-} from '@nocobase/client';
+} from '@tachybase/client';
import React, { useContext } from 'react';
import { createCalendarBlockUISchema } from '../createCalendarBlockUISchema';
import { useTranslation } from '../../../locale';
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/items/RecordAssociationCalendarBlockInitializer.tsx b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/items/RecordAssociationCalendarBlockInitializer.tsx
index cd02d0cbb..a61435e2c 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/items/RecordAssociationCalendarBlockInitializer.tsx
+++ b/packages/plugins/@nocobase/plugin-calendar/src/client/schema-initializer/items/RecordAssociationCalendarBlockInitializer.tsx
@@ -14,7 +14,7 @@ import {
useSchemaInitializerItem,
useSchemaInitializer,
SchemaInitializerItem,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { createCalendarBlockUISchema } from '../createCalendarBlockUISchema';
import { useTranslation } from '../../../locale';
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/locale/index.ts b/packages/plugins/@nocobase/plugin-calendar/src/locale/index.ts
index 863344e28..7f0d06d93 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/locale/index.ts
+++ b/packages/plugins/@nocobase/plugin-calendar/src/locale/index.ts
@@ -1,4 +1,4 @@
-import { i18n } from '@nocobase/client';
+import { i18n } from '@tachybase/client';
import { useTranslation as useT } from 'react-i18next';
export const NAMESPACE = 'calendar';
diff --git a/packages/plugins/@nocobase/plugin-calendar/src/server/server.ts b/packages/plugins/@nocobase/plugin-calendar/src/server/server.ts
index 907c44bc6..f2f0685cb 100644
--- a/packages/plugins/@nocobase/plugin-calendar/src/server/server.ts
+++ b/packages/plugins/@nocobase/plugin-calendar/src/server/server.ts
@@ -1,3 +1,3 @@
-import { Plugin } from '@nocobase/server';
+import { Plugin } from '@tachybase/server';
export default class PluginCalendarServer extends Plugin {}
diff --git a/packages/plugins/@nocobase/plugin-cas/package.json b/packages/plugins/@nocobase/plugin-cas/package.json
index b5a5bace7..f38a6e20a 100644
--- a/packages/plugins/@nocobase/plugin-cas/package.json
+++ b/packages/plugins/@nocobase/plugin-cas/package.json
@@ -16,14 +16,14 @@
"react-router-dom": "6.x"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/auth": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
"@nocobase/plugin-auth": "workspace:*",
- "@nocobase/sdk": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/auth": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/sdk": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*"
},
"description.zh-CN": "通过 CAS 协议认证身份。",
"displayName.zh-CN": "认证：CAS",
diff --git a/packages/plugins/@nocobase/plugin-cas/src/client/Options.tsx b/packages/plugins/@nocobase/plugin-cas/src/client/Options.tsx
index 5baf24705..975b21c80 100644
--- a/packages/plugins/@nocobase/plugin-cas/src/client/Options.tsx
+++ b/packages/plugins/@nocobase/plugin-cas/src/client/Options.tsx
@@ -1,4 +1,4 @@
-import { SchemaComponent } from '@nocobase/client';
+import { SchemaComponent } from '@tachybase/client';
import React from 'react';
import { Space } from 'antd';
import { useAuthTranslation, generateNTemplate } from './locale';
diff --git a/packages/plugins/@nocobase/plugin-cas/src/client/SigninPage.tsx b/packages/plugins/@nocobase/plugin-cas/src/client/SigninPage.tsx
index d38aae335..e8f3b5b9e 100644
--- a/packages/plugins/@nocobase/plugin-cas/src/client/SigninPage.tsx
+++ b/packages/plugins/@nocobase/plugin-cas/src/client/SigninPage.tsx
@@ -1,7 +1,7 @@
import { LoginOutlined } from '@ant-design/icons';
-import { useApp } from '@nocobase/client';
+import { useApp } from '@tachybase/client';
import { Authenticator } from '@nocobase/plugin-auth/client';
-import { getSubAppName } from '@nocobase/sdk';
+import { getSubAppName } from '@tachybase/sdk';
import { Button, Space, message } from 'antd';
import React, { useEffect } from 'react';
import { useLocation } from 'react-router-dom';
diff --git a/packages/plugins/@nocobase/plugin-cas/src/client/index.tsx b/packages/plugins/@nocobase/plugin-cas/src/client/index.tsx
index bf5cb1e8e..72a242a6f 100644
--- a/packages/plugins/@nocobase/plugin-cas/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-cas/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import { SigninPage } from './SigninPage';
import { Options } from './Options';
import { authType } from '../constants';
diff --git a/packages/plugins/@nocobase/plugin-cas/src/server/actions/login.ts b/packages/plugins/@nocobase/plugin-cas/src/server/actions/login.ts
index d35df9ca2..98fcf924f 100644
--- a/packages/plugins/@nocobase/plugin-cas/src/server/actions/login.ts
+++ b/packages/plugins/@nocobase/plugin-cas/src/server/actions/login.ts
@@ -1,4 +1,4 @@
-import { Context, Next } from '@nocobase/actions';
+import { Context, Next } from '@tachybase/actions';
import { CASAuth } from '../auth';
export const login = async (ctx: Context, next: Next) => {
diff --git a/packages/plugins/@nocobase/plugin-cas/src/server/actions/service.ts b/packages/plugins/@nocobase/plugin-cas/src/server/actions/service.ts
index ae811ddb9..76e1ad571 100644
--- a/packages/plugins/@nocobase/plugin-cas/src/server/actions/service.ts
+++ b/packages/plugins/@nocobase/plugin-cas/src/server/actions/service.ts
@@ -1,5 +1,5 @@
-import { Context, Next } from '@nocobase/actions';
-import { AppSupervisor } from '@nocobase/server';
+import { Context, Next } from '@tachybase/actions';
+import { AppSupervisor } from '@tachybase/server';
import { CASAuth } from '../auth';
export const service = async (ctx: Context, next: Next) => {
diff --git a/packages/plugins/@nocobase/plugin-cas/src/server/auth.ts b/packages/plugins/@nocobase/plugin-cas/src/server/auth.ts
index 8beeef0b4..7b328d87d 100644
--- a/packages/plugins/@nocobase/plugin-cas/src/server/auth.ts
+++ b/packages/plugins/@nocobase/plugin-cas/src/server/auth.ts
@@ -1,6 +1,6 @@
-import { AuthConfig, BaseAuth } from '@nocobase/auth';
+import { AuthConfig, BaseAuth } from '@tachybase/auth';
import { AuthModel } from '@nocobase/plugin-auth';
-import { Model } from '@nocobase/database';
+import { Model } from '@tachybase/database';
import axios from 'axios';
export class CASAuth extends BaseAuth {
diff --git a/packages/plugins/@nocobase/plugin-cas/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-cas/src/server/plugin.ts
index 21fc26938..d87034d97 100644
--- a/packages/plugins/@nocobase/plugin-cas/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-cas/src/server/plugin.ts
@@ -1,4 +1,4 @@
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { InstallOptions, Plugin } from '@tachybase/server';
import { service } from './actions/service';
import { authType } from '../constants';
import { CASAuth } from './auth';
diff --git a/packages/plugins/@nocobase/plugin-china-region/build.config.ts b/packages/plugins/@nocobase/plugin-china-region/build.config.ts
index 0191a008f..83f8f6f41 100644
--- a/packages/plugins/@nocobase/plugin-china-region/build.config.ts
+++ b/packages/plugins/@nocobase/plugin-china-region/build.config.ts
@@ -1,4 +1,4 @@
-import { defineConfig } from '@nocobase/build';
+import { defineConfig } from '@tachybase/build';
import fs from 'fs/promises';
import path from 'path';
diff --git a/packages/plugins/@nocobase/plugin-china-region/package.json b/packages/plugins/@nocobase/plugin-china-region/package.json
index 6897971ed..7cd1cb24c 100644
--- a/packages/plugins/@nocobase/plugin-china-region/package.json
+++ b/packages/plugins/@nocobase/plugin-china-region/package.json
@@ -16,10 +16,10 @@
"cross-spawn": "^7.0.3"
},
"peerDependencies": {
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*"
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*"
},
"description.zh-CN": "提供中国行政区划数据和字段类型。",
"displayName.zh-CN": "中国行政区划",
diff --git a/packages/plugins/@nocobase/plugin-china-region/src/client/ChinaRegionProvider.tsx b/packages/plugins/@nocobase/plugin-china-region/src/client/ChinaRegionProvider.tsx
index 576977a4a..06e45db49 100644
--- a/packages/plugins/@nocobase/plugin-china-region/src/client/ChinaRegionProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-china-region/src/client/ChinaRegionProvider.tsx
@@ -1,6 +1,6 @@
import { ArrayField } from '@tachybase/schema';
import { useField } from '@tachybase/schema';
-import { useAPIClient, useRequest } from '@nocobase/client';
+import { useAPIClient, useRequest } from '@tachybase/client';
export const useChinaRegionDataSource = (options) => {
const field = useField();
diff --git a/packages/plugins/@nocobase/plugin-china-region/src/client/index.tsx b/packages/plugins/@nocobase/plugin-china-region/src/client/index.tsx
index dfd369179..5f72dde29 100644
--- a/packages/plugins/@nocobase/plugin-china-region/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-china-region/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import { useChinaRegionDataSource, useChinaRegionLoadData } from './ChinaRegionProvider';
export class ChinaRegionPlugin extends Plugin {
diff --git a/packages/plugins/@nocobase/plugin-china-region/src/server/__tests__/action.test.ts b/packages/plugins/@nocobase/plugin-china-region/src/server/__tests__/action.test.ts
index 8d01f1f6d..7083e737a 100644
--- a/packages/plugins/@nocobase/plugin-china-region/src/server/__tests__/action.test.ts
+++ b/packages/plugins/@nocobase/plugin-china-region/src/server/__tests__/action.test.ts
@@ -1,5 +1,5 @@
-import { Database } from '@nocobase/database';
-import { MockServer, createMockServer } from '@nocobase/test';
+import { Database } from '@tachybase/database';
+import { MockServer, createMockServer } from '@tachybase/test';
describe('actions test', () => {
let app: MockServer;
diff --git a/packages/plugins/@nocobase/plugin-china-region/src/server/collections/chinaRegions.ts b/packages/plugins/@nocobase/plugin-china-region/src/server/collections/chinaRegions.ts
index d84ead5cc..edd88ff19 100644
--- a/packages/plugins/@nocobase/plugin-china-region/src/server/collections/chinaRegions.ts
+++ b/packages/plugins/@nocobase/plugin-china-region/src/server/collections/chinaRegions.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
dumpRules: 'skipped',
diff --git a/packages/plugins/@nocobase/plugin-china-region/src/server/index.ts b/packages/plugins/@nocobase/plugin-china-region/src/server/index.ts
index 49cb059d7..c50efddb9 100644
--- a/packages/plugins/@nocobase/plugin-china-region/src/server/index.ts
+++ b/packages/plugins/@nocobase/plugin-china-region/src/server/index.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/server';
+import { Plugin } from '@tachybase/server';
import { resolve } from 'path';
function getChinaDivisionData(key: string) {
diff --git a/packages/plugins/@nocobase/plugin-client/build.config.ts b/packages/plugins/@nocobase/plugin-client/build.config.ts
index 9eae7c54c..322d8cf79 100644
--- a/packages/plugins/@nocobase/plugin-client/build.config.ts
+++ b/packages/plugins/@nocobase/plugin-client/build.config.ts
@@ -1,10 +1,10 @@
import fs from 'fs/promises';
import path from 'path';
-import { defineConfig } from '@nocobase/build';
+import { defineConfig } from '@tachybase/build';
const existsSync = require('fs').existsSync;
-const client = path.dirname(require.resolve('@nocobase/client/package.json'));
+const client = path.dirname(require.resolve('@tachybase/client/package.json'));
const antd = require.resolve('antd');
export default defineConfig({
diff --git a/packages/plugins/@nocobase/plugin-client/package.json b/packages/plugins/@nocobase/plugin-client/package.json
index dfa528551..08a3650e5 100644
--- a/packages/plugins/@nocobase/plugin-client/package.json
+++ b/packages/plugins/@nocobase/plugin-client/package.json
@@ -12,11 +12,11 @@
"koa-static": "^5.0.0"
},
"peerDependencies": {
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "为 NocoBase 服务端提供客户端界面",
"displayName.zh-CN": "WEB 客户端",
diff --git a/packages/plugins/@nocobase/plugin-client/src/client/index.ts b/packages/plugins/@nocobase/plugin-client/src/client/index.ts
index 110db2de1..0be0a4acf 100644
--- a/packages/plugins/@nocobase/plugin-client/src/client/index.ts
+++ b/packages/plugins/@nocobase/plugin-client/src/client/index.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
class ClientPlugin extends Plugin {
async load() {}
diff --git a/packages/plugins/@nocobase/plugin-client/src/server/__tests__/20231215215245-admin-menu-uid.test.ts b/packages/plugins/@nocobase/plugin-client/src/server/__tests__/20231215215245-admin-menu-uid.test.ts
index d2207c772..042967a2c 100644
--- a/packages/plugins/@nocobase/plugin-client/src/server/__tests__/20231215215245-admin-menu-uid.test.ts
+++ b/packages/plugins/@nocobase/plugin-client/src/server/__tests__/20231215215245-admin-menu-uid.test.ts
@@ -1,4 +1,4 @@
-import { MockServer, createMockServer } from '@nocobase/test';
+import { MockServer, createMockServer } from '@tachybase/test';
import Migration from '../migrations/20231215215247-admin-menu-uid';
describe('nocobase-admin-menu', () => {
diff --git a/packages/plugins/@nocobase/plugin-client/src/server/antd.ts b/packages/plugins/@nocobase/plugin-client/src/server/antd.ts
index 190c249d5..09b74f978 100644
--- a/packages/plugins/@nocobase/plugin-client/src/server/antd.ts
+++ b/packages/plugins/@nocobase/plugin-client/src/server/antd.ts
@@ -1,4 +1,4 @@
-import { requireModule } from '@nocobase/utils';
+import { requireModule } from '@tachybase/utils';
import { resolve } from 'path';
export const getAntdLocale = (lang) => {
diff --git a/packages/plugins/@nocobase/plugin-client/src/server/cron.ts b/packages/plugins/@nocobase/plugin-client/src/server/cron.ts
index cf6fcd8f2..95ac4a2a5 100644
--- a/packages/plugins/@nocobase/plugin-client/src/server/cron.ts
+++ b/packages/plugins/@nocobase/plugin-client/src/server/cron.ts
@@ -1,11 +1,11 @@
-import { requireModule } from '@nocobase/utils';
+import { requireModule } from '@tachybase/utils';
import { resolve } from 'path';
export const getCronLocale = (lang: string) => {
const lng = lang.replace('-', '_');
const files = [resolve(__dirname, `./../locale/cron/${lng}`)];
if (process.env.APP_ENV !== 'production') {
- files.push(`@nocobase/client/src/locale/cron/${lng}`, `@nocobase/client/lib/locale/cron/${lng}`);
+ files.push(`@tachybase/client/src/locale/cron/${lng}`, `@tachybase/client/lib/locale/cron/${lng}`);
}
for (const file of files) {
try {
diff --git a/packages/plugins/@nocobase/plugin-client/src/server/migrations/20230620203216-admin-ui-schema-uid.ts b/packages/plugins/@nocobase/plugin-client/src/server/migrations/20230620203216-admin-ui-schema-uid.ts
index 76dd9dbc3..3e8ec57cf 100644
--- a/packages/plugins/@nocobase/plugin-client/src/server/migrations/20230620203216-admin-ui-schema-uid.ts
+++ b/packages/plugins/@nocobase/plugin-client/src/server/migrations/20230620203216-admin-ui-schema-uid.ts
@@ -1,5 +1,5 @@
-import { Model } from '@nocobase/database';
-import { Migration } from '@nocobase/server';
+import { Model } from '@tachybase/database';
+import { Migration } from '@tachybase/server';
export default class extends Migration {
appVersion = '<0.14.0-alpha.1';
diff --git a/packages/plugins/@nocobase/plugin-client/src/server/migrations/20231215215247-admin-menu-uid.ts b/packages/plugins/@nocobase/plugin-client/src/server/migrations/20231215215247-admin-menu-uid.ts
index 26fec6981..da08ad80a 100644
--- a/packages/plugins/@nocobase/plugin-client/src/server/migrations/20231215215247-admin-menu-uid.ts
+++ b/packages/plugins/@nocobase/plugin-client/src/server/migrations/20231215215247-admin-menu-uid.ts
@@ -1,5 +1,5 @@
-import { Model } from '@nocobase/database';
-import { Migration } from '@nocobase/server';
+import { Model } from '@tachybase/database';
+import { Migration } from '@tachybase/server';
export default class extends Migration {
appVersion = '<0.17.0-alpha.8';
diff --git a/packages/plugins/@nocobase/plugin-client/src/server/server.ts b/packages/plugins/@nocobase/plugin-client/src/server/server.ts
index e32c07126..d118e1d8f 100644
--- a/packages/plugins/@nocobase/plugin-client/src/server/server.ts
+++ b/packages/plugins/@nocobase/plugin-client/src/server/server.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/server';
+import { Plugin } from '@tachybase/server';
import { resolve } from 'path';
import { getAntdLocale } from './antd';
import { getCronLocale } from './cron';
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/package.json b/packages/plugins/@nocobase/plugin-collection-manager/package.json
index da8d5795d..0102e1866 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-collection-manager/package.json
@@ -18,13 +18,13 @@
"toposort": "^2.0.2"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
"@nocobase/plugin-error-handler": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "NocoBase 主数据库，支持 MySQL、PostgreSQL、SQLite 等关系型数据库。",
"displayName.zh-CN": "数据源：主数据库",
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/calendar.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/calendar.test.ts
index 5b0450516..b6365da20 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/calendar.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/calendar.test.ts
@@ -1,5 +1,5 @@
-import { expect, test } from '@nocobase/test/e2e';
-import { uid } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { uid } from '@tachybase/utils';
import { CollectionManagerPage } from '../utils';
test.describe('create collection', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/connectToDatabaseView.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/connectToDatabaseView.test.ts
index 75aa786d6..9a94e680a 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/connectToDatabaseView.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/connectToDatabaseView.test.ts
@@ -1,4 +1,4 @@
-import { test } from '@nocobase/test/e2e';
+import { test } from '@tachybase/test/e2e';
test.describe('create collection', () => {});
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/expression.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/expression.test.ts
index 293e483dc..40fbfd891 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/expression.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/expression.test.ts
@@ -1,5 +1,5 @@
-import { expect, test } from '@nocobase/test/e2e';
-import { uid } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { uid } from '@tachybase/utils';
import { CollectionManagerPage } from '../utils';
test.describe('create collection', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/file.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/file.test.ts
index ae08d7a93..9d19d5263 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/file.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/file.test.ts
@@ -1,5 +1,5 @@
-import { expect, test } from '@nocobase/test/e2e';
-import { uid } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { uid } from '@tachybase/utils';
import { CollectionManagerPage } from '../utils';
test.describe('create collection', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/general.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/general.test.ts
index f02855456..6f62a69a1 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/general.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/general.test.ts
@@ -1,5 +1,5 @@
-import { expect, test } from '@nocobase/test/e2e';
-import { uid } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { uid } from '@tachybase/utils';
import { CollectionManagerPage, FieldInterface } from '../utils';
test.describe('create collection', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/sql.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/sql.test.ts
index c39b99f6d..60f6af852 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/sql.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/sql.test.ts
@@ -1,5 +1,5 @@
-import { expect, test } from '@nocobase/test/e2e';
-import { uid } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { uid } from '@tachybase/utils';
import { CollectionManagerPage } from '../utils';
test.describe('create collection', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/tree.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/tree.test.ts
index 7e7220b83..c765175b1 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/tree.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/collection-template/tree.test.ts
@@ -1,5 +1,5 @@
-import { expect, test } from '@nocobase/test/e2e';
-import { uid } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { uid } from '@tachybase/utils';
import { CollectionManagerPage } from '../utils';
test.describe('create collection', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/attachment/schemaInitializer.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/attachment/schemaInitializer.test.ts
index c5d23c6e1..a722707ac 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/attachment/schemaInitializer.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/attachment/schemaInitializer.test.ts
@@ -1,4 +1,4 @@
-import { expectInitializerMenu, oneTableBlockWithAddNewAndViewAndEditAndMediaFields, test } from '@nocobase/test/e2e';
+import { expectInitializerMenu, oneTableBlockWithAddNewAndViewAndEditAndMediaFields, test } from '@tachybase/test/e2e';
test.describe('form item & create form', () => {
test('configure fields', async ({ page, mockPage }) => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/attachment/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/attachment/schemaSettings.test.ts
index d6fc5b61e..73a11c612 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/attachment/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/attachment/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndMediaFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testPattern } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/belongsTo/schemaInitializer.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/belongsTo/schemaInitializer.test.ts
index dd3f791ac..829010481 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/belongsTo/schemaInitializer.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/belongsTo/schemaInitializer.test.ts
@@ -2,7 +2,7 @@ import {
expectInitializerMenu,
oneTableBlockWithAddNewAndViewAndEditAndAssociationFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
test.describe('form item & create form', () => {
test('configure fields', async ({ page, mockPage, mockRecords }) => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/belongsTo/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/belongsTo/schemaSettings.test.ts
index 4441b392a..3302c2aec 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/belongsTo/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/belongsTo/schemaSettings.test.ts
@@ -5,7 +5,7 @@ import {
oneFilterFormBlockWithAllAssociationFields,
oneTableBlockWithAddNewAndViewAndEditAndAssociationFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testPattern } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/checkbox/schemaInitializer.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/checkbox/schemaInitializer.test.ts
index ab83df419..78d74c0bf 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/checkbox/schemaInitializer.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/checkbox/schemaInitializer.test.ts
@@ -1,4 +1,8 @@
-import { expectInitializerMenu, oneTableBlockWithAddNewAndViewAndEditAndChoicesFields, test } from '@nocobase/test/e2e';
+import {
+ expectInitializerMenu,
+ oneTableBlockWithAddNewAndViewAndEditAndChoicesFields,
+ test,
+} from '@tachybase/test/e2e';
test.describe('form item & create form', () => {
test('configure fields', async ({ page, mockPage }) => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/checkbox/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/checkbox/schemaSettings.test.ts
index 9d78cd0f4..195e84b29 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/checkbox/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/checkbox/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndChoicesFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testDefaultValue, testPattern } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/checkboxGroup/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/checkboxGroup/schemaSettings.test.ts
index 4e6be001e..7289f13bc 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/checkboxGroup/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/checkboxGroup/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndChoicesFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testDefaultValue, testPattern } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/chinaRegion/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/chinaRegion/schemaSettings.test.ts
index d8714d745..d328741b2 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/chinaRegion/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/chinaRegion/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndChoicesFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testDefaultValue, testPattern } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/collection/schemaInitializer.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/collection/schemaInitializer.test.ts
index 90ceb02b6..4660312e4 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/collection/schemaInitializer.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/collection/schemaInitializer.test.ts
@@ -2,7 +2,7 @@ import {
expectInitializerMenu,
oneTableBlockWithAddNewAndViewAndEditAndAdvancedFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
test.describe('form item & create form', () => {
test('configure fields', async ({ page, mockPage }) => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/collection/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/collection/schemaSettings.test.ts
index bc1c762e8..147deb5ab 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/collection/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/collection/schemaSettings.test.ts
@@ -1,4 +1,4 @@
-import { expectSettingsMenu, oneTableBlockWithAddNewAndViewAndEditAndAdvancedFields, test } from '@nocobase/test/e2e';
+import { expectSettingsMenu, oneTableBlockWithAddNewAndViewAndEditAndAdvancedFields, test } from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/color/schemaInitializer.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/color/schemaInitializer.test.ts
index 363c198af..17a8d3d68 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/color/schemaInitializer.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/color/schemaInitializer.test.ts
@@ -1,4 +1,4 @@
-import { expectInitializerMenu, oneTableBlockWithAddNewAndViewAndEditAndBasicFields, test } from '@nocobase/test/e2e';
+import { expectInitializerMenu, oneTableBlockWithAddNewAndViewAndEditAndBasicFields, test } from '@tachybase/test/e2e';
test.describe('form item & create form', () => {
test('configure fields', async ({ page, mockPage }) => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/color/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/color/schemaSettings.test.ts
index 5bbb8fa95..1ad087aa3 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/color/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/color/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndBasicFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import {
clickDeleteAndOk,
createColumnItem,
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/createdAt/schemaInitializer.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/createdAt/schemaInitializer.test.ts
index cc3df5e70..3e8cb8178 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/createdAt/schemaInitializer.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/createdAt/schemaInitializer.test.ts
@@ -2,7 +2,7 @@ import {
expectInitializerMenu,
oneTableBlockWithAddNewAndViewAndEditAndSystemInfoFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
test.describe('form item & create form', () => {
test('configure fields', async ({ page, mockPage }) => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/createdAt/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/createdAt/schemaSettings.test.ts
index 1cd598d64..4296362d9 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/createdAt/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/createdAt/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndSystemInfoFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/createdBy/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/createdBy/schemaSettings.test.ts
index 5051d3650..9a968577f 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/createdBy/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/createdBy/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndSystemInfoFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/datetime/schemaInitializer.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/datetime/schemaInitializer.test.ts
index 1ef8819d9..bf145daf1 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/datetime/schemaInitializer.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/datetime/schemaInitializer.test.ts
@@ -2,7 +2,7 @@ import {
expectInitializerMenu,
oneTableBlockWithAddNewAndViewAndEditAndDatetimeFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
test.describe('form item & create form', () => {
test('configure fields', async ({ page, mockPage }) => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/datetime/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/datetime/schemaSettings.test.ts
index 03ab2303c..da729fd1f 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/datetime/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/datetime/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndDatetimeFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import dayjs from 'dayjs';
import { createColumnItem, showSettingsMenu, testDefaultValue, testPattern } from '../../utils';
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/email/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/email/schemaSettings.test.ts
index 09720079a..21171cd07 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/email/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/email/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndBasicFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testDefaultValue, testPattern } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/formula/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/formula/schemaSettings.test.ts
index 45c6d24ea..0809f1416 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/formula/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/formula/schemaSettings.test.ts
@@ -1,4 +1,4 @@
-import { expectSettingsMenu, oneTableBlockWithAddNewAndViewAndEditAndAdvancedFields, test } from '@nocobase/test/e2e';
+import { expectSettingsMenu, oneTableBlockWithAddNewAndViewAndEditAndAdvancedFields, test } from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/hasOne/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/hasOne/schemaSettings.test.ts
index 3a5ecb875..0951c0ce0 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/hasOne/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/hasOne/schemaSettings.test.ts
@@ -5,7 +5,7 @@ import {
oneFilterFormBlockWithAllAssociationFields,
oneTableBlockWithAddNewAndViewAndEditAndAssociationFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testPattern } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/icon/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/icon/schemaSettings.test.ts
index 0249e9ee6..405624da5 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/icon/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/icon/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndBasicFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testDefaultValue, testPattern } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/id/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/id/schemaSettings.test.ts
index 8261228fe..287aa6732 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/id/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/id/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndSystemInfoFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/integer/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/integer/schemaSettings.test.ts
index 340141b4c..f9851b09f 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/integer/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/integer/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndBasicFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testDefaultValue, testPattern, testSetValidationRules } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/json/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/json/schemaSettings.test.ts
index 8f6d2d9f6..e03e591fe 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/json/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/json/schemaSettings.test.ts
@@ -1,4 +1,4 @@
-import { expectSettingsMenu, oneTableBlockWithAddNewAndViewAndEditAndAdvancedFields, test } from '@nocobase/test/e2e';
+import { expectSettingsMenu, oneTableBlockWithAddNewAndViewAndEditAndAdvancedFields, test } from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/lastUpdatedAt/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/lastUpdatedAt/schemaSettings.test.ts
index 15a97a8ae..7b679a59a 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/lastUpdatedAt/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/lastUpdatedAt/schemaSettings.test.ts
@@ -1,4 +1,8 @@
-import { expectSettingsMenu, oneTableBlockWithAddNewAndViewAndEditAndSystemInfoFields, test } from '@nocobase/test/e2e';
+import {
+ expectSettingsMenu,
+ oneTableBlockWithAddNewAndViewAndEditAndSystemInfoFields,
+ test,
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/lastUpdatedBy/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/lastUpdatedBy/schemaSettings.test.ts
index c6233df45..19b72315d 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/lastUpdatedBy/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/lastUpdatedBy/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndSystemInfoFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/longText/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/longText/schemaSettings.test.ts
index 76af85435..7ab7ae86f 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/longText/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/longText/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndBasicFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testDefaultValue, testPattern, testSetValidationRules } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/manyToMany/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/manyToMany/schemaSettings.test.ts
index 87b53d701..fb96c3312 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/manyToMany/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/manyToMany/schemaSettings.test.ts
@@ -5,7 +5,7 @@ import {
oneFilterFormBlockWithAllAssociationFields,
oneTableBlockWithAddNewAndViewAndEditAndAssociationFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testDefaultValue, testPattern } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/manyToOne/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/manyToOne/schemaSettings.test.ts
index 88d118338..c68f9b364 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/manyToOne/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/manyToOne/schemaSettings.test.ts
@@ -5,7 +5,7 @@ import {
oneFilterFormBlockWithAllAssociationFields,
oneTableBlockWithAddNewAndViewAndEditAndAssociationFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testDefaultValue, testPattern } from '../../utils';
import { T3377 } from './templatesOfBug';
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/manyToOne/templatesOfBug.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/manyToOne/templatesOfBug.ts
index 5e9fa3af1..bf1db3023 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/manyToOne/templatesOfBug.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/manyToOne/templatesOfBug.ts
@@ -1,4 +1,4 @@
-import { PageConfig, generalWithAssociation } from '@nocobase/test/e2e';
+import { PageConfig, generalWithAssociation } from '@tachybase/test/e2e';
export const T3377: PageConfig = {
collections: generalWithAssociation,
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/markdown/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/markdown/schemaSettings.test.ts
index 5380877c8..4cd9ce436 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/markdown/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/markdown/schemaSettings.test.ts
@@ -3,7 +3,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndMediaFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testDefaultValue, testPattern, testSetValidationRules } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/mutipleSelect/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/mutipleSelect/schemaSettings.test.ts
index 009d77683..b1e676638 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/mutipleSelect/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/mutipleSelect/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndChoicesFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testDefaultValue, testPattern } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/number/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/number/schemaSettings.test.ts
index 53e4f53a0..8c81f1712 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/number/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/number/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndBasicFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testDefaultValue, testPattern, testSetValidationRules } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/oneToMany/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/oneToMany/schemaSettings.test.ts
index b162e858e..386590b2f 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/oneToMany/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/oneToMany/schemaSettings.test.ts
@@ -5,7 +5,7 @@ import {
oneFilterFormBlockWithAllAssociationFields,
oneTableBlockWithAddNewAndViewAndEditAndAssociationFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testPattern } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/password/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/password/schemaSettings.test.ts
index 7ca0bc4d4..de92aef22 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/password/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/password/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndBasicFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testDefaultValue, testPattern, testSetValidationRules } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/percent/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/percent/schemaSettings.test.ts
index 094dc8507..077e76785 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/percent/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/percent/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndBasicFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testDefaultValue, testPattern, testSetValidationRules } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/phone/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/phone/schemaSettings.test.ts
index c28f32e6e..c43d482f0 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/phone/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/phone/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndBasicFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testDefaultValue, testPattern } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/radioGroup/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/radioGroup/schemaSettings.test.ts
index 564012ac8..db646883b 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/radioGroup/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/radioGroup/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndChoicesFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testDefaultValue, testPattern } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/richText/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/richText/schemaSettings.test.ts
index d4293ce27..329966842 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/richText/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/richText/schemaSettings.test.ts
@@ -3,7 +3,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndMediaFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testDefaultValue, testPattern, testSetValidationRules } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/sequence/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/sequence/schemaSettings.test.ts
index 29900fe72..f66ab6c2b 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/sequence/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/sequence/schemaSettings.test.ts
@@ -1,4 +1,4 @@
-import { expectSettingsMenu, oneTableBlockWithAddNewAndViewAndEditAndAdvancedFields, test } from '@nocobase/test/e2e';
+import { expectSettingsMenu, oneTableBlockWithAddNewAndViewAndEditAndAdvancedFields, test } from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/singleLineText/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/singleLineText/schemaSettings.test.ts
index 6a10e6b98..869ac9c1a 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/singleLineText/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/singleLineText/schemaSettings.test.ts
@@ -5,7 +5,7 @@ import {
oneTableBlockWithAddNewAndViewAndEditAndBasicFields,
oneTableBlockWithAddNewAndViewAndEditAndBasicFieldsAndSubTable,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testDefaultValue, testPattern, testSetValidationRules } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/singleSelect/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/singleSelect/schemaSettings.test.ts
index a29de03af..1f0f8d067 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/singleSelect/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/singleSelect/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndChoicesFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testDefaultValue, testPattern } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/tableOID/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/tableOID/schemaSettings.test.ts
index 4c1c80b1c..3a17ec6f9 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/tableOID/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/tableOID/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndSystemInfoFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/time/schemaInitializer.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/time/schemaInitializer.test.ts
index 2d3f41aef..e296a6d7a 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/time/schemaInitializer.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/time/schemaInitializer.test.ts
@@ -1,4 +1,4 @@
-import { test } from '@nocobase/test/e2e';
+import { test } from '@tachybase/test/e2e';
test('form item & create form', async ({ page, mockPage }) => {});
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/time/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/time/schemaSettings.test.ts
index 07c9b97bb..30514f734 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/time/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/time/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndDatetimeFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import dayjs from 'dayjs';
import { createColumnItem, showSettingsMenu, testDefaultValue, testPattern } from '../../utils';
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/url/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/url/schemaSettings.test.ts
index de10b8c27..cbceb323e 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/url/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/fields/url/schemaSettings.test.ts
@@ -4,7 +4,7 @@ import {
expectSettingsMenu,
oneTableBlockWithAddNewAndViewAndEditAndBasicFields,
test,
-} from '@nocobase/test/e2e';
+} from '@tachybase/test/e2e';
import { createColumnItem, showSettingsMenu, testDefaultValue, testPattern } from '../../utils';
test.describe('form item & create form', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/utils.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/utils.ts
index 97b646c26..1c5a42ea8 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/utils.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/__e2e__/utils.ts
@@ -1,4 +1,4 @@
-import { Page, expect } from '@nocobase/test/e2e';
+import { Page, expect } from '@tachybase/test/e2e';
export async function showSettingsMenu(page: Page, fieldName: string) {
await page.getByRole('columnheader', { name: fieldName, exact: true }).hover();
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/client/index.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/client/index.ts
index 3913f2beb..cb9145281 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/client/index.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/client/index.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
class CollectionManagerPlugin extends Plugin {
async load() {}
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/action.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/action.test.ts
index cb636a32f..192fa3cbc 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/action.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/action.test.ts
@@ -1,5 +1,5 @@
-import { Database } from '@nocobase/database';
-import { MockServer } from '@nocobase/test';
+import { Database } from '@tachybase/database';
+import { MockServer } from '@tachybase/test';
import { createApp } from '.';
describe('action test', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/associations/reference-integerity-check.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/associations/reference-integerity-check.test.ts
index eaaf0004e..4aa20279c 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/associations/reference-integerity-check.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/associations/reference-integerity-check.test.ts
@@ -1,5 +1,5 @@
-import Database from '@nocobase/database';
-import { MockServer, createMockServer } from '@nocobase/test';
+import Database from '@tachybase/database';
+import { MockServer, createMockServer } from '@tachybase/test';
describe('reference integrity check', () => {
let db: Database;
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/beforeInitOptions.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/beforeInitOptions.test.ts
index 30542685c..825d01667 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/beforeInitOptions.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/beforeInitOptions.test.ts
@@ -1,5 +1,5 @@
-import Database, { Collection as DBCollection } from '@nocobase/database';
-import Application from '@nocobase/server';
+import Database, { Collection as DBCollection } from '@tachybase/database';
+import Application from '@tachybase/server';
import { createApp } from '.';
describe('collections repository', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/collection-categories.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/collection-categories.test.ts
index 90652520b..8d8173adb 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/collection-categories.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/collection-categories.test.ts
@@ -1,5 +1,5 @@
-import Database, { Collection as DBCollection } from '@nocobase/database';
-import Application from '@nocobase/server';
+import Database, { Collection as DBCollection } from '@tachybase/database';
+import Application from '@tachybase/server';
import { createApp } from './index';
describe('Collection categories', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/collection-without-id-primary-field.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/collection-without-id-primary-field.test.ts
index b43d510f6..477ddf8c0 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/collection-without-id-primary-field.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/collection-without-id-primary-field.test.ts
@@ -1,5 +1,5 @@
-import Database, { Collection as DBCollection } from '@nocobase/database';
-import Application from '@nocobase/server';
+import Database, { Collection as DBCollection } from '@tachybase/database';
+import Application from '@tachybase/server';
import { createApp } from './index';
describe.skipIf(process.env['DB_DIALECT'] === 'sqlite')('collection without id primary key', function () {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/collections.repository.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/collections.repository.test.ts
index ddc84a0fc..ffb79be46 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/collections.repository.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/collections.repository.test.ts
@@ -1,5 +1,5 @@
-import Database, { Collection as DBCollection, CollectionGroupManager, HasManyRepository } from '@nocobase/database';
-import Application from '@nocobase/server';
+import Database, { Collection as DBCollection, CollectionGroupManager, HasManyRepository } from '@tachybase/database';
+import Application from '@tachybase/server';
import { createApp } from '.';
import CollectionManagerPlugin, { CollectionRepository } from '../index';
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/field-options/default-value.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/field-options/default-value.test.ts
index 1196a05a4..a350798d2 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/field-options/default-value.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/field-options/default-value.test.ts
@@ -1,6 +1,6 @@
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import { createApp } from '..';
-import { Collection } from '@nocobase/database';
+import { Collection } from '@tachybase/database';
describe('field defaultValue', () => {
let app: MockServer;
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/field-options/indexes.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/field-options/indexes.test.ts
index 9cdeef2ea..e8d6e50ed 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/field-options/indexes.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/field-options/indexes.test.ts
@@ -1,4 +1,4 @@
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import { createApp } from '..';
describe('field indexes', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields.repository.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields.repository.test.ts
index c90578855..f2d2bfa94 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields.repository.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields.repository.test.ts
@@ -1,5 +1,5 @@
-import Database, { Collection as DBCollection, StringFieldOptions } from '@nocobase/database';
-import Application from '@nocobase/server';
+import Database, { Collection as DBCollection, StringFieldOptions } from '@tachybase/database';
+import Application from '@tachybase/server';
import { createApp } from '.';
describe('recreate field', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/belongs-to-many.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/belongs-to-many.test.ts
index 8301bffe2..d01addc15 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/belongs-to-many.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/belongs-to-many.test.ts
@@ -1,5 +1,5 @@
-import Database, { Collection as DBCollection } from '@nocobase/database';
-import Application from '@nocobase/server';
+import Database, { Collection as DBCollection } from '@tachybase/database';
+import Application from '@tachybase/server';
import { createApp } from '..';
describe('belongsToMany', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/belongsTo.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/belongsTo.test.ts
index 049698a0d..2a773a4b5 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/belongsTo.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/belongsTo.test.ts
@@ -1,5 +1,5 @@
-import Database, { Collection as DBCollection } from '@nocobase/database';
-import Application from '@nocobase/server';
+import Database, { Collection as DBCollection } from '@tachybase/database';
+import Application from '@tachybase/server';
import { createApp } from '..';
import { CollectionRepository } from '../../index';
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/destroy.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/destroy.test.ts
index c9aa7b4dd..0cdf7c643 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/destroy.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/destroy.test.ts
@@ -1,5 +1,5 @@
-import Database, { Collection as DBCollection } from '@nocobase/database';
-import Application from '@nocobase/server';
+import Database, { Collection as DBCollection } from '@tachybase/database';
+import Application from '@tachybase/server';
import { createApp } from '..';
describe('destroy', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/hasMany.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/hasMany.test.ts
index 8e2f75b9c..81ca26977 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/hasMany.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/hasMany.test.ts
@@ -1,5 +1,5 @@
-import Database, { Collection as DBCollection } from '@nocobase/database';
-import Application from '@nocobase/server';
+import Database, { Collection as DBCollection } from '@tachybase/database';
+import Application from '@tachybase/server';
import { createApp } from '..';
describe('hasMany field options', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/hasOne.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/hasOne.test.ts
index 9b31f5264..c080f47a7 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/hasOne.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/hasOne.test.ts
@@ -1,5 +1,5 @@
-import Database, { Collection as DBCollection } from '@nocobase/database';
-import Application from '@nocobase/server';
+import Database, { Collection as DBCollection } from '@tachybase/database';
+import Application from '@tachybase/server';
import { createApp } from '..';
describe('hasOne field options', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/reverseField.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/reverseField.test.ts
index 4a46119bf..71b5eb3c5 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/reverseField.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/reverseField.test.ts
@@ -1,5 +1,5 @@
-import Database, { Collection as DBCollection } from '@nocobase/database';
-import { MockServer } from '@nocobase/test';
+import Database, { Collection as DBCollection } from '@tachybase/database';
+import { MockServer } from '@tachybase/test';
import { createApp } from '..';
describe('reverseField options', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/uuid.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/uuid.test.ts
index d17e4c7db..25d64d451 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/uuid.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/fields/uuid.test.ts
@@ -1,5 +1,5 @@
-import Database, { Collection as DBCollection } from '@nocobase/database';
-import Application from '@nocobase/server';
+import Database, { Collection as DBCollection } from '@tachybase/database';
+import Application from '@tachybase/server';
import { createApp } from '..';
describe('uuid', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/belongs-to-many.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/belongs-to-many.test.ts
index c257d7be0..cd4bc7fe1 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/belongs-to-many.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/belongs-to-many.test.ts
@@ -1,4 +1,4 @@
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import { createApp } from '..';
describe('collections repository', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/collections.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/collections.test.ts
index d211541e0..f5686ade1 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/collections.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/collections.test.ts
@@ -1,4 +1,4 @@
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import { createApp } from '..';
describe('collections repository', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/find.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/find.test.ts
index c1db34cf0..3935ade2d 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/find.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/find.test.ts
@@ -1,5 +1,5 @@
-import { Database } from '@nocobase/database';
-import { MockServer } from '@nocobase/test';
+import { Database } from '@tachybase/database';
+import { MockServer } from '@tachybase/test';
import { createApp } from '../index';
describe('find with association', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/has-many.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/has-many.test.ts
index 272506e2a..91e41ca44 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/has-many.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/has-many.test.ts
@@ -1,4 +1,4 @@
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import { createApp } from '../index';
describe('collections repository', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/inherited-collection.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/inherited-collection.test.ts
index b4a367bcc..5cd25090c 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/inherited-collection.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/inherited-collection.test.ts
@@ -1,4 +1,4 @@
-import { MockServer, pgOnly } from '@nocobase/test';
+import { MockServer, pgOnly } from '@tachybase/test';
import { createApp } from '..';
pgOnly()('Inherited Collection', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/recreate.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/recreate.test.ts
index f1ffff2e9..b2f4e835c 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/recreate.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/recreate.test.ts
@@ -1,4 +1,4 @@
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import { createApp } from '../index';
describe('recreate field', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/tree.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/tree.test.ts
index fd454d7c7..654c40b38 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/tree.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/tree.test.ts
@@ -1,5 +1,5 @@
-import { MockServer } from '@nocobase/test';
-import { Database } from '@nocobase/database';
+import { MockServer } from '@tachybase/test';
+import { Database } from '@tachybase/database';
import { createApp } from '../index';
describe('tree', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/view-collection.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/view-collection.test.ts
index d66f22cae..c61e2ae8a 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/view-collection.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/http-api/view-collection.test.ts
@@ -1,6 +1,6 @@
-import { Database, DataTypes, Field, Repository } from '@nocobase/database';
-import { MockServer } from '@nocobase/test';
-import { uid } from '@nocobase/utils';
+import { Database, DataTypes, Field, Repository } from '@tachybase/database';
+import { MockServer } from '@tachybase/test';
+import { uid } from '@tachybase/utils';
import { createApp } from '../index';
describe('view collection', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/index.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/index.ts
index e9ebbef2b..20bef098c 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/index.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/index.ts
@@ -1,4 +1,4 @@
-import { createMockServer } from '@nocobase/test';
+import { createMockServer } from '@tachybase/test';
export async function createApp(options: any = {}) {
const app = await createMockServer({
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/inherits/inherited-collection.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/inherits/inherited-collection.test.ts
index 6a98942f6..7af7aa77d 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/inherits/inherited-collection.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/inherits/inherited-collection.test.ts
@@ -3,9 +3,9 @@ import Database, {
BelongsToRepository,
HasManyRepository,
Repository,
-} from '@nocobase/database';
-import Application from '@nocobase/server';
-import { pgOnly } from '@nocobase/test';
+} from '@tachybase/database';
+import Application from '@tachybase/server';
+import { pgOnly } from '@tachybase/test';
import { createApp } from '..';
pgOnly()('Inherited Collection', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/inherits/inhertied-collection-with-schema.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/inherits/inhertied-collection-with-schema.test.ts
index ec3428428..eff8282a6 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/inherits/inhertied-collection-with-schema.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/inherits/inhertied-collection-with-schema.test.ts
@@ -1,7 +1,7 @@
-import Database, { Repository } from '@nocobase/database';
-import Application from '@nocobase/server';
+import Database, { Repository } from '@tachybase/database';
+import Application from '@tachybase/server';
import { createApp } from '..';
-import { pgOnly } from '@nocobase/test';
+import { pgOnly } from '@tachybase/test';
pgOnly()('Inherited Collection with schema options', () => {
let db: Database;
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/migrations/20221104151410-update-collections-hidden.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/migrations/20221104151410-update-collections-hidden.test.ts
index 2cd757ce0..71ea51f1a 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/migrations/20221104151410-update-collections-hidden.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/migrations/20221104151410-update-collections-hidden.test.ts
@@ -1,7 +1,7 @@
-import { Database, MigrationContext } from '@nocobase/database';
+import { Database, MigrationContext } from '@tachybase/database';
import UpdateCollectionsHiddenMigration from '../../migrations/20221104151410-update-collections-hidden';
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import { createApp } from '../index';
describe('migration 20221104151410-update-collections-hidden test', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/migrations/drop-ui-schema-relation.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/migrations/drop-ui-schema-relation.test.ts
index c884c4429..3521f20f5 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/migrations/drop-ui-schema-relation.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/migrations/drop-ui-schema-relation.test.ts
@@ -1,6 +1,6 @@
-import { Database, MigrationContext } from '@nocobase/database';
-import { Plugin } from '@nocobase/server';
-import { MockServer } from '@nocobase/test';
+import { Database, MigrationContext } from '@tachybase/database';
+import { Plugin } from '@tachybase/server';
+import { MockServer } from '@tachybase/test';
import Migrator from '../../migrations/20230225111112-drop-ui-schema-relation';
import { createApp } from '../index';
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/migrations/set-collection-schema.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/migrations/set-collection-schema.test.ts
index 6e7d361be..35142c21e 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/migrations/set-collection-schema.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/migrations/set-collection-schema.test.ts
@@ -1,5 +1,5 @@
-import { Database, MigrationContext } from '@nocobase/database';
-import { MockServer, pgOnly } from '@nocobase/test';
+import { Database, MigrationContext } from '@tachybase/database';
+import { MockServer, pgOnly } from '@tachybase/test';
import Migrator from '../../migrations/20230918024546-set-collection-schema';
import { createApp } from '../index';
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/migrations/update-id-to-bigint.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/migrations/update-id-to-bigint.test.ts
index db1a29105..9cc2e3e0e 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/migrations/update-id-to-bigint.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/migrations/update-id-to-bigint.test.ts
@@ -1,7 +1,7 @@
-import { Database, MigrationContext } from '@nocobase/database';
+import { Database, MigrationContext } from '@tachybase/database';
import lodash from 'lodash';
import Migrator from '../../migrations/20221121111113-update-id-to-bigint';
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import { createApp } from '../index';
const excludeSqlite = () => (process.env.DB_DIALECT != 'sqlite' ? describe.skip : describe.skip);
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/primary-key.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/primary-key.test.ts
index 4984eefed..79472ef85 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/primary-key.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/primary-key.test.ts
@@ -1,5 +1,5 @@
-import { Database } from '@nocobase/database';
-import { MockServer } from '@nocobase/test';
+import { Database } from '@tachybase/database';
+import { MockServer } from '@tachybase/test';
import { createApp } from './index';
describe('primary key test', function () {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/reference-integerity.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/reference-integerity.test.ts
index 416360069..9a67b82c9 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/reference-integerity.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/reference-integerity.test.ts
@@ -1,5 +1,5 @@
-import Database from '@nocobase/database';
-import Application from '@nocobase/server';
+import Database from '@tachybase/database';
+import Application from '@tachybase/server';
import { createApp } from './index';
describe('reference integrity check', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/remove-collection.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/remove-collection.test.ts
index a00f5af25..e42d64226 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/remove-collection.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/remove-collection.test.ts
@@ -1,5 +1,5 @@
-import Database, { Collection as DBCollection } from '@nocobase/database';
-import Application from '@nocobase/server';
+import Database, { Collection as DBCollection } from '@tachybase/database';
+import Application from '@tachybase/server';
import { createApp } from '.';
describe('collections repository', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/resources/collections.fields.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/resources/collections.fields.test.ts
index 9449c57e0..3ed7a5564 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/resources/collections.fields.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/resources/collections.fields.test.ts
@@ -1,4 +1,4 @@
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import { createApp } from '..';
describe('collections.fields', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/resources/collections.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/resources/collections.test.ts
index cb1cd8da8..aa2734134 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/resources/collections.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/resources/collections.test.ts
@@ -1,5 +1,5 @@
-import { HasManyRepository } from '@nocobase/database';
-import { MockServer } from '@nocobase/test';
+import { HasManyRepository } from '@tachybase/database';
+import { MockServer } from '@tachybase/test';
import { createApp } from '..';
describe('collections', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/sync.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/sync.test.ts
index b6152a922..ed7f11334 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/sync.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/sync.test.ts
@@ -1,5 +1,5 @@
-import Database from '@nocobase/database';
-import Application from '@nocobase/server';
+import Database from '@tachybase/database';
+import Application from '@tachybase/server';
import { createApp } from '.';
describe('sync collection', () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/through.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/through.test.ts
index e1301412d..9f1f89922 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/through.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/through.test.ts
@@ -1,4 +1,4 @@
-import { createMockServer, startMockServer } from '@nocobase/test';
+import { createMockServer, startMockServer } from '@tachybase/test';
describe('collections repository', () => {
it('case 1', async () => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/view/view-collection.test.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/view/view-collection.test.ts
index 223dad029..206496853 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/view/view-collection.test.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/__tests__/view/view-collection.test.ts
@@ -1,6 +1,6 @@
-import Database, { Repository, ViewCollection, ViewFieldInference } from '@nocobase/database';
-import Application from '@nocobase/server';
-import { uid } from '@nocobase/utils';
+import Database, { Repository, ViewCollection, ViewFieldInference } from '@tachybase/database';
+import Application from '@tachybase/server';
+import { uid } from '@tachybase/utils';
import { createApp } from '../index';
describe('view collection', function () {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/collections/collectionCategories.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/collections/collectionCategories.ts
index 3f415cdb0..a4b35f7ee 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/collections/collectionCategories.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/collections/collectionCategories.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
export default {
dumpRules: {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/collections/collections.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/collections/collections.ts
index 9375202d3..2df74d749 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/collections/collections.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/collections/collections.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
export default {
dumpRules: 'required',
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/collections/fields.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/collections/fields.ts
index 4bf585ba7..a2c0e8ae9 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/collections/fields.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/collections/fields.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
export default {
dumpRules: 'required',
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/afterCreateForForeignKeyField.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/afterCreateForForeignKeyField.ts
index c2c69ce0b..8cfb02197 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/afterCreateForForeignKeyField.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/afterCreateForForeignKeyField.ts
@@ -1,4 +1,4 @@
-import Database from '@nocobase/database';
+import Database from '@tachybase/database';
export function afterCreateForForeignKeyField(db: Database) {
function generateFkOptions(collectionName: string, foreignKey: string) {
@@ -189,6 +189,8 @@ export function afterCreateForForeignKeyField(db: Database) {
return async (model, options) => {
try {
await hook(model, options);
- } catch (error) {}
+ } catch (error) {
+ /* empty */
+ }
};
}
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/afterCreateForReverseField.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/afterCreateForReverseField.ts
index 61005a8fb..076da5ffa 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/afterCreateForReverseField.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/afterCreateForReverseField.ts
@@ -1,4 +1,4 @@
-import Database from '@nocobase/database';
+import Database from '@tachybase/database';
export function afterCreateForReverseField(db: Database) {
return async (model, { transaction }) => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/afterDestroyForForeignKeyField.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/afterDestroyForForeignKeyField.ts
index fb55d7b17..6077229c7 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/afterDestroyForForeignKeyField.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/afterDestroyForForeignKeyField.ts
@@ -1,4 +1,4 @@
-import Database, { FindOneOptions, FindOptions, Model, Transaction } from '@nocobase/database';
+import Database, { FindOneOptions, FindOptions, Model, Transaction } from '@tachybase/database';
async function destroyFields(db: Database, transaction: Transaction, fieldRecords: Model[]) {
const fieldsRepo = db.getRepository('fields');
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeCreateForChildrenCollection.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeCreateForChildrenCollection.ts
index b9258610d..cd6530aff 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeCreateForChildrenCollection.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeCreateForChildrenCollection.ts
@@ -1,4 +1,4 @@
-import Database from '@nocobase/database';
+import Database from '@tachybase/database';
export function beforeCreateForChildrenCollection(db: Database) {
return async (model, { transaction, context }) => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeCreateForReverseField.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeCreateForReverseField.ts
index cef3bb32f..152dcf73d 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeCreateForReverseField.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeCreateForReverseField.ts
@@ -1,4 +1,4 @@
-import Database from '@nocobase/database';
+import Database from '@tachybase/database';
export function beforeCreateForReverseField(db: Database) {
return async (model, { transaction }) => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeCreateForValidateField.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeCreateForValidateField.ts
index f9f5a1080..32f4ab334 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeCreateForValidateField.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeCreateForValidateField.ts
@@ -1,4 +1,4 @@
-import { Database } from '@nocobase/database';
+import { Database } from '@tachybase/database';
export function beforeCreateForValidateField(db: Database) {
return async (model, { transaction }) => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeCreateForViewCollection.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeCreateForViewCollection.ts
index 6cd094dc6..669d89da8 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeCreateForViewCollection.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeCreateForViewCollection.ts
@@ -1,4 +1,4 @@
-import { Database } from '@nocobase/database';
+import { Database } from '@tachybase/database';
export function beforeCreateForViewCollection(db: Database) {
return async (model, { transaction, context }) => {};
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeDestroyForeignKey.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeDestroyForeignKey.ts
index 7054a27bd..39e8defa0 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeDestroyForeignKey.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeDestroyForeignKey.ts
@@ -1,4 +1,4 @@
-import Database from '@nocobase/database';
+import Database from '@tachybase/database';
export function beforeDestroyForeignKey(db: Database) {
return async (model, opts) => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeInitOptions.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeInitOptions.ts
index eaf68b111..fe9cc71c5 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeInitOptions.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/hooks/beforeInitOptions.ts
@@ -1,5 +1,5 @@
-import Database, { Model } from '@nocobase/database';
-import { uid } from '@nocobase/utils';
+import Database, { Model } from '@tachybase/database';
+import { uid } from '@tachybase/utils';
import { Utils } from 'sequelize';
const setTargetKey = (db: Database, model: Model) => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20220613103214-alert-sub-table.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20220613103214-alert-sub-table.ts
index 179930bfd..d6d73b5e5 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20220613103214-alert-sub-table.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20220613103214-alert-sub-table.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
export default class extends Migration {
appVersion = '<=0.7.0-alpha.83';
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20220704225714-drop-foreign-keys.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20220704225714-drop-foreign-keys.ts
index c2d92aa9b..907ca7818 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20220704225714-drop-foreign-keys.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20220704225714-drop-foreign-keys.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
export default class extends Migration {
appVersion = '<=0.7.1-alpha.7';
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221101111110-update-foreign-fields.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221101111110-update-foreign-fields.ts
index 919801879..56c42bd07 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221101111110-update-foreign-fields.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221101111110-update-foreign-fields.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
import { afterCreateForForeignKeyField } from '../hooks/afterCreateForForeignKeyField';
export default class DropForeignKeysMigration extends Migration {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221104151410-update-collections-hidden.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221104151410-update-collections-hidden.ts
index 23de58202..08c97fcfe 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221104151410-update-collections-hidden.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221104151410-update-collections-hidden.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
export default class UpdateCollectionsHiddenMigration extends Migration {
appVersion = '<0.8.0-alpha.11';
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221121111110-update-fk-type.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221121111110-update-fk-type.ts
index a484cf77d..edf0c3d10 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221121111110-update-fk-type.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221121111110-update-fk-type.ts
@@ -1,5 +1,5 @@
-import { DataTypes } from '@nocobase/database';
-import { Migration } from '@nocobase/server';
+import { DataTypes } from '@tachybase/database';
+import { Migration } from '@tachybase/server';
export default class UpdateIdToBigIntMigrator extends Migration {
appVersion = '<0.8.1-alpha.2';
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221121111113-update-id-to-bigint.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221121111113-update-id-to-bigint.ts
index 2e6d6c5b9..2ed909f07 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221121111113-update-id-to-bigint.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221121111113-update-id-to-bigint.ts
@@ -1,5 +1,5 @@
-import { DataTypes } from '@nocobase/database';
-import { Migration } from '@nocobase/server';
+import { DataTypes } from '@tachybase/database';
+import { Migration } from '@tachybase/server';
export default class UpdateIdToBigIntMigrator extends Migration {
appVersion = '<0.8.1-alpha.2';
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221221103220-timestamps.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221221103220-timestamps.ts
index 2f29b830d..ec03ff7f9 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221221103220-timestamps.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20221221103220-timestamps.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
export default class extends Migration {
appVersion = '<0.8.1-alpha.2';
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20230225111112-drop-ui-schema-relation.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20230225111112-drop-ui-schema-relation.ts
index 482417d1e..0d5f540a9 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20230225111112-drop-ui-schema-relation.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20230225111112-drop-ui-schema-relation.ts
@@ -1,5 +1,5 @@
-import { Collection } from '@nocobase/database';
-import { Migration } from '@nocobase/server';
+import { Collection } from '@tachybase/database';
+import { Migration } from '@tachybase/server';
import { FieldModel } from '../models';
export default class extends Migration {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20230509111114-alert-ui-schema.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20230509111114-alert-ui-schema.ts
index 6efbc3e93..4f7f2eb2e 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20230509111114-alert-ui-schema.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20230509111114-alert-ui-schema.ts
@@ -1,5 +1,5 @@
-import { Collection } from '@nocobase/database';
-import { Migration } from '@nocobase/server';
+import { Collection } from '@tachybase/database';
+import { Migration } from '@tachybase/server';
import { FieldModel } from '../models';
export default class extends Migration {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20230623145414-number-step.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20230623145414-number-step.ts
index f6b4cdce7..d121fcf6f 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20230623145414-number-step.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20230623145414-number-step.ts
@@ -1,5 +1,5 @@
-import { Collection } from '@nocobase/database';
-import { Migration } from '@nocobase/server';
+import { Collection } from '@tachybase/database';
+import { Migration } from '@tachybase/server';
import { FieldModel } from '../models';
import _ from 'lodash';
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20230704222935-tableoid.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20230704222935-tableoid.ts
index 5136020ed..c64380044 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20230704222935-tableoid.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20230704222935-tableoid.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
import _ from 'lodash';
export default class extends Migration {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20230918024546-set-collection-schema.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20230918024546-set-collection-schema.ts
index b4165d675..90510c354 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20230918024546-set-collection-schema.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20230918024546-set-collection-schema.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
export default class extends Migration {
appVersion = '<0.14.0-alpha.4';
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20240220153103-install-main-datasource.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20240220153103-install-main-datasource.ts
index 281368bc1..c38e07d14 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20240220153103-install-main-datasource.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/migrations/20240220153103-install-main-datasource.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
export default class extends Migration {
on = 'afterLoad'; // 'beforeLoad' or 'afterLoad'
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/models/collection.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/models/collection.ts
index 9caf1c637..228399160 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/models/collection.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/models/collection.ts
@@ -1,4 +1,4 @@
-import Database, { Collection, MagicAttributeModel, SyncOptions, Transactionable } from '@nocobase/database';
+import Database, { Collection, MagicAttributeModel, SyncOptions, Transactionable } from '@tachybase/database';
import lodash from 'lodash';
import { QueryInterfaceDropTableOptions } from 'sequelize';
import { FieldModel } from './field';
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/models/field.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/models/field.ts
index cae0b64b0..0ab4db324 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/models/field.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/models/field.ts
@@ -1,4 +1,4 @@
-import Database, { Collection, MagicAttributeModel, SyncOptions, Transactionable } from '@nocobase/database';
+import Database, { Collection, MagicAttributeModel, SyncOptions, Transactionable } from '@tachybase/database';
interface LoadOptions extends Transactionable {
// TODO
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/repositories/collection-repository.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/repositories/collection-repository.ts
index 1ffcf0d5a..5a45965fc 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/repositories/collection-repository.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/repositories/collection-repository.ts
@@ -1,6 +1,6 @@
-import { Repository } from '@nocobase/database';
-import { Application } from '@nocobase/server';
-import { CollectionsGraph } from '@nocobase/utils';
+import { Repository } from '@tachybase/database';
+import { Application } from '@tachybase/server';
+import { CollectionsGraph } from '@tachybase/utils';
import lodash from 'lodash';
import { CollectionModel } from '../models/collection';
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/resourcers/collections.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/resourcers/collections.ts
index 67faa908e..bd571d927 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/resourcers/collections.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/resourcers/collections.ts
@@ -1,4 +1,4 @@
-import { Database } from '@nocobase/database';
+import { Database } from '@tachybase/database';
export default {
async ['collections:setFields'](ctx, next) {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/resourcers/sql.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/resourcers/sql.ts
index 8126bf63b..3e84d27a4 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/resourcers/sql.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/resourcers/sql.ts
@@ -1,5 +1,5 @@
-import { Context, Next } from '@nocobase/actions';
-import { SQLModel, SqlCollection } from '@nocobase/database';
+import { Context, Next } from '@tachybase/actions';
+import { SQLModel, SqlCollection } from '@tachybase/database';
import { CollectionModel } from '../models';
const updateCollection = async (ctx: Context, transaction: any) => {
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/resourcers/views.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/resourcers/views.ts
index ea0294127..db115f87a 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/resourcers/views.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/resourcers/views.ts
@@ -1,4 +1,4 @@
-import { Database, ViewFieldInference } from '@nocobase/database';
+import { Database, ViewFieldInference } from '@tachybase/database';
export default {
name: 'dbViews',
diff --git a/packages/plugins/@nocobase/plugin-collection-manager/src/server/server.ts b/packages/plugins/@nocobase/plugin-collection-manager/src/server/server.ts
index 2fea0b6ad..cd17c1e1e 100644
--- a/packages/plugins/@nocobase/plugin-collection-manager/src/server/server.ts
+++ b/packages/plugins/@nocobase/plugin-collection-manager/src/server/server.ts
@@ -1,6 +1,6 @@
-import { Filter, InheritedCollection, UniqueConstraintError } from '@nocobase/database';
+import { Filter, InheritedCollection, UniqueConstraintError } from '@tachybase/database';
import PluginErrorHandler from '@nocobase/plugin-error-handler';
-import { Plugin } from '@nocobase/server';
+import { Plugin } from '@tachybase/server';
import { Mutex } from 'async-mutex';
import lodash from 'lodash';
import path from 'path';
diff --git a/packages/plugins/@nocobase/plugin-custom-request/package.json b/packages/plugins/@nocobase/plugin-custom-request/package.json
index b27eb1e32..e6ea89934 100644
--- a/packages/plugins/@nocobase/plugin-custom-request/package.json
+++ b/packages/plugins/@nocobase/plugin-custom-request/package.json
@@ -18,15 +18,15 @@
"react-router-dom": "6.x"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/evaluators": "workspace:*",
- "@nocobase/logger": "workspace:*",
- "@nocobase/sdk": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/evaluators": "workspace:*",
+ "@tachybase/logger": "workspace:*",
+ "@tachybase/sdk": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "向任意 HTTP 服务发送请求，支持将上下文数据发送给目标服务。",
"displayName.zh-CN": "操作：自定义请求",
diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/client/__e2e__/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-custom-request/src/client/__e2e__/schemaSettings.test.ts
index bb4a46bc2..2a1c07fa4 100644
--- a/packages/plugins/@nocobase/plugin-custom-request/src/client/__e2e__/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-custom-request/src/client/__e2e__/schemaSettings.test.ts
@@ -1,4 +1,4 @@
-import { test, expect, oneEmptyTable } from '@nocobase/test/e2e';
+import { test, expect, oneEmptyTable } from '@tachybase/test/e2e';
test('edit button', async ({ page, mockPage, mockRecord }) => {
await mockPage(oneEmptyTable).goto();
diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/client/components/CustomRequestAction.tsx b/packages/plugins/@nocobase/plugin-custom-request/src/client/components/CustomRequestAction.tsx
index 9ffe98e7f..9b042cb68 100644
--- a/packages/plugins/@nocobase/plugin-custom-request/src/client/components/CustomRequestAction.tsx
+++ b/packages/plugins/@nocobase/plugin-custom-request/src/client/components/CustomRequestAction.tsx
@@ -1,4 +1,4 @@
-import { Action, useAPIClient, useRequest } from '@nocobase/client';
+import { Action, useAPIClient, useRequest } from '@tachybase/client';
import React from 'react';
import { useFieldSchema } from '@tachybase/schema';
import { listByCurrentRoleUrl } from '../constants';
diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/client/components/CustomRequestActionDesigner.tsx b/packages/plugins/@nocobase/plugin-custom-request/src/client/components/CustomRequestActionDesigner.tsx
index 1895de1c7..a889069cb 100644
--- a/packages/plugins/@nocobase/plugin-custom-request/src/client/components/CustomRequestActionDesigner.tsx
+++ b/packages/plugins/@nocobase/plugin-custom-request/src/client/components/CustomRequestActionDesigner.tsx
@@ -7,7 +7,7 @@ import {
actionSettingsItems,
useCollection_deprecated,
useRequest,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { App } from 'antd';
import React from 'react';
import { listByCurrentRoleUrl } from '../constants';
diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useCustomRequestVariableOptions.ts b/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useCustomRequestVariableOptions.ts
index 8cb279581..01782e973 100644
--- a/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useCustomRequestVariableOptions.ts
+++ b/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useCustomRequestVariableOptions.ts
@@ -1,4 +1,4 @@
-import { useCollection_deprecated, useCollectionFilterOptions, useCompile } from '@nocobase/client';
+import { useCollection_deprecated, useCollectionFilterOptions, useCompile } from '@tachybase/client';
import { useMemo } from 'react';
import { useTranslation } from '../locale';
diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useCustomRequestsResource.ts b/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useCustomRequestsResource.ts
index dc32bf0eb..864b95892 100644
--- a/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useCustomRequestsResource.ts
+++ b/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useCustomRequestsResource.ts
@@ -1,5 +1,5 @@
-import { useAPIClient } from '@nocobase/client';
-export type { IResource } from '@nocobase/sdk';
+import { useAPIClient } from '@tachybase/client';
+export type { IResource } from '@tachybase/sdk';
export const useCustomRequestsResource = () => {
const apiClient = useAPIClient();
diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useCustomizeRequestActionProps.ts b/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useCustomizeRequestActionProps.ts
index e2e1ff011..92ef3b9fd 100644
--- a/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useCustomizeRequestActionProps.ts
+++ b/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useCustomizeRequestActionProps.ts
@@ -7,9 +7,9 @@ import {
useCollection_deprecated,
useCompile,
useRecord,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { App } from 'antd';
-import { isURL } from '@nocobase/utils/client';
+import { isURL } from '@tachybase/utils/client';
import { useNavigate } from 'react-router-dom';
export const useCustomizeRequestActionProps = () => {
diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useGetCustomRequest.ts b/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useGetCustomRequest.ts
index 612484f7f..10ae5eb02 100644
--- a/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useGetCustomRequest.ts
+++ b/packages/plugins/@nocobase/plugin-custom-request/src/client/hooks/useGetCustomRequest.ts
@@ -1,5 +1,5 @@
import { useFieldSchema } from '@tachybase/schema';
-import { useRequest } from '@nocobase/client';
+import { useRequest } from '@tachybase/client';
export const useGetCustomRequest = () => {
const fieldSchema = useFieldSchema();
diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/client/index.tsx b/packages/plugins/@nocobase/plugin-custom-request/src/client/index.tsx
index c1c9817f8..451d8bfa0 100644
--- a/packages/plugins/@nocobase/plugin-custom-request/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-custom-request/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin, SchemaComponentOptions } from '@nocobase/client';
+import { Plugin, SchemaComponentOptions } from '@tachybase/client';
import React from 'react';
import { CustomRequestAction } from './components';
import { customRequestActionSettings } from './components/CustomRequestActionDesigner';
diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/client/initializer/CustomRequestInitializer.tsx b/packages/plugins/@nocobase/plugin-custom-request/src/client/initializer/CustomRequestInitializer.tsx
index 1d83e6363..fe3bd5ffe 100644
--- a/packages/plugins/@nocobase/plugin-custom-request/src/client/initializer/CustomRequestInitializer.tsx
+++ b/packages/plugins/@nocobase/plugin-custom-request/src/client/initializer/CustomRequestInitializer.tsx
@@ -1,5 +1,5 @@
import { uid } from '@tachybase/schema';
-import { BlockInitializer, useSchemaInitializerItem } from '@nocobase/client';
+import { BlockInitializer, useSchemaInitializerItem } from '@tachybase/client';
import React from 'react';
import { useCustomRequestsResource } from '../hooks/useCustomRequestsResource';
diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/client/locale.ts b/packages/plugins/@nocobase/plugin-custom-request/src/client/locale.ts
index f33f10c4e..d49b60517 100644
--- a/packages/plugins/@nocobase/plugin-custom-request/src/client/locale.ts
+++ b/packages/plugins/@nocobase/plugin-custom-request/src/client/locale.ts
@@ -1,4 +1,4 @@
-import { i18n } from '@nocobase/client';
+import { i18n } from '@tachybase/client';
import { useTranslation as useT } from 'react-i18next';
export const NAMESPACE = 'custom-request';
diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/client/schemaSettings.ts b/packages/plugins/@nocobase/plugin-custom-request/src/client/schemaSettings.ts
index 6f38bda04..b47d0d8c6 100644
--- a/packages/plugins/@nocobase/plugin-custom-request/src/client/schemaSettings.ts
+++ b/packages/plugins/@nocobase/plugin-custom-request/src/client/schemaSettings.ts
@@ -7,7 +7,7 @@ import {
SecondConFirm,
useCollection,
useSchemaToolbar,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { CustomRequestACL, CustomRequestSettingsItem } from './components/CustomRequestActionDesigner';
export const customizeCustomRequestActionSettings = new SchemaSettings({
diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/server/__tests__/actions.test.ts b/packages/plugins/@nocobase/plugin-custom-request/src/server/__tests__/actions.test.ts
index 7e667fadd..0756d6f49 100644
--- a/packages/plugins/@nocobase/plugin-custom-request/src/server/__tests__/actions.test.ts
+++ b/packages/plugins/@nocobase/plugin-custom-request/src/server/__tests__/actions.test.ts
@@ -1,6 +1,6 @@
-import { Context } from '@nocobase/actions';
-import Database, { Repository } from '@nocobase/database';
-import { createMockServer, MockServer } from '@nocobase/test';
+import { Context } from '@tachybase/actions';
+import Database, { Repository } from '@tachybase/database';
+import { createMockServer, MockServer } from '@tachybase/test';
describe('actions', () => {
let app: MockServer;
diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/server/actions/listByCurrentRole.ts b/packages/plugins/@nocobase/plugin-custom-request/src/server/actions/listByCurrentRole.ts
index 82b67d7bf..21b59e0fa 100644
--- a/packages/plugins/@nocobase/plugin-custom-request/src/server/actions/listByCurrentRole.ts
+++ b/packages/plugins/@nocobase/plugin-custom-request/src/server/actions/listByCurrentRole.ts
@@ -1,4 +1,4 @@
-import { Context } from '@nocobase/actions';
+import { Context } from '@tachybase/actions';
export async function listByCurrentRole(ctx: Context) {
const repo = ctx.db.getRepository('customRequests');
diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/server/actions/send.ts b/packages/plugins/@nocobase/plugin-custom-request/src/server/actions/send.ts
index 9569dcbac..1f9c20cf6 100644
--- a/packages/plugins/@nocobase/plugin-custom-request/src/server/actions/send.ts
+++ b/packages/plugins/@nocobase/plugin-custom-request/src/server/actions/send.ts
@@ -1,7 +1,7 @@
-import { Context, Next } from '@nocobase/actions';
-import { parse } from '@nocobase/utils';
+import { Context, Next } from '@tachybase/actions';
+import { parse } from '@tachybase/utils';
-import { appendArrayColumn } from '@nocobase/evaluators';
+import { appendArrayColumn } from '@tachybase/evaluators';
import axios from 'axios';
import CustomRequestPlugin from '../plugin';
diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/server/collections/customRequest.ts b/packages/plugins/@nocobase/plugin-custom-request/src/server/collections/customRequest.ts
index 3e14cd9df..362d2df7f 100644
--- a/packages/plugins/@nocobase/plugin-custom-request/src/server/collections/customRequest.ts
+++ b/packages/plugins/@nocobase/plugin-custom-request/src/server/collections/customRequest.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
dumpRules: 'required',
diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/server/collections/customRequestsRoles.ts b/packages/plugins/@nocobase/plugin-custom-request/src/server/collections/customRequestsRoles.ts
index e35b58a54..20646c3cd 100644
--- a/packages/plugins/@nocobase/plugin-custom-request/src/server/collections/customRequestsRoles.ts
+++ b/packages/plugins/@nocobase/plugin-custom-request/src/server/collections/customRequestsRoles.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
dumpRules: 'required',
diff --git a/packages/plugins/@nocobase/plugin-custom-request/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-custom-request/src/server/plugin.ts
index e73662c7b..693eaa86f 100644
--- a/packages/plugins/@nocobase/plugin-custom-request/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-custom-request/src/server/plugin.ts
@@ -1,5 +1,5 @@
-import { Logger, LoggerOptions } from '@nocobase/logger';
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { Logger, LoggerOptions } from '@tachybase/logger';
+import { InstallOptions, Plugin } from '@tachybase/server';
import { resolve } from 'path';
import { listByCurrentRole } from './actions/listByCurrentRole';
import { send } from './actions/send';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/package.json b/packages/plugins/@nocobase/plugin-data-source-manager/package.json
index c182a70b6..0c597c38a 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/package.json
@@ -24,12 +24,12 @@
"sequelize": "^6.26.0"
},
"peerDependencies": {
- "@nocobase/acl": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/acl": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "管理数据源，包括内置的 Master 数据库，外部的数据库、API。",
"displayName.zh-CN": "数据源管理",
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/DatabaseConnectionProvider.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/DatabaseConnectionProvider.tsx
index 389d9837f..f20259f64 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/DatabaseConnectionProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/DatabaseConnectionProvider.tsx
@@ -1,4 +1,4 @@
-import { SchemaComponentOptions } from '@nocobase/client';
+import { SchemaComponentOptions } from '@tachybase/client';
import React, { FC, useState, createContext } from 'react';
import * as hooks from './hooks';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/ThridDataSource.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/ThridDataSource.ts
index 8609de1f9..4f8036f89 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/ThridDataSource.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/ThridDataSource.ts
@@ -1,4 +1,4 @@
-import { DataSourceOptions, DataSource } from '@nocobase/client';
+import { DataSourceOptions, DataSource } from '@tachybase/client';
export class ThirdDataSource extends DataSource {
async getDataSource() {
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/BreadcumbTitle.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/BreadcumbTitle.tsx
index 615f97b2c..ea73c2350 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/BreadcumbTitle.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/BreadcumbTitle.tsx
@@ -1,5 +1,5 @@
import { RightOutlined } from '@ant-design/icons';
-import { useApp, useCompile, useDataSourceManager } from '@nocobase/client';
+import { useApp, useCompile, useDataSourceManager } from '@tachybase/client';
import { Breadcrumb, Space, Tag } from 'antd';
import React, { useContext, useMemo } from 'react';
import { Link, useParams } from 'react-router-dom';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/AddFieldAction.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/AddFieldAction.tsx
index 12161e724..c8e6f92d7 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/AddFieldAction.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/AddFieldAction.tsx
@@ -23,7 +23,7 @@ import {
useAPIClient,
useFieldInterfaceOptions,
useDataSourceManager,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { ForeignKey } from './components';
const getSchema = (schema: IField, record: any, compile) => {
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/CollectionFields.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/CollectionFields.tsx
index b88139c73..93d4a82dd 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/CollectionFields.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/CollectionFields.tsx
@@ -16,7 +16,7 @@ import {
Select,
Collection,
useDataSourceManager,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { collection, fieldsTableSchema } from './schema/collectionFields';
import { TitleField } from './components/TitleField';
import { CollectionFieldInterfaceSelect } from './components/CollectionFieldInterfaceSelect';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/ConfigurationTable.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/ConfigurationTable.tsx
index 5e2072d26..3d7a4415d 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/ConfigurationTable.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/ConfigurationTable.tsx
@@ -20,7 +20,7 @@ import {
TemplateSummary,
ResourceActionContext,
useDataSourceManager,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { message } from 'antd';
import { getCollectionSchema } from './schema/collections';
import { CollectionFields } from './CollectionFields';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/ConfigurationTabs.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/ConfigurationTabs.tsx
index c80b50875..4e93de840 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/ConfigurationTabs.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/ConfigurationTabs.tsx
@@ -10,7 +10,7 @@ import {
useCompile,
useResourceActionContext,
CollectionCategroriesContext,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { CollectionFields } from './CollectionFields';
import { CollectionName } from './components/CollectionName';
import { collectionTableSchema } from './schema/collections';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/EditCollectionAction.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/EditCollectionAction.tsx
index 00590ced2..89d849702 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/EditCollectionAction.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/EditCollectionAction.tsx
@@ -17,7 +17,7 @@ import {
useResourceContext,
useCancelAction,
useDataSourceManager,
-} from '@nocobase/client';
+} from '@tachybase/client';
import cloneDeep from 'lodash/cloneDeep';
import omit from 'lodash/omit';
import React, { useEffect, useState } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/EditFieldAction.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/EditFieldAction.tsx
index 7f56ffb40..fec177121 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/EditFieldAction.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/EditFieldAction.tsx
@@ -23,7 +23,7 @@ import {
useCurrentAppInfo,
useCollectionParentRecordData,
useDataSourceManager,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { useRemoteCollectionContext } from './CollectionFields';
const getSchema = ({
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/CollectionFieldInterfaceSelect.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/CollectionFieldInterfaceSelect.tsx
index d8a46297d..c2995da23 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/CollectionFieldInterfaceSelect.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/CollectionFieldInterfaceSelect.tsx
@@ -1,7 +1,7 @@
import { observer, useForm, useField } from '@tachybase/schema';
import { Select, Tag } from 'antd';
import React, { useState } from 'react';
-import { useCompile, useCollectionManager_deprecated, useRecord, useFieldInterfaceOptions } from '@nocobase/client';
+import { useCompile, useCollectionManager_deprecated, useRecord, useFieldInterfaceOptions } from '@tachybase/client';
const getInterfaceOptions = (data, type) => {
const interfaceOptions = [];
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/CollectionName.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/CollectionName.tsx
index 1a322da1d..73f70a626 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/CollectionName.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/CollectionName.tsx
@@ -3,7 +3,7 @@ import { LoadingOutlined } from '@ant-design/icons';
import { connect, mapProps, mapReadPretty } from '@tachybase/schema';
import { Input as AntdInput } from 'antd';
import cls from 'classnames';
-import { useCollectionRecord } from '@nocobase/client';
+import { useCollectionRecord } from '@tachybase/client';
import { usePrefixCls } from '@tachybase/components';
const ReadPretty = (props) => {
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/FieldTitleInput.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/FieldTitleInput.tsx
index a892f2450..cd0933bce 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/FieldTitleInput.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/FieldTitleInput.tsx
@@ -2,7 +2,7 @@ import { observer } from '@tachybase/schema';
import { Input } from 'antd';
import { debounce } from 'lodash';
import React, { useState, useMemo, useEffect } from 'react';
-import { useRecord } from '@nocobase/client';
+import { useRecord } from '@tachybase/client';
export const FieldTitleInput = observer(
(props: any) => {
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/FieldType.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/FieldType.tsx
index 208f7307a..27fc32b87 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/FieldType.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/FieldType.tsx
@@ -1,5 +1,5 @@
import { observer } from '@tachybase/schema';
-import { useRecord } from '@nocobase/client';
+import { useRecord } from '@tachybase/client';
import { Select, Tag } from 'antd';
import React from 'react';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/TitleField.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/TitleField.tsx
index 10788264b..e73be7224 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/TitleField.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/TitleField.tsx
@@ -7,7 +7,7 @@ import {
useAPIClient,
withDynamicSchemaProps,
useProps,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { useRemoteCollectionContext } from '../CollectionFields';
export const TitleField = withDynamicSchemaProps(
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/UnSupportFields.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/UnSupportFields.tsx
index 97f809514..052e6abfe 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/UnSupportFields.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/UnSupportFields.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { Table, Divider } from 'antd';
import { useTranslation } from 'react-i18next';
-import { useRecord } from '@nocobase/client';
+import { useRecord } from '@tachybase/client';
import { NAMESPACE } from '../../../locale';
export const UnSupportFields = () => {
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/index.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/index.tsx
index c60118bbd..149f15b86 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/index.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/components/index.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
import { Select } from 'antd';
import { observer, useForm, useField } from '@tachybase/schema';
import { useParams } from 'react-router-dom';
-import { useRecord, useCompile, useAPIClient, useCollectionManager_deprecated } from '@nocobase/client';
+import { useRecord, useCompile, useAPIClient, useCollectionManager_deprecated } from '@tachybase/client';
import { useRemoteCollectionContext } from '../CollectionFields';
const supportTypes = ['string', 'bigInt', 'integer', 'uuid', 'uid'];
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/hooks.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/hooks.ts
index f32827989..f2dee2e58 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/hooks.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/hooks.ts
@@ -1,7 +1,7 @@
import { message } from 'antd';
import { useTranslation } from 'react-i18next';
import { useParams } from 'react-router-dom';
-import { useAPIClient, useRecord, useResourceActionContext, useActionContext } from '@nocobase/client';
+import { useAPIClient, useRecord, useResourceActionContext, useActionContext } from '@tachybase/client';
export const useDestroyAction = () => {
const { refresh } = useResourceActionContext();
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/index.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/index.tsx
index 17a018e80..072e0f606 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/index.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/index.tsx
@@ -21,7 +21,7 @@ import {
DeleteCollection,
DeleteCollectionAction,
CollectionCategroriesProvider,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { ConfigurationTable } from './ConfigurationTable';
import { ConfigurationTabs } from './ConfigurationTabs';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/schema/collectionFields.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/schema/collectionFields.ts
index 6eb4c4d40..5413ebd56 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/schema/collectionFields.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/schema/collectionFields.ts
@@ -1,6 +1,6 @@
import { ISchema } from '@tachybase/schema';
import { uid } from '@tachybase/schema';
-import { CollectionOptions } from '@nocobase/client';
+import { CollectionOptions } from '@tachybase/client';
import { NAMESPACE } from '../../../locale';
export const collection: CollectionOptions = {
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/schema/collections.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/schema/collections.ts
index 24bd12d77..a82ee7807 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/schema/collections.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CollectionsManager/schema/collections.ts
@@ -2,7 +2,7 @@ import { ISchema, Schema } from '@tachybase/schema';
import { uid } from '@tachybase/schema';
import { message } from 'antd';
import { useTranslation } from 'react-i18next';
-import { useAPIClient, i18n, CollectionOptions } from '@nocobase/client';
+import { useAPIClient, i18n, CollectionOptions } from '@tachybase/client';
export const compile = (source) => {
return Schema.compile(source, { t: i18n.t });
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CreateDatabaseConnectAction.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CreateDatabaseConnectAction.tsx
index b261c041a..f56d0d5ed 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CreateDatabaseConnectAction.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/CreateDatabaseConnectAction.tsx
@@ -1,6 +1,6 @@
import { DownOutlined, PlusOutlined } from '@ant-design/icons';
import { uid } from '@tachybase/schema';
-import { ActionContext, SchemaComponent, useAPIClient, useCompile, usePlugin } from '@nocobase/client';
+import { ActionContext, SchemaComponent, useAPIClient, useCompile, usePlugin } from '@tachybase/client';
import { Button, Dropdown, Empty } from 'antd';
import React, { useState } from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/DatabaseConnectionManager.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/DatabaseConnectionManager.tsx
index 8909f14af..1fa11ef1f 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/DatabaseConnectionManager.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/DatabaseConnectionManager.tsx
@@ -6,7 +6,7 @@ import {
useResourceContext,
useRecord,
useDataSourceManager,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { Card } from 'antd';
import _ from 'lodash';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/EditDatabaseConnectionAction.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/EditDatabaseConnectionAction.tsx
index ebed1faeb..bf4c55472 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/EditDatabaseConnectionAction.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/EditDatabaseConnectionAction.tsx
@@ -9,7 +9,7 @@ import {
useResourceActionContext,
useResourceContext,
useDataSourceManager,
-} from '@nocobase/client';
+} from '@tachybase/client';
import _ from 'lodash';
import React, { useState } from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/AddCategoryAction.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/AddCategoryAction.tsx
index 8999e8b1c..e98096b1e 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/AddCategoryAction.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/AddCategoryAction.tsx
@@ -12,7 +12,7 @@ import {
CollectionCategroriesContext,
CollectionCategory,
CollectionTemplateTag,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { collectionCategorySchema } from './schemas/collections';
const useCreateCategry = () => {
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFields.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFields.tsx
index 28d578b16..c74115c36 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFields.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFields.tsx
@@ -27,7 +27,7 @@ import {
useResourceActionContext,
useResourceContext,
ViewCollectionField,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { collection } from './schemas/collectionFields';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFieldsTable.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFieldsTable.tsx
index 4f4268cc0..c01b835b6 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFieldsTable.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFieldsTable.tsx
@@ -4,7 +4,7 @@ import { useAttach } from '@tachybase/schema';
import { Options, Result } from 'ahooks/es/useRequest/src/types';
import { TableProps } from 'antd';
import React, { useMemo } from 'react';
-import { AsyncDataProvider, useAsyncData, useRequest } from '@nocobase/client';
+import { AsyncDataProvider, useAsyncData, useRequest } from '@tachybase/client';
import { CollectionFieldsTableArray } from './CollectionFieldsTableArray';
type TableVoidProps = TableProps & {
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFieldsTableArray.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFieldsTableArray.tsx
index e00ab4977..57dc9c824 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFieldsTableArray.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/CollectionFieldsTableArray.tsx
@@ -10,7 +10,7 @@ import {
useRecord,
useRequest,
useSchemaInitializerRender,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { Table, TableColumnProps } from 'antd';
import { default as classNames } from 'classnames';
import { findIndex } from 'lodash';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/ConfigurationTable.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/ConfigurationTable.tsx
index b3aef15c7..4010e8d29 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/ConfigurationTable.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/ConfigurationTable.tsx
@@ -19,7 +19,7 @@ import {
CollectionCategroriesContext,
FieldSummary,
TemplateSummary,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { CollectionFields } from './CollectionFields';
import { collectionSchema } from './schemas/collections';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/ConfigurationTabs.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/ConfigurationTabs.tsx
index f82e0c771..c5d387373 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/ConfigurationTabs.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/ConfigurationTabs.tsx
@@ -22,7 +22,7 @@ import {
useCompile,
useResourceActionContext,
CollectionCategroriesContext,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { CollectionFields } from './CollectionFields';
import { collectionTableSchema } from './schemas/collections';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/EditCategoryAction.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/EditCategoryAction.tsx
index 2652984e7..93f8327c8 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/EditCategoryAction.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/EditCategoryAction.tsx
@@ -13,7 +13,7 @@ import {
useResourceActionContext,
useCancelAction,
CollectionCategroriesContext,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { collectionCategoryEditSchema } from './schemas/collections';
const useEditCategry = () => {
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/interfaces.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/interfaces.tsx
index 8998fd8c9..03ab4d343 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/interfaces.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/interfaces.tsx
@@ -1,4 +1,4 @@
-import { CollectionFieldInterface, useDataSourceManager } from '@nocobase/client';
+import { CollectionFieldInterface, useDataSourceManager } from '@tachybase/client';
import { useMemo } from 'react';
export const getOptions = (
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/schemas/collectionFields.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/schemas/collectionFields.ts
index 4b1159bbf..3f53935c7 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/schemas/collectionFields.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/schemas/collectionFields.ts
@@ -1,5 +1,5 @@
import { ISchema } from '@tachybase/schema';
-import { CollectionFieldInterfaceTag, CollectionOptions } from '@nocobase/client';
+import { CollectionFieldInterfaceTag, CollectionOptions } from '@tachybase/client';
export const collection: CollectionOptions = {
name: 'fields',
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/schemas/collections.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/schemas/collections.ts
index 6dccbc5a4..e8e9d4c6c 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/schemas/collections.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/Configuration/schemas/collections.ts
@@ -2,9 +2,9 @@ import { ISchema, Schema } from '@tachybase/schema';
import { uid } from '@tachybase/schema';
import { message } from 'antd';
import { useTranslation } from 'react-i18next';
-import { useAPIClient, i18n } from '@nocobase/client';
-import { CollectionCategory, CollectionTemplateTag } from '@nocobase/client';
-import type { CollectionOptions } from '@nocobase/client';
+import { useAPIClient, i18n } from '@tachybase/client';
+import { CollectionCategory, CollectionTemplateTag } from '@tachybase/client';
+import type { CollectionOptions } from '@tachybase/client';
const compile = (source) => {
return Schema.compile(source, { t: i18n.t });
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/index.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/index.tsx
index 9971f1635..0e9ab45a4 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/index.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/MainDataSourceManager/index.tsx
@@ -21,7 +21,7 @@ import {
DeleteCollection,
DeleteCollectionAction,
CollectionCategroriesProvider,
-} from '@nocobase/client';
+} from '@tachybase/client';
import {
AddCategory,
AddCategoryAction,
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/DataSourceTable.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/DataSourceTable.tsx
index 8cdbdbcfb..9ecc372af 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/DataSourceTable.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/DataSourceTable.tsx
@@ -6,7 +6,7 @@ import {
SchemaComponentContext,
SettingCenterPermissionProvider,
useRecord,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { dataSourceSchema } from './schemas/dataSourceTable';
import { PermissionProvider } from './PermisionProvider';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/PermisionProvider.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/PermisionProvider.tsx
index dd09b1802..39adbfa2b 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/PermisionProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/PermisionProvider.tsx
@@ -1,7 +1,7 @@
import { message } from 'antd';
import React, { createContext, useContext, useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
-import { useAPIClient, useRecord, RecordContext_deprecated, SchemaComponentOptions } from '@nocobase/client';
+import { useAPIClient, useRecord, RecordContext_deprecated, SchemaComponentOptions } from '@tachybase/client';
import { CurrentRolesContext } from './';
export const SettingCenterPermissionProvider = (props) => {
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/RoleConfigure.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/RoleConfigure.tsx
index 9be55a510..e676ac465 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/RoleConfigure.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/RoleConfigure.tsx
@@ -1,7 +1,7 @@
import { onFieldChange } from '@tachybase/schema';
import React, { useContext } from 'react';
import { useTranslation } from 'react-i18next';
-import { useAPIClient, useRequest, SchemaComponent, useRecord } from '@nocobase/client';
+import { useAPIClient, useRequest, SchemaComponent, useRecord } from '@tachybase/client';
import { PermissionContext } from './PermisionProvider';
import { CurrentRolesContext } from './';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/RolesResourcesActions.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/RolesResourcesActions.tsx
index 843e80b7f..5045ff66e 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/RolesResourcesActions.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/RolesResourcesActions.tsx
@@ -5,7 +5,7 @@ import { Checkbox, Table, Tag } from 'antd';
import { isEmpty } from 'lodash';
import React, { createContext, useContext } from 'react';
import { useTranslation } from 'react-i18next';
-import { useCompile, useRecord } from '@nocobase/client';
+import { useCompile, useRecord } from '@tachybase/client';
import { useStyles } from './style';
import { useAvailableActions } from './DataSourceTable';
import { ScopeSelect } from './ScopeSelect';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/ScopeSelect.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/ScopeSelect.tsx
index 8723cb6b3..8cb5dba19 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/ScopeSelect.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/ScopeSelect.tsx
@@ -1,6 +1,6 @@
import { createForm } from '@tachybase/schema';
import React, { createContext, useContext, useMemo, useState } from 'react';
-import { FormProvider, SchemaComponent, useRecord } from '@nocobase/client';
+import { FormProvider, SchemaComponent, useRecord } from '@tachybase/client';
import { getScopesSchema } from './schemas/scopes';
const RolesResourcesScopesSelectedRowKeysContext = createContext(null);
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/StrategyActions.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/StrategyActions.tsx
index bdd1c3db6..702199198 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/StrategyActions.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/StrategyActions.tsx
@@ -3,7 +3,7 @@ import { connect, useField } from '@tachybase/schema';
import { Checkbox, Select, Table, Tag } from 'antd';
import React from 'react';
import { useTranslation } from 'react-i18next';
-import { useCompile } from '@nocobase/client';
+import { useCompile } from '@tachybase/client';
import { useAvailableActions } from './DataSourceTable';
const toScopes = (value) => {
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/index.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/index.tsx
index 99cb4fccc..07e3c935e 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/index.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/index.tsx
@@ -8,7 +8,7 @@ import {
SettingsCenterConfigure,
SettingCenterProvider,
ResourceActionProvider,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { DataSourceTable } from './DataSourceTable';
import { RoleConfigure } from './RoleConfigure';
import { StrategyActions } from './StrategyActions';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/scopes.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/scopes.ts
index a542cd2c1..d871dd63c 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/scopes.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/scopes.ts
@@ -1,6 +1,6 @@
import { ISchema } from '@tachybase/schema';
import { useContext, useEffect } from 'react';
-import { useFormBlockContext, VariableInput, useFilterFieldOptions } from '@nocobase/client';
+import { useFormBlockContext, VariableInput, useFilterFieldOptions } from '@tachybase/client';
import { RoleResourceCollectionContext } from '../RolesResourcesActions';
export const rolesResourcesScopesCollection = (dataSourceKey = 'main') => {
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/useRoleResourceValues.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/useRoleResourceValues.ts
index 399738521..4b39323a8 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/useRoleResourceValues.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/useRoleResourceValues.ts
@@ -1,5 +1,5 @@
import { useEffect, useContext } from 'react';
-import { useActionContext, useRecord, useRequest } from '@nocobase/client';
+import { useActionContext, useRecord, useRequest } from '@tachybase/client';
import { PermissionContext } from '../PermisionProvider';
export const useRoleResourceValues = (options) => {
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/useSaveRoleResourceAction.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/useSaveRoleResourceAction.ts
index 047f63dd8..4d91452ae 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/useSaveRoleResourceAction.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/PermissionManager/schemas/useSaveRoleResourceAction.ts
@@ -1,6 +1,6 @@
import { useForm } from '@tachybase/schema';
import { useContext } from 'react';
-import { useActionContext, useAPIClient, useRecord, useResourceActionContext } from '@nocobase/client';
+import { useActionContext, useAPIClient, useRecord, useResourceActionContext } from '@tachybase/client';
import { PermissionContext } from '../PermisionProvider';
export const useSaveRoleResourceAction = () => {
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/ViewDatabaseConnectionAction.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/ViewDatabaseConnectionAction.tsx
index 164ba96f9..61e3376a9 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/ViewDatabaseConnectionAction.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/component/ViewDatabaseConnectionAction.tsx
@@ -1,4 +1,4 @@
-import { useRecord } from '@nocobase/client';
+import { useRecord } from '@tachybase/client';
import React from 'react';
import { Button } from 'antd';
import { css } from '@emotion/css';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/hooks/index.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/hooks/index.ts
index 79d1d96fe..bdd3638be 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/hooks/index.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/hooks/index.ts
@@ -1,7 +1,7 @@
import { useForm, useField } from '@tachybase/schema';
import { message } from 'antd';
import { useTranslation } from 'react-i18next';
-import { useActionContext, useAPIClient } from '@nocobase/client';
+import { useActionContext, useAPIClient } from '@tachybase/client';
import { NAMESPACE } from '../locale';
export const useCreateDatabaseServer = (handleDataServerChange) => {
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/index.tsx b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/index.tsx
index fd1030f2b..e7a6b57d2 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import React from 'react';
import { DatabaseConnectionProvider } from './DatabaseConnectionProvider';
import { ThirdDataSource } from './ThridDataSource';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/locale/index.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/locale/index.ts
index 57c92f1ed..fc47c25ca 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/client/locale/index.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/client/locale/index.ts
@@ -1,4 +1,4 @@
-import { i18n } from '@nocobase/client';
+import { i18n } from '@tachybase/client';
export const NAMESPACE = 'data-source-manager';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/__tests__/data-source-with-acl.test.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/__tests__/data-source-with-acl.test.ts
index b70f92921..2c686bc47 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/__tests__/data-source-with-acl.test.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/__tests__/data-source-with-acl.test.ts
@@ -1,7 +1,7 @@
-import { createMockServer, MockServer } from '@nocobase/test';
-import { CollectionManager, DataSource, IRepository } from '@nocobase/data-source-manager';
+import { createMockServer, MockServer } from '@tachybase/test';
+import { CollectionManager, DataSource, IRepository } from '@tachybase/data-source-manager';
import { SuperAgentTest } from 'supertest';
-import { ICollectionManager, IModel } from '@nocobase/data-source-manager/src/types';
+import { ICollectionManager, IModel } from '@tachybase/data-source-manager/src/types';
describe('data source with acl', () => {
let app: MockServer;
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/__tests__/data-sources.test.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/__tests__/data-sources.test.ts
index 7c2fbd712..7566a3c66 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/__tests__/data-sources.test.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/__tests__/data-sources.test.ts
@@ -1,5 +1,5 @@
-import { createMockServer, MockServer, waitSecond } from '@nocobase/test';
-import { CollectionManager, DataSource } from '@nocobase/data-source-manager';
+import { createMockServer, MockServer, waitSecond } from '@tachybase/test';
+import { CollectionManager, DataSource } from '@tachybase/data-source-manager';
describe('data source', async () => {
let app: MockServer;
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-collections.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-collections.ts
index d4a54a93d..630e81879 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-collections.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-collections.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
name: 'dataSourcesCollections',
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-fields.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-fields.ts
index 040822e18..011169035 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-fields.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-fields.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
name: 'dataSourcesFields',
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-roles-resources-actions.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-roles-resources-actions.ts
index f32bfc9bc..b88afb15e 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-roles-resources-actions.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-roles-resources-actions.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
dumpRules: 'required',
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-roles-resources-scopes.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-roles-resources-scopes.ts
index 128a10243..c866e8ec2 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-roles-resources-scopes.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-roles-resources-scopes.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
dumpRules: 'required',
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-roles-resources.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-roles-resources.ts
index cbb9bdede..503e0d0ac 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-roles-resources.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-roles-resources.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
dumpRules: 'required',
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-roles.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-roles.ts
index ecd3339e4..5a1edb007 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-roles.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources-roles.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
name: 'dataSourcesRoles',
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources.ts
index 8a4eb89e2..865bc7eef 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/collections/data-sources.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
name: 'dataSources',
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/migrations/20240301164024-migrate-acl-resources.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/migrations/20240301164024-migrate-acl-resources.ts
index 2b23e58ed..68c4492cc 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/migrations/20240301164024-migrate-acl-resources.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/migrations/20240301164024-migrate-acl-resources.ts
@@ -1,5 +1,5 @@
-import { Migration } from '@nocobase/server';
-import { uid } from '@nocobase/utils';
+import { Migration } from '@tachybase/server';
+import { uid } from '@tachybase/utils';
export default class extends Migration {
on = 'afterSync'; // 'beforeLoad' or 'afterLoad'
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/models/data-source.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/models/data-source.ts
index 8085dab76..983c9710a 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/models/data-source.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/models/data-source.ts
@@ -1,8 +1,8 @@
-import { Model, Transaction } from '@nocobase/database';
-import { Application } from '@nocobase/server';
+import { Model, Transaction } from '@tachybase/database';
+import { Application } from '@tachybase/server';
import { LocalData } from '../services/database-introspector';
import { setCurrentRole } from '@nocobase/plugin-acl';
-import { ACL, AvailableActionOptions } from '@nocobase/acl';
+import { ACL, AvailableActionOptions } from '@tachybase/acl';
import { DataSourcesRolesModel } from './data-sources-roles-model';
import PluginDataSourceManagerServer from '../plugin';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/models/data-sources-collection-model.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/models/data-sources-collection-model.ts
index 9ce40faa6..0a5608889 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/models/data-sources-collection-model.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/models/data-sources-collection-model.ts
@@ -1,5 +1,5 @@
-import { MagicAttributeModel } from '@nocobase/database';
-import { Application } from '@nocobase/server';
+import { MagicAttributeModel } from '@tachybase/database';
+import { Application } from '@tachybase/server';
export class DataSourcesCollectionModel extends MagicAttributeModel {
load(loadOptions: { app: Application }) {
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/models/data-sources-field-model.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/models/data-sources-field-model.ts
index b2be5c746..96a6e3a4d 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/models/data-sources-field-model.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/models/data-sources-field-model.ts
@@ -1,5 +1,5 @@
-import { MagicAttributeModel } from '@nocobase/database';
-import { Application } from '@nocobase/server';
+import { MagicAttributeModel } from '@tachybase/database';
+import { Application } from '@tachybase/server';
import { mergeOptions } from '../utils';
type LoadOptions = {
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/models/data-sources-roles-model.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/models/data-sources-roles-model.ts
index f6d1d03dd..453516b1c 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/models/data-sources-roles-model.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/models/data-sources-roles-model.ts
@@ -1,5 +1,5 @@
-import { Model } from '@nocobase/database';
-import { ACL } from '@nocobase/acl';
+import { Model } from '@tachybase/database';
+import { ACL } from '@tachybase/acl';
import { Transaction } from 'sequelize';
import { DataSourcesRolesResourcesModel } from './connections-roles-resources';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/plugin.ts
index 8d0cbecf4..80fb1ac64 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/plugin.ts
@@ -1,4 +1,4 @@
-import { Application, Plugin } from '@nocobase/server';
+import { Application, Plugin } from '@tachybase/server';
import { resolve } from 'path';
import { DataSourcesCollectionModel } from './models/data-sources-collection-model';
import { DataSourcesFieldModel } from './models/data-sources-field-model';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/services/collection-manager.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/services/collection-manager.ts
index 91b44f588..3333c730b 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/services/collection-manager.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/services/collection-manager.ts
@@ -1,4 +1,4 @@
-import { Database } from '@nocobase/database';
+import { Database } from '@tachybase/database';
export class CollectionManager {
constructor(private db: Database) {}
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/services/database-introspector.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/services/database-introspector.ts
index d26426dce..ada6adacd 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/services/database-introspector.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/services/database-introspector.ts
@@ -1,4 +1,4 @@
-import { Database, ViewFieldInference } from '@nocobase/database';
+import { Database, ViewFieldInference } from '@tachybase/database';
import { ColumnsDescription } from 'sequelize';
import lodash from 'lodash';
import typeInterfaceMap from './type-interface-map';
diff --git a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/services/full-data-repository.ts b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/services/full-data-repository.ts
index 32c03ed98..f07a04b02 100644
--- a/packages/plugins/@nocobase/plugin-data-source-manager/src/server/services/full-data-repository.ts
+++ b/packages/plugins/@nocobase/plugin-data-source-manager/src/server/services/full-data-repository.ts
@@ -1,4 +1,4 @@
-import { CountOptions, FindOptions } from '@nocobase/database';
+import { CountOptions, FindOptions } from '@tachybase/database';
export class FullDataRepository {
data: Array = [];
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/package.json b/packages/plugins/@nocobase/plugin-data-visualization/package.json
index edc00e02d..8f3975fc4 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/package.json
+++ b/packages/plugins/@nocobase/plugin-data-visualization/package.json
@@ -27,13 +27,13 @@
"sequelize": "^6.26.0"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/cache": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/cache": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "提供数据可视化功能，包含图表区块和图表筛选区块，支持折线图、面积图、柱状图等十几种图表，你也可以扩展更多图表类型。",
"displayName.zh-CN": "数据可视化",
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/__tests__/hooks.test.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/__tests__/hooks.test.ts
index 336f3fd25..69514317d 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/__tests__/hooks.test.ts
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/__tests__/hooks.test.ts
@@ -1,4 +1,4 @@
-import * as client from '@nocobase/client';
+import * as client from '@tachybase/client';
import { renderHook } from '@testing-library/react';
import { vi } from 'vitest';
import formatters from '../block/formatters';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlock.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlock.tsx
index 11f04752e..14de79bd6 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlock.tsx
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlock.tsx
@@ -1,4 +1,4 @@
-import { SchemaComponentOptions, SchemaInitializerContext, useSchemaInitializer } from '@nocobase/client';
+import { SchemaComponentOptions, SchemaInitializerContext, useSchemaInitializer } from '@tachybase/client';
import React, { useState } from 'react';
import { ChartConfigProvider } from '../configure';
import { ChartDataProvider } from './ChartDataProvider';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlockDesigner.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlockDesigner.tsx
index 90697dbd4..79cc0c021 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlockDesigner.tsx
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlockDesigner.tsx
@@ -3,7 +3,7 @@ import {
SchemaSettingsBlockTitleItem,
SchemaSettingsDivider,
SchemaSettingsRemove,
-} from '@nocobase/client';
+} from '@tachybase/client';
import React from 'react';
import { useChartsTranslation } from '../locale';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlockInitializer.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlockInitializer.tsx
index bd1c2ba67..43892761a 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlockInitializer.tsx
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/block/ChartBlockInitializer.tsx
@@ -8,7 +8,7 @@ import {
useACLRoleContext,
useSchemaInitializer,
useSchemaInitializerItem,
-} from '@nocobase/client';
+} from '@tachybase/client';
import React, { useCallback, useContext } from 'react';
import { ChartConfigContext } from '../configure';
import { FilterBlockInitializer } from '../filter';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/antd/GroupedTable.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/antd/GroupedTable.ts
index e7edd266c..73db186f9 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/antd/GroupedTable.ts
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/antd/GroupedTable.ts
@@ -1,4 +1,4 @@
-import { uid } from '@nocobase/utils/client';
+import { uid } from '@tachybase/utils/client';
import { RenderProps } from '../chart';
import { AntdChart } from './antd';
import { Table as AntdTable } from 'antd';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/group.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/group.ts
index d947c4b80..2a3110675 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/group.ts
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/chart/group.ts
@@ -1,4 +1,4 @@
-import { usePlugin } from '@nocobase/client';
+import { usePlugin } from '@tachybase/client';
import { ChartType } from './chart';
import DataVisualizationPlugin from '..';
import { lang } from '../locale';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/ChartConfigProvider.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/ChartConfigProvider.tsx
index 115b0a723..a6d958664 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/ChartConfigProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/ChartConfigProvider.tsx
@@ -2,7 +2,7 @@ import { ISchema } from '@tachybase/schema';
import React, { createContext, useState } from 'react';
import { ChartRendererProvider } from '../renderer';
import { ChartConfigure } from './ChartConfigure';
-import { useDesignable } from '@nocobase/client';
+import { useDesignable } from '@tachybase/client';
import { css } from '@emotion/css';
import { theme } from 'antd';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/ChartConfigure.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/ChartConfigure.tsx
index db32a8890..d482611ae 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/ChartConfigure.tsx
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/ChartConfigure.tsx
@@ -2,7 +2,7 @@ import { RightSquareOutlined } from '@ant-design/icons';
import { ArrayItems, Editable, FormCollapse, FormItem, FormLayout, Switch } from '@tachybase/components';
import { Form as FormType, ObjectField, createForm, onFieldChange, onFormInit } from '@tachybase/schema';
import { FormConsumer, ISchema, Schema } from '@tachybase/schema';
-import { AutoComplete, FormProvider, SchemaComponent, gridRowColWrap, useDesignable } from '@nocobase/client';
+import { AutoComplete, FormProvider, SchemaComponent, gridRowColWrap, useDesignable } from '@tachybase/client';
import { Alert, App, Button, Card, Col, Modal, Row, Space, Table, Tabs, Typography } from 'antd';
import { cloneDeep, isEqual } from 'lodash';
import React, { createContext, useContext, useEffect, useMemo, useRef } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/FilterDynamicComponent.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/FilterDynamicComponent.tsx
index 26e519077..86cdd7fea 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/FilterDynamicComponent.tsx
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/configure/FilterDynamicComponent.tsx
@@ -1,4 +1,4 @@
-import { Variable } from '@nocobase/client';
+import { Variable } from '@tachybase/client';
import React from 'react';
import { useVariableOptions } from '../hooks';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/CollectionFieldInitializer.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/CollectionFieldInitializer.tsx
index 96b2c7d7b..558eed237 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/CollectionFieldInitializer.tsx
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/CollectionFieldInitializer.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { InitializerWithSwitch, useSchemaInitializerItem } from '@nocobase/client';
+import { InitializerWithSwitch, useSchemaInitializerItem } from '@tachybase/client';
import { ISchema } from '@tachybase/schema';
export const CollectionFieldInitializer = () => {
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterActionInitializers.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterActionInitializers.tsx
index 5568a6e05..48786ad96 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterActionInitializers.tsx
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterActionInitializers.tsx
@@ -7,7 +7,7 @@ import {
GeneralSchemaDesigner,
SchemaSettingsDivider,
SchemaSettingsRemove,
-} from '@nocobase/client';
+} from '@tachybase/client';
import React, { useContext } from 'react';
import { useChartFilter } from '../hooks/filter';
import { useChartsTranslation } from '../locale';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterBlockDesigner.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterBlockDesigner.tsx
index 3df5f6582..31f9d1fdb 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterBlockDesigner.tsx
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterBlockDesigner.tsx
@@ -1,4 +1,4 @@
-import { GeneralSchemaDesigner, SchemaSettingsRemove } from '@nocobase/client';
+import { GeneralSchemaDesigner, SchemaSettingsRemove } from '@tachybase/client';
import React from 'react';
import { useChartsTranslation } from '../locale';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterBlockInitializer.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterBlockInitializer.tsx
index 7e5a78ed3..30e2cf15a 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterBlockInitializer.tsx
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterBlockInitializer.tsx
@@ -7,7 +7,7 @@ import {
useCurrentSchema,
SchemaInitializerSwitch,
useSchemaInitializerItem,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { uid, merge } from '@tachybase/schema';
import { ChartFilterContext } from './FilterProvider';
import { css } from '@emotion/css';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterBlockProvider.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterBlockProvider.tsx
index 5c882b92e..8e9e54578 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterBlockProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterBlockProvider.tsx
@@ -1,5 +1,5 @@
import React, { useContext, useEffect } from 'react';
-import { SchemaComponentOptions } from '@nocobase/client';
+import { SchemaComponentOptions } from '@tachybase/client';
import { ChartFilterItemDesigner } from './FilterItemDesigner';
import {
useChartFilterActionProps,
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterForm.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterForm.tsx
index 24da24748..177ea21ef 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterForm.tsx
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterForm.tsx
@@ -1,7 +1,7 @@
import React, { memo, useContext, useEffect, useMemo, useRef } from 'react';
import { createForm, onFieldInit, onFieldMount, onFieldUnmount } from '@tachybase/schema';
import { ChartFilterContext } from './FilterProvider';
-import { DEFAULT_DATA_SOURCE_KEY, FormV2, VariablesContext } from '@nocobase/client';
+import { DEFAULT_DATA_SOURCE_KEY, FormV2, VariablesContext } from '@tachybase/client';
import { setDefaultValue } from './utils';
import { useChartFilter } from '../hooks';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterItemDesigner.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterItemDesigner.tsx
index 135c70f9e..22db4c775 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterItemDesigner.tsx
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterItemDesigner.tsx
@@ -18,7 +18,7 @@ import {
useFormBlockContext,
removeNullCondition,
useIsAssociationField,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { useChartsTranslation } from '../locale';
import { Schema, useField, useFieldSchema } from '@tachybase/schema';
import { Field } from '@tachybase/schema';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterItemInitializers.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterItemInitializers.tsx
index 69dda7ba3..c4cc7215a 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterItemInitializers.tsx
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterItemInitializers.tsx
@@ -23,7 +23,7 @@ import {
useGlobalTheme,
useSchemaInitializerItem,
useCompile,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { useMemoizedFn } from 'ahooks';
import { Alert, ConfigProvider, Typography } from 'antd';
import React, { memo, useCallback, useContext, useMemo } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterVariableInput.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterVariableInput.tsx
index 22c0897e0..c5189f9c3 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterVariableInput.tsx
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/FilterVariableInput.tsx
@@ -9,7 +9,7 @@ import {
getShouldChange,
useCurrentUserVariable,
useDatetimeVariable,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { useMemoizedFn } from 'ahooks';
import React, { useEffect, useMemo } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/utils.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/utils.ts
index b23b6269a..42c683272 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/utils.ts
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/filter/utils.ts
@@ -1,5 +1,5 @@
-import { DEFAULT_DATA_SOURCE_KEY } from '@nocobase/client';
-import { moment2str } from '@nocobase/utils/client';
+import { DEFAULT_DATA_SOURCE_KEY } from '@tachybase/client';
+import { moment2str } from '@tachybase/utils/client';
import dayjs from 'dayjs';
import { Schema } from '@tachybase/schema';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/filter.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/filter.ts
index edb71819c..112868124 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/filter.ts
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/filter.ts
@@ -8,14 +8,14 @@ import {
useActionContext,
useCollectionManager_deprecated,
useDataSourceManager,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { useCallback, useContext, useMemo } from 'react';
import { ChartDataContext } from '../block/ChartDataProvider';
import { Schema } from '@tachybase/schema';
import { useChartsTranslation } from '../locale';
import { ChartFilterContext } from '../filter/FilterProvider';
import { useMemoizedFn } from 'ahooks';
-import { parse } from '@nocobase/utils/client';
+import { parse } from '@tachybase/utils/client';
import lodash from 'lodash';
import { getFormulaComponent, getValuesByPath } from '../utils';
import deepmerge from 'deepmerge';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/query.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/query.ts
index 2ef2abcfe..73377942a 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/query.ts
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/query.ts
@@ -8,7 +8,7 @@ import {
useACLRoleContext,
useCollectionManager_deprecated,
useDataSourceManager,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { useContext, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { ChartConfigContext } from '../configure';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/useUserVariable.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/useUserVariable.ts
index 14c43c99b..2037bc433 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/useUserVariable.ts
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/useUserVariable.ts
@@ -1,7 +1,7 @@
import { useCallback, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { Schema } from '@tachybase/schema';
-import { useCollectionFieldsOptions } from '@nocobase/client';
+import { useCollectionFieldsOptions } from '@tachybase/client';
import { useMemoizedFn } from 'ahooks';
export const useUserVariable = ({ schema }: { schema: any }) => {
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/useVariableOptions.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/useVariableOptions.ts
index b0c6d0f7d..c67b399d3 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/useVariableOptions.ts
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/hooks/useVariableOptions.ts
@@ -1,5 +1,5 @@
import { useField } from '@tachybase/schema';
-import { useCurrentUserVariable, useDatetimeVariable } from '@nocobase/client';
+import { useCurrentUserVariable, useDatetimeVariable } from '@tachybase/client';
import { useMemo } from 'react';
import { useFilterVariable } from './filter';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/index.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/index.tsx
index de374676f..72be3d666 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import {
ChartV2Block,
ChartV2BlockDesigner,
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/locale/index.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/client/locale/index.ts
index 41d32c5da..b5f578140 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/locale/index.ts
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/locale/index.ts
@@ -1,4 +1,4 @@
-import { i18n } from '@nocobase/client';
+import { i18n } from '@tachybase/client';
import { useTranslation } from 'react-i18next';
export const NAMESPACE = 'data-visualization';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/renderer/ChartRenderer.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/renderer/ChartRenderer.tsx
index 8c92c3e27..1b8958e30 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/renderer/ChartRenderer.tsx
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/renderer/ChartRenderer.tsx
@@ -10,7 +10,7 @@ import {
useCollection_deprecated,
useDataSource,
useDesignable,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { Empty, Result, Spin, Typography } from 'antd';
import React, { useContext, useEffect, useRef } from 'react';
import { ErrorBoundary } from 'react-error-boundary';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/client/renderer/ChartRendererProvider.tsx b/packages/plugins/@nocobase/plugin-data-visualization/src/client/renderer/ChartRendererProvider.tsx
index a9c518a79..7c90abafe 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/client/renderer/ChartRendererProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/client/renderer/ChartRendererProvider.tsx
@@ -6,7 +6,7 @@ import {
useAPIClient,
useDataSourceManager,
useRequest,
-} from '@nocobase/client';
+} from '@tachybase/client';
import React, { createContext, useContext } from 'react';
import { parseField, removeUnparsableFilter } from '../utils';
import { ChartDataContext } from '../block/ChartDataProvider';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/server/__tests__/api.test.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/server/__tests__/api.test.ts
index d95b966c1..4a5ae7493 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/server/__tests__/api.test.ts
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/server/__tests__/api.test.ts
@@ -1,5 +1,5 @@
-import { Database } from '@nocobase/database';
-import { MockServer, createMockServer } from '@nocobase/test';
+import { Database } from '@tachybase/database';
+import { MockServer, createMockServer } from '@tachybase/test';
import compose from 'koa-compose';
import { parseBuilder, parseFieldAndAssociations, queryData } from '../actions/query';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/server/__tests__/query.test.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/server/__tests__/query.test.ts
index d6419884a..cb6adcec6 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/server/__tests__/query.test.ts
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/server/__tests__/query.test.ts
@@ -1,4 +1,4 @@
-import { MockServer, createMockServer } from '@nocobase/test';
+import { MockServer, createMockServer } from '@tachybase/test';
import compose from 'koa-compose';
import { vi } from 'vitest';
import { cacheMiddleware, parseBuilder, parseFieldAndAssociations } from '../actions/query';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/server/actions/query.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/server/actions/query.ts
index be6171671..ded68fe3f 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/server/actions/query.ts
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/server/actions/query.ts
@@ -1,9 +1,9 @@
-import { Context, Next } from '@nocobase/actions';
-import { Field, FilterParser, snakeCase } from '@nocobase/database';
+import { Context, Next } from '@tachybase/actions';
+import { Field, FilterParser, snakeCase } from '@tachybase/database';
import { formatter } from './formatter';
import compose from 'koa-compose';
-import { parseFilter, getDateVars } from '@nocobase/utils';
-import { Cache } from '@nocobase/cache';
+import { parseFilter, getDateVars } from '@tachybase/utils';
+import { Cache } from '@tachybase/cache';
type MeasureProps = {
field: string | string[];
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/server/migrations/20230926211750-rename-charttype.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/server/migrations/20230926211750-rename-charttype.ts
index 0765b866a..c30813c0c 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/server/migrations/20230926211750-rename-charttype.ts
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/server/migrations/20230926211750-rename-charttype.ts
@@ -1,5 +1,5 @@
-import { Repository } from '@nocobase/database';
-import { Migration } from '@nocobase/server';
+import { Repository } from '@tachybase/database';
+import { Migration } from '@tachybase/server';
export default class RenameChartTypeMigration extends Migration {
appVersion = '<0.14.0-alpha.7';
diff --git a/packages/plugins/@nocobase/plugin-data-visualization/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-data-visualization/src/server/plugin.ts
index 4c4bd08b4..9a29afc47 100644
--- a/packages/plugins/@nocobase/plugin-data-visualization/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-data-visualization/src/server/plugin.ts
@@ -1,5 +1,5 @@
-import { Cache } from '@nocobase/cache';
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { Cache } from '@tachybase/cache';
+import { InstallOptions, Plugin } from '@tachybase/server';
import { query } from './actions/query';
import { resolve } from 'path';
diff --git a/packages/plugins/@nocobase/plugin-error-handler/package.json b/packages/plugins/@nocobase/plugin-error-handler/package.json
index 5d357aa3a..c8255ce27 100644
--- a/packages/plugins/@nocobase/plugin-error-handler/package.json
+++ b/packages/plugins/@nocobase/plugin-error-handler/package.json
@@ -16,11 +16,11 @@
"supertest": "^6.1.6"
},
"peerDependencies": {
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "处理应用程序中的错误和异常。",
"displayName.zh-CN": "错误处理器",
diff --git a/packages/plugins/@nocobase/plugin-error-handler/src/client/index.ts b/packages/plugins/@nocobase/plugin-error-handler/src/client/index.ts
index 057d6ad21..3d2c195d1 100644
--- a/packages/plugins/@nocobase/plugin-error-handler/src/client/index.ts
+++ b/packages/plugins/@nocobase/plugin-error-handler/src/client/index.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
class ErrorHandlerPlugin extends Plugin {
async load() {}
diff --git a/packages/plugins/@nocobase/plugin-error-handler/src/server/__tests__/render-error.test.ts b/packages/plugins/@nocobase/plugin-error-handler/src/server/__tests__/render-error.test.ts
index 65d5c3551..6eccb210b 100644
--- a/packages/plugins/@nocobase/plugin-error-handler/src/server/__tests__/render-error.test.ts
+++ b/packages/plugins/@nocobase/plugin-error-handler/src/server/__tests__/render-error.test.ts
@@ -1,5 +1,5 @@
-import { Database } from '@nocobase/database';
-import { MockServer, createMockServer } from '@nocobase/test';
+import { Database } from '@tachybase/database';
+import { MockServer, createMockServer } from '@tachybase/test';
describe('create with exception', () => {
let app: MockServer;
beforeEach(async () => {
diff --git a/packages/plugins/@nocobase/plugin-error-handler/src/server/server.ts b/packages/plugins/@nocobase/plugin-error-handler/src/server/server.ts
index d9b1ddae4..4a716ddc2 100644
--- a/packages/plugins/@nocobase/plugin-error-handler/src/server/server.ts
+++ b/packages/plugins/@nocobase/plugin-error-handler/src/server/server.ts
@@ -1,6 +1,6 @@
import { Schema } from '@formily/json-schema';
-import { BaseError } from '@nocobase/database';
-import { Plugin } from '@nocobase/server';
+import { BaseError } from '@tachybase/database';
+import { Plugin } from '@tachybase/server';
import lodash from 'lodash';
import { ErrorHandler } from './error-handler';
import enUS from './locale/en_US';
diff --git a/packages/plugins/@nocobase/plugin-export/package.json b/packages/plugins/@nocobase/plugin-export/package.json
index 764ce3092..18a674ca1 100644
--- a/packages/plugins/@nocobase/plugin-export/package.json
+++ b/packages/plugins/@nocobase/plugin-export/package.json
@@ -20,12 +20,12 @@
"react-i18next": "^11.15.1"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "导出筛选后的记录到 Excel 中，可以配置导出哪些字段。",
"displayName.zh-CN": "操作：导出记录",
diff --git a/packages/plugins/@nocobase/plugin-export/src/client/ExportActionInitializer.tsx b/packages/plugins/@nocobase/plugin-export/src/client/ExportActionInitializer.tsx
index 4c645f97b..0c4182a96 100644
--- a/packages/plugins/@nocobase/plugin-export/src/client/ExportActionInitializer.tsx
+++ b/packages/plugins/@nocobase/plugin-export/src/client/ExportActionInitializer.tsx
@@ -6,7 +6,7 @@ import {
useDesignable,
useSchemaInitializer,
useSchemaInitializerItem,
-} from '@nocobase/client';
+} from '@tachybase/client';
import React from 'react';
import { useFields } from './useFields';
diff --git a/packages/plugins/@nocobase/plugin-export/src/client/ExportDesigner.tsx b/packages/plugins/@nocobase/plugin-export/src/client/ExportDesigner.tsx
index 6201a209d..e82931dde 100644
--- a/packages/plugins/@nocobase/plugin-export/src/client/ExportDesigner.tsx
+++ b/packages/plugins/@nocobase/plugin-export/src/client/ExportDesigner.tsx
@@ -8,7 +8,7 @@ import {
SchemaSettingsModalItem,
SchemaSettingsRemove,
useDesignable,
-} from '@nocobase/client';
+} from '@tachybase/client';
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useShared } from './useShared';
diff --git a/packages/plugins/@nocobase/plugin-export/src/client/ExportPluginProvider.tsx b/packages/plugins/@nocobase/plugin-export/src/client/ExportPluginProvider.tsx
index 2a0043be3..3ff1877a1 100644
--- a/packages/plugins/@nocobase/plugin-export/src/client/ExportPluginProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-export/src/client/ExportPluginProvider.tsx
@@ -1,4 +1,4 @@
-import { SchemaComponentOptions } from '@nocobase/client';
+import { SchemaComponentOptions } from '@tachybase/client';
import React from 'react';
import { ExportActionInitializer, ExportDesigner, useExportAction } from './';
diff --git a/packages/plugins/@nocobase/plugin-export/src/client/index.ts b/packages/plugins/@nocobase/plugin-export/src/client/index.ts
index f503debb0..8caf2c433 100644
--- a/packages/plugins/@nocobase/plugin-export/src/client/index.ts
+++ b/packages/plugins/@nocobase/plugin-export/src/client/index.ts
@@ -2,7 +2,7 @@ export * from './ExportActionInitializer';
export * from './ExportDesigner';
export * from './ExportPluginProvider';
export * from './useExportAction';
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import { ExportPluginProvider } from './ExportPluginProvider';
import { exportActionSchemaSettings } from './schemaSettings';
diff --git a/packages/plugins/@nocobase/plugin-export/src/client/schemaSettings.ts b/packages/plugins/@nocobase/plugin-export/src/client/schemaSettings.ts
index e17b14914..30fd28c46 100644
--- a/packages/plugins/@nocobase/plugin-export/src/client/schemaSettings.ts
+++ b/packages/plugins/@nocobase/plugin-export/src/client/schemaSettings.ts
@@ -1,6 +1,6 @@
import { ArrayItems } from '@tachybase/components';
import { ISchema, useField, useFieldSchema } from '@tachybase/schema';
-import { ButtonEditor, SchemaSettings, useDesignable, useSchemaToolbar } from '@nocobase/client';
+import { ButtonEditor, SchemaSettings, useDesignable, useSchemaToolbar } from '@tachybase/client';
import { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useShared } from './useShared';
diff --git a/packages/plugins/@nocobase/plugin-export/src/client/useExportAction.ts b/packages/plugins/@nocobase/plugin-export/src/client/useExportAction.ts
index 297188c75..0583049a1 100644
--- a/packages/plugins/@nocobase/plugin-export/src/client/useExportAction.ts
+++ b/packages/plugins/@nocobase/plugin-export/src/client/useExportAction.ts
@@ -5,7 +5,7 @@ import {
useCollection_deprecated,
useCollectionManager_deprecated,
useCompile,
-} from '@nocobase/client';
+} from '@tachybase/client';
import lodash from 'lodash';
import { saveAs } from 'file-saver';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@nocobase/plugin-export/src/client/useFields.ts b/packages/plugins/@nocobase/plugin-export/src/client/useFields.ts
index 1ff01c13e..5fcca1ec4 100644
--- a/packages/plugins/@nocobase/plugin-export/src/client/useFields.ts
+++ b/packages/plugins/@nocobase/plugin-export/src/client/useFields.ts
@@ -1,5 +1,5 @@
import { useFieldSchema } from '@tachybase/schema';
-import { useCollectionManager_deprecated } from '@nocobase/client';
+import { useCollectionManager_deprecated } from '@tachybase/client';
export const useFields = (collectionName: string) => {
const fieldSchema = useFieldSchema();
diff --git a/packages/plugins/@nocobase/plugin-export/src/client/useShared.ts b/packages/plugins/@nocobase/plugin-export/src/client/useShared.ts
index bcca96477..4baab3533 100644
--- a/packages/plugins/@nocobase/plugin-export/src/client/useShared.ts
+++ b/packages/plugins/@nocobase/plugin-export/src/client/useShared.ts
@@ -1,4 +1,4 @@
-import { Cascader, css, useCollection_deprecated } from '@nocobase/client';
+import { Cascader, css, useCollection_deprecated } from '@tachybase/client';
import { useFields } from './useFields';
export const useShared = () => {
diff --git a/packages/plugins/@nocobase/plugin-export/src/server/__tests__/utils/utils.test.ts b/packages/plugins/@nocobase/plugin-export/src/server/__tests__/utils/utils.test.ts
index 8cb68302b..db1d0331b 100644
--- a/packages/plugins/@nocobase/plugin-export/src/server/__tests__/utils/utils.test.ts
+++ b/packages/plugins/@nocobase/plugin-export/src/server/__tests__/utils/utils.test.ts
@@ -1,5 +1,5 @@
-import Database from '@nocobase/database';
-import { mockServer, MockServer } from '@nocobase/test';
+import Database from '@tachybase/database';
+import { mockServer, MockServer } from '@tachybase/test';
describe('utils', () => {
let columns = null;
diff --git a/packages/plugins/@nocobase/plugin-export/src/server/actions/export-xlsx.ts b/packages/plugins/@nocobase/plugin-export/src/server/actions/export-xlsx.ts
index 1fde6da6f..593faa8ec 100644
--- a/packages/plugins/@nocobase/plugin-export/src/server/actions/export-xlsx.ts
+++ b/packages/plugins/@nocobase/plugin-export/src/server/actions/export-xlsx.ts
@@ -1,5 +1,5 @@
-import { Context, Next } from '@nocobase/actions';
-import { Repository } from '@nocobase/database';
+import { Context, Next } from '@tachybase/actions';
+import { Repository } from '@tachybase/database';
import xlsx from 'node-xlsx';
import render from '../renders';
import { columns2Appends } from '../utils';
diff --git a/packages/plugins/@nocobase/plugin-export/src/server/index.ts b/packages/plugins/@nocobase/plugin-export/src/server/index.ts
index 1e70d13ac..b64c42750 100644
--- a/packages/plugins/@nocobase/plugin-export/src/server/index.ts
+++ b/packages/plugins/@nocobase/plugin-export/src/server/index.ts
@@ -1,4 +1,4 @@
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { InstallOptions, Plugin } from '@tachybase/server';
import { exportXlsx } from './actions';
export class ExportPlugin extends Plugin {
diff --git a/packages/plugins/@nocobase/plugin-export/src/server/renders/renders.ts b/packages/plugins/@nocobase/plugin-export/src/server/renders/renders.ts
index 951d67d01..57ac8f0cb 100644
--- a/packages/plugins/@nocobase/plugin-export/src/server/renders/renders.ts
+++ b/packages/plugins/@nocobase/plugin-export/src/server/renders/renders.ts
@@ -1,4 +1,4 @@
-import { getDefaultFormat, str2moment, toFixedByStep } from '@nocobase/utils';
+import { getDefaultFormat, str2moment, toFixedByStep } from '@tachybase/utils';
export async function _(field, row, ctx, column?: any) {
if (column?.dataIndex.length > 1) {
@@ -12,7 +12,7 @@ export async function _(field, row, ctx, column?: any) {
} else {
if (Array.isArray(result?.[col])) {
const subResults = [];
- for (const r of result?.[col]) {
+ for (const r of result[col]) {
subResults.push(r);
}
return subResults;
diff --git a/packages/plugins/@nocobase/plugin-file-manager/package.json b/packages/plugins/@nocobase/plugin-file-manager/package.json
index 70c4b2072..ed0b1bdfd 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-file-manager/package.json
@@ -33,12 +33,12 @@
"supertest": "^6.1.6"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "提供文件存储服务，并提供了文件表模板和附件字段。",
"displayName.zh-CN": "文件管理器",
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/client/FileManagerProvider.tsx b/packages/plugins/@nocobase/plugin-file-manager/src/client/FileManagerProvider.tsx
index d08686221..30bd13f9c 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/client/FileManagerProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/client/FileManagerProvider.tsx
@@ -1,4 +1,4 @@
-import { SchemaComponentOptions } from '@nocobase/client';
+import { SchemaComponentOptions } from '@tachybase/client';
import React, { FC } from 'react';
import * as hooks from './hooks';
import { UploadActionInitializer } from './initializers';
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/client/FileStorage.tsx b/packages/plugins/@nocobase/plugin-file-manager/src/client/FileStorage.tsx
index 4f3064f38..01a6f9bbc 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/client/FileStorage.tsx
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/client/FileStorage.tsx
@@ -1,6 +1,6 @@
import { PlusOutlined, DownOutlined } from '@ant-design/icons';
import { uid } from '@tachybase/schema';
-import { ActionContext, SchemaComponent, useCompile, usePlugin, useRecord } from '@nocobase/client';
+import { ActionContext, SchemaComponent, useCompile, usePlugin, useRecord } from '@tachybase/client';
import { Button, Card, Dropdown } from 'antd';
import _ from 'lodash';
import React, { useState } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/client/__e2e__/createLocalStorage.test.ts b/packages/plugins/@nocobase/plugin-file-manager/src/client/__e2e__/createLocalStorage.test.ts
index b3a73e704..fc5774ab7 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/client/__e2e__/createLocalStorage.test.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/client/__e2e__/createLocalStorage.test.ts
@@ -1,5 +1,5 @@
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
import { CreateLocalStorage } from './pageobject/localStorage';
test.describe('file manager', () => {
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/client/__e2e__/editLocalStorage.test.ts b/packages/plugins/@nocobase/plugin-file-manager/src/client/__e2e__/editLocalStorage.test.ts
index 488d68638..883f82c3c 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/client/__e2e__/editLocalStorage.test.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/client/__e2e__/editLocalStorage.test.ts
@@ -1,5 +1,5 @@
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
import { CreateLocalStorage, EditLocalStorage } from './pageobject/localStorage';
test.describe('File manager', () => {
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/client/__e2e__/pageobject/localStorage.ts b/packages/plugins/@nocobase/plugin-file-manager/src/client/__e2e__/pageobject/localStorage.ts
index cdb0fad13..3ab820eb6 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/client/__e2e__/pageobject/localStorage.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/client/__e2e__/pageobject/localStorage.ts
@@ -1,4 +1,4 @@
-import type { Locator, Page } from '@nocobase/test/e2e';
+import type { Locator, Page } from '@tachybase/test/e2e';
export class CreateLocalStorage {
readonly page: Page;
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/client/hooks/useUploadFiles.ts b/packages/plugins/@nocobase/plugin-file-manager/src/client/hooks/useUploadFiles.ts
index 0156f4fa8..1784049ab 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/client/hooks/useUploadFiles.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/client/hooks/useUploadFiles.ts
@@ -4,7 +4,7 @@ import {
useBlockRequestContext,
useCollection,
useSourceIdFromParentRecord,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { notification } from 'antd';
import { useContext, useMemo } from 'react';
import { useFmTranslation } from '../locale';
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/client/index.tsx b/packages/plugins/@nocobase/plugin-file-manager/src/client/index.tsx
index f8bbea241..0e5b2f9f1 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin, useCollection_deprecated } from '@nocobase/client';
+import { Plugin, useCollection_deprecated } from '@tachybase/client';
import { FileManagerProvider } from './FileManagerProvider';
import { FileStoragePane } from './FileStorage';
import { NAMESPACE } from './locale';
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/client/initializers/UploadActionInitializer.tsx b/packages/plugins/@nocobase/plugin-file-manager/src/client/initializers/UploadActionInitializer.tsx
index abac45943..cf5d4f4c2 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/client/initializers/UploadActionInitializer.tsx
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/client/initializers/UploadActionInitializer.tsx
@@ -1,4 +1,4 @@
-import { ActionInitializer, useCollection_deprecated } from '@nocobase/client';
+import { ActionInitializer, useCollection_deprecated } from '@tachybase/client';
import React from 'react';
export const UploadActionInitializer = (props) => {
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/client/interfaces/attachment.ts b/packages/plugins/@nocobase/plugin-file-manager/src/client/interfaces/attachment.ts
index be9700445..14fdff797 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/client/interfaces/attachment.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/client/interfaces/attachment.ts
@@ -1,6 +1,6 @@
import { ISchema } from '@tachybase/schema';
import { uid } from '@tachybase/schema';
-import { CollectionFieldInterface, interfacesProperties } from '@nocobase/client';
+import { CollectionFieldInterface, interfacesProperties } from '@tachybase/client';
import { NAMESPACE } from '../locale';
export class AttachmentFieldInterface extends CollectionFieldInterface {
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/client/templates/file.ts b/packages/plugins/@nocobase/plugin-file-manager/src/client/templates/file.ts
index efc374a05..ad87255fd 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/client/templates/file.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/client/templates/file.ts
@@ -1,4 +1,4 @@
-import { CollectionTemplate, getConfigurableProperties } from '@nocobase/client';
+import { CollectionTemplate, getConfigurableProperties } from '@tachybase/client';
import { NAMESPACE } from '../locale';
export class FileCollectionTemplate extends CollectionTemplate {
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/FileModel.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/FileModel.ts
index c73090bdb..856fc9fa6 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/FileModel.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/FileModel.ts
@@ -1,4 +1,4 @@
-import { Model } from '@nocobase/database';
+import { Model } from '@tachybase/database';
export class FileModel extends Model {
public toJSON() {
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/index.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/index.ts
index dcfc44024..ba10d4818 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/index.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/index.ts
@@ -1,4 +1,4 @@
-import { MockServer, createMockServer } from '@nocobase/test';
+import { MockServer, createMockServer } from '@tachybase/test';
import send from 'koa-send';
import path from 'path';
import supertest from 'supertest';
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/storages/ali-oss.test.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/storages/ali-oss.test.ts
index 52b3ebaa3..b06c57705 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/storages/ali-oss.test.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/storages/ali-oss.test.ts
@@ -1,9 +1,9 @@
import path from 'path';
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import aliossStorage from '../../storages/ali-oss';
import { FILE_FIELD_NAME } from '../../constants';
import { getApp, requestFile } from '..';
-import { Database } from '@nocobase/database';
+import { Database } from '@tachybase/database';
const itif = process.env.ALI_OSS_ACCESS_KEY_SECRET ? it : it.skip;
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/storages/s3.test.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/storages/s3.test.ts
index 4d2e29e85..7f6f61f69 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/storages/s3.test.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/storages/s3.test.ts
@@ -1,9 +1,9 @@
import path from 'path';
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import s3Storage from '../../storages/s3';
import { FILE_FIELD_NAME } from '../../constants';
import { getApp, requestFile } from '..';
-import Database from '@nocobase/database';
+import Database from '@tachybase/database';
const itif = process.env.AWS_SECRET_ACCESS_KEY ? it : it.skip;
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/storages/tx-cos.test.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/storages/tx-cos.test.ts
index 5fd101570..e216c3891 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/storages/tx-cos.test.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/storages/tx-cos.test.ts
@@ -1,9 +1,9 @@
import path from 'path';
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import txStorage from '../../storages/tx-cos';
import { FILE_FIELD_NAME } from '../../constants';
import { getApp, requestFile } from '..';
-import { Database } from '@nocobase/database';
+import { Database } from '@tachybase/database';
const itif = process.env.TX_COS_ACCESS_KEY_SECRET ? it : it.skip;
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/tables/users.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/tables/users.ts
index 67c6303d4..54558cfa0 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/tables/users.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/__tests__/tables/users.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
export default {
name: 'users',
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/actions/attachments.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/actions/attachments.ts
index 491c8a3a3..39e0fb492 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/actions/attachments.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/actions/attachments.ts
@@ -1,5 +1,5 @@
-import { Context, Next } from '@nocobase/actions';
-import { koaMulter as multer } from '@nocobase/utils';
+import { Context, Next } from '@tachybase/actions';
+import { koaMulter as multer } from '@tachybase/utils';
import path from 'path';
import { DEFAULT_MAX_FILE_SIZE, FILE_FIELD_NAME, LIMIT_FILES } from '../constants';
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/actions/index.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/actions/index.ts
index f6f6fb137..7c0b308b5 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/actions/index.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/actions/index.ts
@@ -1,4 +1,4 @@
-import actions from '@nocobase/actions';
+import actions from '@tachybase/actions';
import { createMiddleware, destroyMiddleware } from './attachments';
export default function ({ app }) {
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/collections/attachments.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/collections/attachments.ts
index d3887cb7c..76bfc9e8f 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/collections/attachments.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/collections/attachments.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
dumpRules: {
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/collections/storages.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/collections/storages.ts
index d88b5aad3..7677ce56b 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/collections/storages.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/collections/storages.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
dumpRules: 'required',
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/migrations/20230831160742-fix-attachment-field.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/migrations/20230831160742-fix-attachment-field.ts
index d186249ab..677a0d8d6 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/migrations/20230831160742-fix-attachment-field.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/migrations/20230831160742-fix-attachment-field.ts
@@ -1,5 +1,5 @@
-import { Op, Repository } from '@nocobase/database';
-import { Migration } from '@nocobase/server';
+import { Op, Repository } from '@tachybase/database';
+import { Migration } from '@tachybase/server';
export default class extends Migration {
appVersion = '<0.13.0-alpha.5';
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/migrations/20231120142523-fix-storage.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/migrations/20231120142523-fix-storage.ts
index ae3ffb10b..440673c6c 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/migrations/20231120142523-fix-storage.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/migrations/20231120142523-fix-storage.ts
@@ -1,5 +1,5 @@
-import { Repository } from '@nocobase/database';
-import { Migration } from '@nocobase/server';
+import { Repository } from '@tachybase/database';
+import { Migration } from '@tachybase/server';
export default class extends Migration {
appVersion = '<0.16.0-alpha.1';
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/migrations/20240306223006-update-target.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/migrations/20240306223006-update-target.ts
index 08afc02b2..4797a9e0b 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/migrations/20240306223006-update-target.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/migrations/20240306223006-update-target.ts
@@ -1,5 +1,5 @@
-import { Model, Repository } from '@nocobase/database';
-import { Migration } from '@nocobase/server';
+import { Model, Repository } from '@tachybase/database';
+import { Migration } from '@tachybase/server';
export default class extends Migration {
on = 'afterLoad'; // 'beforeLoad' or 'afterLoad'
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/server.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/server.ts
index 8a56dd553..d2526297c 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/server.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/server.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/server';
+import { Plugin } from '@tachybase/server';
import { resolve } from 'path';
import { FileModel } from './FileModel';
import initActions from './actions';
diff --git a/packages/plugins/@nocobase/plugin-file-manager/src/server/storages/index.ts b/packages/plugins/@nocobase/plugin-file-manager/src/server/storages/index.ts
index ee90f5a5a..b8f7d8a50 100644
--- a/packages/plugins/@nocobase/plugin-file-manager/src/server/storages/index.ts
+++ b/packages/plugins/@nocobase/plugin-file-manager/src/server/storages/index.ts
@@ -1,6 +1,6 @@
import { StorageEngine } from 'multer';
-import Application from '@nocobase/server';
-import { Registry } from '@nocobase/utils';
+import Application from '@tachybase/server';
+import { Registry } from '@tachybase/utils';
import local from './local';
import oss from './ali-oss';
diff --git a/packages/plugins/@nocobase/plugin-formula-field/package.json b/packages/plugins/@nocobase/plugin-formula-field/package.json
index 978631f52..fbf24355c 100644
--- a/packages/plugins/@nocobase/plugin-formula-field/package.json
+++ b/packages/plugins/@nocobase/plugin-formula-field/package.json
@@ -16,12 +16,12 @@
"react-i18next": "^11.15.1"
},
"peerDependencies": {
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/evaluators": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/evaluators": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "可以配置并存储同一条记录的多字段值之间的计算结果，支持 Math.js 和 Excel formula functions 两种引擎",
"displayName.zh-CN": "数据表字段：公式",
diff --git a/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/Expression.tsx b/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/Expression.tsx
index 613cd2766..1b6f5cdd2 100644
--- a/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/Expression.tsx
+++ b/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/Expression.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { useCollectionManager_deprecated, useCompile, Variable } from '@nocobase/client';
+import { useCollectionManager_deprecated, useCompile, Variable } from '@tachybase/client';
export const Expression = (props) => {
const { value = '', supports = [], useCurrentFields, onChange } = props;
diff --git a/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/Result.tsx b/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/Result.tsx
index de13245c7..76a561ded 100644
--- a/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/Result.tsx
+++ b/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/Result.tsx
@@ -1,7 +1,7 @@
import { onFormValuesChange } from '@tachybase/schema';
import { useField, useFieldSchema, useFormEffects } from '@tachybase/schema';
import { toJS } from '@tachybase/schema';
-import type { CollectionOptions } from '@nocobase/client';
+import type { CollectionOptions } from '@tachybase/client';
import {
Checkbox,
DatePicker,
@@ -10,9 +10,9 @@ import {
useCollection_deprecated,
useCollectionManager_deprecated,
useFormBlockContext,
-} from '@nocobase/client';
-import { Evaluator, evaluators } from '@nocobase/evaluators/client';
-import { Registry, toFixedByStep } from '@nocobase/utils/client';
+} from '@tachybase/client';
+import { Evaluator, evaluators } from '@tachybase/evaluators/client';
+import { Registry, toFixedByStep } from '@tachybase/utils/client';
import React, { useEffect, useState } from 'react';
import { toDbType } from '../../../utils';
diff --git a/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/demos/demo2.tsx b/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/demos/demo2.tsx
index dc9bfc7d3..3d1525dc1 100644
--- a/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/demos/demo2.tsx
+++ b/packages/plugins/@nocobase/plugin-formula-field/src/client/components/Formula/demos/demo2.tsx
@@ -2,7 +2,7 @@
* title: Formula
*/
import { connect } from '@tachybase/schema';
-import { Formula, SchemaComponent, SchemaComponentProvider } from '@nocobase/client';
+import { Formula, SchemaComponent, SchemaComponentProvider } from '@tachybase/client';
import React from 'react';
const Expression = connect(Formula.Expression);
diff --git a/packages/plugins/@nocobase/plugin-formula-field/src/client/index.tsx b/packages/plugins/@nocobase/plugin-formula-field/src/client/index.tsx
index 229eac1b8..922169c0b 100644
--- a/packages/plugins/@nocobase/plugin-formula-field/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-formula-field/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import { FormulaFieldInterface } from './interfaces/formula';
import { Formula } from './components';
import { renderExpressionDescription } from './scopes';
diff --git a/packages/plugins/@nocobase/plugin-formula-field/src/client/interfaces/formula.tsx b/packages/plugins/@nocobase/plugin-formula-field/src/client/interfaces/formula.tsx
index ac2f9d9ef..83ca88612 100644
--- a/packages/plugins/@nocobase/plugin-formula-field/src/client/interfaces/formula.tsx
+++ b/packages/plugins/@nocobase/plugin-formula-field/src/client/interfaces/formula.tsx
@@ -1,6 +1,6 @@
-import { CollectionFieldInterface, i18n, interfacesProperties } from '@nocobase/client';
-import { Evaluator, evaluators } from '@nocobase/evaluators/client';
-import { lodash, Registry } from '@nocobase/utils/client';
+import { CollectionFieldInterface, i18n, interfacesProperties } from '@tachybase/client';
+import { Evaluator, evaluators } from '@tachybase/evaluators/client';
+import { lodash, Registry } from '@tachybase/utils/client';
import { NAMESPACE } from '../locale';
// const booleanReactions = [
diff --git a/packages/plugins/@nocobase/plugin-formula-field/src/client/locale/index.ts b/packages/plugins/@nocobase/plugin-formula-field/src/client/locale/index.ts
index a7757edfc..c22122d13 100644
--- a/packages/plugins/@nocobase/plugin-formula-field/src/client/locale/index.ts
+++ b/packages/plugins/@nocobase/plugin-formula-field/src/client/locale/index.ts
@@ -1,4 +1,4 @@
-import { i18n } from '@nocobase/client';
+import { i18n } from '@tachybase/client';
import { useTranslation } from 'react-i18next';
export const NAMESPACE = 'formula-field';
diff --git a/packages/plugins/@nocobase/plugin-formula-field/src/client/scopes.tsx b/packages/plugins/@nocobase/plugin-formula-field/src/client/scopes.tsx
index 06dacd7b3..89203630b 100644
--- a/packages/plugins/@nocobase/plugin-formula-field/src/client/scopes.tsx
+++ b/packages/plugins/@nocobase/plugin-formula-field/src/client/scopes.tsx
@@ -1,6 +1,6 @@
-import { css, i18n } from '@nocobase/client';
-import { Evaluator, evaluators } from '@nocobase/evaluators/client';
-import { Registry } from '@nocobase/utils/client';
+import { css, i18n } from '@tachybase/client';
+import { Evaluator, evaluators } from '@tachybase/evaluators/client';
+import { Registry } from '@tachybase/utils/client';
import React from 'react';
import { NAMESPACE } from './locale';
diff --git a/packages/plugins/@nocobase/plugin-formula-field/src/server/__tests__/formula-field.test.ts b/packages/plugins/@nocobase/plugin-formula-field/src/server/__tests__/formula-field.test.ts
index a65aca693..c2d5e4f83 100644
--- a/packages/plugins/@nocobase/plugin-formula-field/src/server/__tests__/formula-field.test.ts
+++ b/packages/plugins/@nocobase/plugin-formula-field/src/server/__tests__/formula-field.test.ts
@@ -1,4 +1,4 @@
-import { Database, mockDatabase } from '@nocobase/database';
+import { Database, mockDatabase } from '@tachybase/database';
import { FormulaField } from '../formula-field';
describe('formula field', () => {
diff --git a/packages/plugins/@nocobase/plugin-formula-field/src/server/formula-field.ts b/packages/plugins/@nocobase/plugin-formula-field/src/server/formula-field.ts
index da7144e2d..38147abfa 100644
--- a/packages/plugins/@nocobase/plugin-formula-field/src/server/formula-field.ts
+++ b/packages/plugins/@nocobase/plugin-formula-field/src/server/formula-field.ts
@@ -1,5 +1,5 @@
-import { BaseFieldOptions, DataTypes, Field } from '@nocobase/database';
-import { evaluators } from '@nocobase/evaluators';
+import { BaseFieldOptions, DataTypes, Field } from '@tachybase/database';
+import { evaluators } from '@tachybase/evaluators';
import { toDbType } from '../utils';
export interface FormulaFieldOptions extends BaseFieldOptions {
diff --git a/packages/plugins/@nocobase/plugin-formula-field/src/server/migrations/20230213161904-alter-field.ts b/packages/plugins/@nocobase/plugin-formula-field/src/server/migrations/20230213161904-alter-field.ts
index 2ea174586..4200b6af6 100644
--- a/packages/plugins/@nocobase/plugin-formula-field/src/server/migrations/20230213161904-alter-field.ts
+++ b/packages/plugins/@nocobase/plugin-formula-field/src/server/migrations/20230213161904-alter-field.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
export default class extends Migration {
appVersion = '<=0.9.0-alpha.3';
diff --git a/packages/plugins/@nocobase/plugin-formula-field/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-formula-field/src/server/plugin.ts
index 4d46c30f0..b23e210ca 100644
--- a/packages/plugins/@nocobase/plugin-formula-field/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-formula-field/src/server/plugin.ts
@@ -1,4 +1,4 @@
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { InstallOptions, Plugin } from '@tachybase/server';
import { resolve } from 'path';
import { FormulaField } from './formula-field';
diff --git a/packages/plugins/@nocobase/plugin-gantt/package.json b/packages/plugins/@nocobase/plugin-gantt/package.json
index f51ba0318..c0cdfd3e2 100644
--- a/packages/plugins/@nocobase/plugin-gantt/package.json
+++ b/packages/plugins/@nocobase/plugin-gantt/package.json
@@ -21,10 +21,10 @@
"react-i18next": "^11.15.1"
},
"peerDependencies": {
- "@nocobase/client": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/client": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "提供甘特图区块。",
"displayName.zh-CN": "区块：甘特图",
diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/Gantt.Designer.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/Gantt.Designer.tsx
index 194575b26..819da7b58 100644
--- a/packages/plugins/@nocobase/plugin-gantt/src/client/Gantt.Designer.tsx
+++ b/packages/plugins/@nocobase/plugin-gantt/src/client/Gantt.Designer.tsx
@@ -1,4 +1,4 @@
-import { GeneralSchemaDesigner, useCollection_deprecated, useSchemaTemplate } from '@nocobase/client';
+import { GeneralSchemaDesigner, useCollection_deprecated, useSchemaTemplate } from '@tachybase/client';
import React from 'react';
export const GanttDesigner = () => {
const { name, title } = useCollection_deprecated();
diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/Gantt.Settings.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/Gantt.Settings.tsx
index 21a7032d4..5d3e1a172 100644
--- a/packages/plugins/@nocobase/plugin-gantt/src/client/Gantt.Settings.tsx
+++ b/packages/plugins/@nocobase/plugin-gantt/src/client/Gantt.Settings.tsx
@@ -13,7 +13,7 @@ import {
useDataLoadingMode,
useDesignable,
useFormBlockContext,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { useGanttBlockContext } from './GanttBlockProvider';
import { useGanttTranslation, useOptions } from './utils';
diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/GanttActionInitializers.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/GanttActionInitializers.tsx
index 8d0393f72..803841d50 100644
--- a/packages/plugins/@nocobase/plugin-gantt/src/client/GanttActionInitializers.tsx
+++ b/packages/plugins/@nocobase/plugin-gantt/src/client/GanttActionInitializers.tsx
@@ -1,5 +1,5 @@
import { useFieldSchema } from '@tachybase/schema';
-import { CompatibleSchemaInitializer, useCollection_deprecated } from '@nocobase/client';
+import { CompatibleSchemaInitializer, useCollection_deprecated } from '@tachybase/client';
/**
* @deprecated
diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockInitializer.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockInitializer.tsx
index 34676a8f3..033aae485 100644
--- a/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockInitializer.tsx
+++ b/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockInitializer.tsx
@@ -13,7 +13,7 @@ import {
SchemaComponent,
DataBlockInitializer,
SchemaComponentOptions,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { createGanttBlockUISchema } from './createGanttBlockUISchema';
export const GanttBlockInitializer = () => {
diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockProvider.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockProvider.tsx
index a574bce5e..174ac7c5e 100644
--- a/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-gantt/src/client/GanttBlockProvider.tsx
@@ -6,7 +6,7 @@ import {
BlockProvider,
useBlockRequestContext,
TableBlockProvider,
-} from '@nocobase/client';
+} from '@tachybase/client';
export const GanttBlockContext = createContext({});
GanttBlockContext.displayName = 'GanttBlockContext';
diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/__e2e__/drag.test.ts b/packages/plugins/@nocobase/plugin-gantt/src/client/__e2e__/drag.test.ts
index c054f0d15..1da70d78b 100644
--- a/packages/plugins/@nocobase/plugin-gantt/src/client/__e2e__/drag.test.ts
+++ b/packages/plugins/@nocobase/plugin-gantt/src/client/__e2e__/drag.test.ts
@@ -1,4 +1,4 @@
-import { expect, test } from '@nocobase/test/e2e';
+import { expect, test } from '@tachybase/test/e2e';
import { oneEmptyGantt } from './utils';
test('drag and adjust start time, end time, and progress', async ({ page, mockPage, mockRecord }) => {
diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/__e2e__/schemaInitailizer.test.ts b/packages/plugins/@nocobase/plugin-gantt/src/client/__e2e__/schemaInitailizer.test.ts
index 5a5569ca4..8ca0d6ed4 100644
--- a/packages/plugins/@nocobase/plugin-gantt/src/client/__e2e__/schemaInitailizer.test.ts
+++ b/packages/plugins/@nocobase/plugin-gantt/src/client/__e2e__/schemaInitailizer.test.ts
@@ -1,4 +1,4 @@
-import { expect, test } from '@nocobase/test/e2e';
+import { expect, test } from '@tachybase/test/e2e';
import { generalWithDatetimeFields, oneEmptyGantt } from './utils';
test('BlockInitializers should add gantt block', async ({ page, mockPage, mockCollections }) => {
diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/__e2e__/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-gantt/src/client/__e2e__/schemaSettings.test.ts
index 8db3544ba..499c42a19 100644
--- a/packages/plugins/@nocobase/plugin-gantt/src/client/__e2e__/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-gantt/src/client/__e2e__/schemaSettings.test.ts
@@ -1,4 +1,4 @@
-import { expect, test } from '@nocobase/test/e2e';
+import { expect, test } from '@tachybase/test/e2e';
import { getYmd } from '../helpers/other-helper';
import { oneEmptyGantt } from './utils';
const mockData = {
diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/__e2e__/utils.ts b/packages/plugins/@nocobase/plugin-gantt/src/client/__e2e__/utils.ts
index de81821fd..5aa78f2b5 100644
--- a/packages/plugins/@nocobase/plugin-gantt/src/client/__e2e__/utils.ts
+++ b/packages/plugins/@nocobase/plugin-gantt/src/client/__e2e__/utils.ts
@@ -1,4 +1,4 @@
-import { CollectionSetting, PageConfig } from '@nocobase/test/e2e';
+import { CollectionSetting, PageConfig } from '@tachybase/test/e2e';
/**
* 1. 创建一个名为 general 的 collection，其包含 时间、Percent 类型的字段
diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/gantt.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/gantt.tsx
index f5a3eaa14..7e6e6c665 100644
--- a/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/gantt.tsx
+++ b/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/gantt.tsx
@@ -11,7 +11,7 @@ import {
useToken,
withDynamicSchemaProps,
useProps,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { message } from 'antd';
import { debounce } from 'lodash';
import React, { SyntheticEvent, useCallback, useEffect, useMemo, useRef, useState } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/style.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/style.tsx
index 3b1492b4f..c5bd36478 100644
--- a/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/style.tsx
+++ b/packages/plugins/@nocobase/plugin-gantt/src/client/components/gantt/style.tsx
@@ -1,4 +1,4 @@
-import { createStyles } from '@nocobase/client';
+import { createStyles } from '@tachybase/client';
const useStyles = createStyles(({ token, css }) => {
return {
diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/components/grid/grid-body.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/components/grid/grid-body.tsx
index f5f5cdec5..a9d1751a6 100644
--- a/packages/plugins/@nocobase/plugin-gantt/src/client/components/grid/grid-body.tsx
+++ b/packages/plugins/@nocobase/plugin-gantt/src/client/components/grid/grid-body.tsx
@@ -1,5 +1,5 @@
import { cx } from '@emotion/css';
-import { uid } from '@nocobase/utils/client';
+import { uid } from '@tachybase/utils/client';
import React, { ReactChild } from 'react';
import { addToDate } from '../../helpers/date-helper';
import { Task } from '../../types/public-types';
diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/demos/demo1.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/demos/demo1.tsx
index 1f70e9aaa..751113462 100644
--- a/packages/plugins/@nocobase/plugin-gantt/src/client/demos/demo1.tsx
+++ b/packages/plugins/@nocobase/plugin-gantt/src/client/demos/demo1.tsx
@@ -1,4 +1,4 @@
-import { Gantt, SchemaComponent, SchemaComponentProvider, useGanttBlockProps } from '@nocobase/client';
+import { Gantt, SchemaComponent, SchemaComponentProvider, useGanttBlockProps } from '@tachybase/client';
import React from 'react';
const schema = {
diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/index.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/index.tsx
index c24339362..9f4537723 100644
--- a/packages/plugins/@nocobase/plugin-gantt/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-gantt/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { ActionBar, CurrentAppInfoProvider, Plugin, SchemaComponentOptions } from '@nocobase/client';
+import { ActionBar, CurrentAppInfoProvider, Plugin, SchemaComponentOptions } from '@tachybase/client';
import React from 'react';
import { GanttDesigner } from './Gantt.Designer';
import { ganttSettings, oldGanttSettings } from './Gantt.Settings';
diff --git a/packages/plugins/@nocobase/plugin-gantt/src/client/utils.tsx b/packages/plugins/@nocobase/plugin-gantt/src/client/utils.tsx
index 43949db23..5301204c5 100644
--- a/packages/plugins/@nocobase/plugin-gantt/src/client/utils.tsx
+++ b/packages/plugins/@nocobase/plugin-gantt/src/client/utils.tsx
@@ -1,4 +1,4 @@
-import { useCollection_deprecated, useCompile } from '@nocobase/client';
+import { useCollection_deprecated, useCompile } from '@tachybase/client';
import { useTranslation } from 'react-i18next';
export const useGanttTranslation = () => {
diff --git a/packages/plugins/@nocobase/plugin-gantt/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-gantt/src/server/plugin.ts
index 57c95c577..e64b8deb8 100644
--- a/packages/plugins/@nocobase/plugin-gantt/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-gantt/src/server/plugin.ts
@@ -1,4 +1,4 @@
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { InstallOptions, Plugin } from '@tachybase/server';
export class PluginGanttServer extends Plugin {
afterAdd() {}
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json b/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json
index 878acce16..0a9059948 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/package.json
@@ -30,11 +30,11 @@
"react-router-dom": "^6.11.2"
},
"peerDependencies": {
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "类似 ER 图的工具，目前只支持主数据库。",
"displayName.zh-CN": "可视化数据表管理",
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/GraphCollectionShortcut.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/GraphCollectionShortcut.tsx
index 5761e6970..e10b9b775 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/GraphCollectionShortcut.tsx
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/GraphCollectionShortcut.tsx
@@ -1,6 +1,6 @@
import { DeleteOutlined } from '@ant-design/icons';
import { uid } from '@tachybase/schema';
-import { css, SchemaComponent, useActionContext, useRequest } from '@nocobase/client';
+import { css, SchemaComponent, useActionContext, useRequest } from '@tachybase/client';
import React, { useEffect } from 'react';
import { useCreateActionAndRefreshCM } from './action-hooks';
import { GraphDrawPage } from './GraphDrawPage';
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/GraphDrawPage.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/GraphDrawPage.tsx
index 0e7b1f7b1..43d870e24 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/GraphDrawPage.tsx
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/GraphDrawPage.tsx
@@ -25,7 +25,7 @@ import {
useDataSourceManager,
useDataSource,
useGlobalTheme,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { App, Button, ConfigProvider, Layout, Spin, Switch, Tooltip } from 'antd';
import dagre from 'dagre';
import lodash from 'lodash';
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/action-hooks.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/action-hooks.tsx
index 0406e81e1..95af6e21b 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/action-hooks.tsx
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/action-hooks.tsx
@@ -7,8 +7,8 @@ import {
useCollectionManager_deprecated,
useCompile,
useRequest,
-} from '@nocobase/client';
-import { error, lodash } from '@nocobase/utils/client';
+} from '@tachybase/client';
+import { error, lodash } from '@tachybase/utils/client';
import { Select, message } from 'antd';
import cloneDeep from 'lodash/cloneDeep';
import React, { useContext, useEffect } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/AddCollectionAction.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/AddCollectionAction.tsx
index a94131ce2..fcf00a2e7 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/AddCollectionAction.tsx
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/AddCollectionAction.tsx
@@ -1,5 +1,5 @@
import { PlusOutlined } from '@ant-design/icons';
-import { AddCollection } from '@nocobase/client';
+import { AddCollection } from '@tachybase/client';
import { Button } from 'antd';
import React from 'react';
import { useCancelAction } from '../action-hooks';
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/AddFieldAction.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/AddFieldAction.tsx
index 6e5e93684..b7588ae80 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/AddFieldAction.tsx
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/AddFieldAction.tsx
@@ -1,5 +1,5 @@
import { PlusOutlined } from '@ant-design/icons';
-import { AddFieldAction as AddCollectionFieldAction } from '@nocobase/client';
+import { AddFieldAction as AddCollectionFieldAction } from '@tachybase/client';
import React from 'react';
import { useCancelAction, useCreateAction } from '../action-hooks';
import { getPopupContainer } from '../utils';
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/ConnectChildAction.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/ConnectChildAction.tsx
index 7502bdd3f..96dad3a76 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/ConnectChildAction.tsx
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/ConnectChildAction.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { Tooltip } from 'antd';
import { FallOutlined } from '@ant-design/icons';
-import { useCollectionManager_deprecated } from '@nocobase/client';
+import { useCollectionManager_deprecated } from '@tachybase/client';
import { getPopupContainer, useGCMTranslation } from '../utils';
export const ConnectChildAction = (props) => {
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/ConnectParentAction.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/ConnectParentAction.tsx
index abb03126f..ed0ac9676 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/ConnectParentAction.tsx
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/ConnectParentAction.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { Tooltip } from 'antd';
import { RiseOutlined } from '@ant-design/icons';
-import { useCollectionManager_deprecated } from '@nocobase/client';
+import { useCollectionManager_deprecated } from '@tachybase/client';
import { getPopupContainer, useGCMTranslation } from '../utils';
export const ConnectParentAction = (props) => {
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/DeleteCollectionAction.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/DeleteCollectionAction.tsx
index 783b5878c..f06528d23 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/DeleteCollectionAction.tsx
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/DeleteCollectionAction.tsx
@@ -1,5 +1,5 @@
import { DeleteOutlined } from '@ant-design/icons';
-import { DeleteCollection } from '@nocobase/client';
+import { DeleteCollection } from '@tachybase/client';
import React from 'react';
import { useCancelAction, useUpdateCollectionActionAndRefreshCM } from '../action-hooks';
import { getPopupContainer } from '../utils';
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/EditCollectionAction.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/EditCollectionAction.tsx
index d885b36b6..09cc1d2fc 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/EditCollectionAction.tsx
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/EditCollectionAction.tsx
@@ -1,5 +1,5 @@
import { EditOutlined } from '@ant-design/icons';
-import { EditCollection } from '@nocobase/client';
+import { EditCollection } from '@tachybase/client';
import React from 'react';
import { useCancelAction, useUpdateCollectionActionAndRefreshCM } from '../action-hooks';
import { getPopupContainer } from '../utils';
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/EditFieldAction.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/EditFieldAction.tsx
index 19a9cf9cf..a646fca65 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/EditFieldAction.tsx
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/EditFieldAction.tsx
@@ -1,5 +1,5 @@
import { EditOutlined } from '@ant-design/icons';
-import { EditFieldAction as EditCollectionFieldAction } from '@nocobase/client';
+import { EditFieldAction as EditCollectionFieldAction } from '@tachybase/client';
import React from 'react';
import { useCancelAction, useUpdateFieldAction } from '../action-hooks';
import { getPopupContainer } from '../utils';
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/Entity.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/Entity.tsx
index 0014e553c..d52157e1e 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/Entity.tsx
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/Entity.tsx
@@ -13,7 +13,7 @@ import {
useCompile,
useCurrentAppInfo,
useRecord,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { Badge, Tag } from 'antd';
import lodash from 'lodash';
import React, { useContext, useRef, useState } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/FieldSummary.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/FieldSummary.tsx
index e433be539..2ca827cf6 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/FieldSummary.tsx
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/FieldSummary.tsx
@@ -1,5 +1,5 @@
import { observer } from '@tachybase/schema';
-import { css, useCollectionManager_deprecated, useCompile } from '@nocobase/client';
+import { css, useCollectionManager_deprecated, useCompile } from '@tachybase/client';
import { Tag } from 'antd';
import React from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/LocateCollectionAction.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/LocateCollectionAction.tsx
index 8d75e9806..c0f9b0f4c 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/LocateCollectionAction.tsx
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/LocateCollectionAction.tsx
@@ -2,7 +2,7 @@ import React, { useState, useContext } from 'react';
import { Input, Menu, Popover, Button } from 'antd';
import { css } from '@emotion/css';
import { MenuOutlined } from '@ant-design/icons';
-import { useCompile } from '@nocobase/client';
+import { useCompile } from '@tachybase/client';
import { getPopupContainer, useGCMTranslation } from '../utils';
import { CollapsedContext } from '../GraphDrawPage';
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/OverrideFieldAction.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/OverrideFieldAction.tsx
index 7791debc0..ed96d0f49 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/OverrideFieldAction.tsx
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/OverrideFieldAction.tsx
@@ -1,5 +1,5 @@
import { CopyOutlined } from '@ant-design/icons';
-import { OverridingFieldAction as OverridingCollectionFieldAction } from '@nocobase/client';
+import { OverridingFieldAction as OverridingCollectionFieldAction } from '@tachybase/client';
import React from 'react';
import { useCancelAction, useCreateAction } from '../action-hooks';
import { getPopupContainer } from '../utils';
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/SelectCollectionsAction.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/SelectCollectionsAction.tsx
index 37dbdc22d..fe4a4d5f8 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/SelectCollectionsAction.tsx
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/SelectCollectionsAction.tsx
@@ -1,6 +1,6 @@
import React, { useContext, useMemo } from 'react';
import { CollapsedContext } from '../GraphDrawPage';
-import { Select, useCompile } from '@nocobase/client';
+import { Select, useCompile } from '@tachybase/client';
import { useSearchParams } from 'react-router-dom';
import { getPopupContainer } from '../utils';
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/ViewFieldAction.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/ViewFieldAction.tsx
index 3a3ee4906..d01ee7347 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/ViewFieldAction.tsx
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/components/ViewFieldAction.tsx
@@ -1,5 +1,5 @@
import { EyeOutlined } from '@ant-design/icons';
-import { ViewFieldAction as ViewCollectionFieldAction } from '@nocobase/client';
+import { ViewFieldAction as ViewCollectionFieldAction } from '@tachybase/client';
import React from 'react';
import { getPopupContainer } from '../utils';
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/index.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/index.tsx
index 869c5ccd6..e7a90acaa 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import { GraphCollectionPane } from './GraphCollectionShortcut';
import { NAMESPACE } from './locale';
export class GraphCollectionPlugin extends Plugin {
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/style.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/style.tsx
index cef2e842f..b71f8d59d 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/style.tsx
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/style.tsx
@@ -1,4 +1,4 @@
-import { createStyles } from '@nocobase/client';
+import { createStyles } from '@tachybase/client';
const useStyles = createStyles(({ token, css }) => {
return {
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/utils.tsx b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/utils.tsx
index 543ea816a..d4c274d0c 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/utils.tsx
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/client/utils.tsx
@@ -1,6 +1,6 @@
import lodash from 'lodash';
import { useTranslation } from 'react-i18next';
-import { CollectionOptions } from '@nocobase/client';
+import { CollectionOptions } from '@tachybase/client';
const { groupBy, reduce, uniq, uniqBy } = lodash;
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/server/collections/graphPositions.ts b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/server/collections/graphPositions.ts
index 4635d5fb9..9770b9deb 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/server/collections/graphPositions.ts
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/server/collections/graphPositions.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
dumpRules: 'required',
diff --git a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/server/index.ts b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/server/index.ts
index c6b2d2649..5e875606e 100644
--- a/packages/plugins/@nocobase/plugin-graph-collection-manager/src/server/index.ts
+++ b/packages/plugins/@nocobase/plugin-graph-collection-manager/src/server/index.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/server';
+import { Plugin } from '@tachybase/server';
import path from 'path';
export class GraphCollectionManagerPlugin extends Plugin {
diff --git a/packages/plugins/@nocobase/plugin-iframe-block/package.json b/packages/plugins/@nocobase/plugin-iframe-block/package.json
index 5709b7bb2..20a6f8d64 100644
--- a/packages/plugins/@nocobase/plugin-iframe-block/package.json
+++ b/packages/plugins/@nocobase/plugin-iframe-block/package.json
@@ -18,11 +18,11 @@
"react-iframe": "~1.8.5"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*"
},
"description.zh-CN": "在页面上创建和管理iframe，用于嵌入和展示外部网页或内容。",
"displayName.zh-CN": "区块：iframe",
diff --git a/packages/plugins/@nocobase/plugin-iframe-block/src/client/Iframe.Designer.tsx b/packages/plugins/@nocobase/plugin-iframe-block/src/client/Iframe.Designer.tsx
index 10ee7486c..4e5e352f8 100644
--- a/packages/plugins/@nocobase/plugin-iframe-block/src/client/Iframe.Designer.tsx
+++ b/packages/plugins/@nocobase/plugin-iframe-block/src/client/Iframe.Designer.tsx
@@ -7,7 +7,7 @@ import {
SchemaSettingsRemove,
useAPIClient,
useDesignable,
-} from '@nocobase/client';
+} from '@tachybase/client';
import React from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@nocobase/plugin-iframe-block/src/client/Iframe.tsx b/packages/plugins/@nocobase/plugin-iframe-block/src/client/Iframe.tsx
index f35f07f9d..3b68e98bd 100644
--- a/packages/plugins/@nocobase/plugin-iframe-block/src/client/Iframe.tsx
+++ b/packages/plugins/@nocobase/plugin-iframe-block/src/client/Iframe.tsx
@@ -1,5 +1,5 @@
import { observer, useField } from '@tachybase/schema';
-import { useAPIClient, useApp } from '@nocobase/client';
+import { useAPIClient, useApp } from '@tachybase/client';
import { Card } from 'antd';
import React from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@nocobase/plugin-iframe-block/src/client/IframeBlockInitializer.tsx b/packages/plugins/@nocobase/plugin-iframe-block/src/client/IframeBlockInitializer.tsx
index 54705ed47..1f6d50cd6 100644
--- a/packages/plugins/@nocobase/plugin-iframe-block/src/client/IframeBlockInitializer.tsx
+++ b/packages/plugins/@nocobase/plugin-iframe-block/src/client/IframeBlockInitializer.tsx
@@ -1,5 +1,5 @@
import { FormOutlined } from '@ant-design/icons';
-import { SchemaInitializerItem, useSchemaInitializer, useSchemaInitializerItem } from '@nocobase/client';
+import { SchemaInitializerItem, useSchemaInitializer, useSchemaInitializerItem } from '@tachybase/client';
import React from 'react';
export const IframeBlockInitializer = () => {
diff --git a/packages/plugins/@nocobase/plugin-iframe-block/src/client/IframeBlockProvider.tsx b/packages/plugins/@nocobase/plugin-iframe-block/src/client/IframeBlockProvider.tsx
index 746359bd4..8f779f8b8 100644
--- a/packages/plugins/@nocobase/plugin-iframe-block/src/client/IframeBlockProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-iframe-block/src/client/IframeBlockProvider.tsx
@@ -1,4 +1,4 @@
-import { SchemaComponentOptions } from '@nocobase/client';
+import { SchemaComponentOptions } from '@tachybase/client';
import React from 'react';
import { Iframe } from './Iframe';
import { IframeBlockInitializer } from './IframeBlockInitializer';
diff --git a/packages/plugins/@nocobase/plugin-iframe-block/src/client/index.ts b/packages/plugins/@nocobase/plugin-iframe-block/src/client/index.ts
index a30d4869d..3bd700a16 100644
--- a/packages/plugins/@nocobase/plugin-iframe-block/src/client/index.ts
+++ b/packages/plugins/@nocobase/plugin-iframe-block/src/client/index.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import { IframeBlockProvider } from './IframeBlockProvider';
import { iframeBlockSchemaSettings, iframeBlockSchemaSettings_deprecated } from './schemaSettings';
diff --git a/packages/plugins/@nocobase/plugin-iframe-block/src/client/schemaSettings.ts b/packages/plugins/@nocobase/plugin-iframe-block/src/client/schemaSettings.ts
index d22374b1a..b5e98f16d 100644
--- a/packages/plugins/@nocobase/plugin-iframe-block/src/client/schemaSettings.ts
+++ b/packages/plugins/@nocobase/plugin-iframe-block/src/client/schemaSettings.ts
@@ -1,6 +1,6 @@
import { ISchema, useField, useFieldSchema } from '@tachybase/schema';
import { uid } from '@tachybase/schema';
-import { SchemaSettings, useAPIClient, useDesignable } from '@nocobase/client';
+import { SchemaSettings, useAPIClient, useDesignable } from '@tachybase/client';
import { useTranslation } from 'react-i18next';
/**
diff --git a/packages/plugins/@nocobase/plugin-iframe-block/src/server/actions/index.ts b/packages/plugins/@nocobase/plugin-iframe-block/src/server/actions/index.ts
index c16728ccf..11321e2d7 100644
--- a/packages/plugins/@nocobase/plugin-iframe-block/src/server/actions/index.ts
+++ b/packages/plugins/@nocobase/plugin-iframe-block/src/server/actions/index.ts
@@ -1,5 +1,5 @@
-import { Context, Next } from '@nocobase/actions';
-import { Repository } from '@nocobase/database';
+import { Context, Next } from '@tachybase/actions';
+import { Repository } from '@tachybase/database';
export async function getHtml(ctx: Context, next: Next) {
const { filterByTk } = ctx.action.params;
diff --git a/packages/plugins/@nocobase/plugin-iframe-block/src/server/collections/iframe-html.ts b/packages/plugins/@nocobase/plugin-iframe-block/src/server/collections/iframe-html.ts
index d2ee425c7..0146a8c9c 100644
--- a/packages/plugins/@nocobase/plugin-iframe-block/src/server/collections/iframe-html.ts
+++ b/packages/plugins/@nocobase/plugin-iframe-block/src/server/collections/iframe-html.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
export default {
namespace: 'iframe-block.iframe-html-storage',
diff --git a/packages/plugins/@nocobase/plugin-iframe-block/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-iframe-block/src/server/plugin.ts
index 5b7e19399..fd034195c 100644
--- a/packages/plugins/@nocobase/plugin-iframe-block/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-iframe-block/src/server/plugin.ts
@@ -1,4 +1,4 @@
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { InstallOptions, Plugin } from '@tachybase/server';
import path from 'path';
import { getHtml } from './actions';
diff --git a/packages/plugins/@nocobase/plugin-import/README.md b/packages/plugins/@nocobase/plugin-import/README.md
index 858ebdfe5..0d915185d 100644
--- a/packages/plugins/@nocobase/plugin-import/README.md
+++ b/packages/plugins/@nocobase/plugin-import/README.md
@@ -185,7 +185,7 @@ Excel 数据导入插件。
通过 `db.registerFieldValueParsers()` 方法注册自定义的 `ValueParser`，如：
```ts
-import { BaseValueParser } from '@nocobase/database';
+import { BaseValueParser } from '@tachybase/database';
class PointValueParser extends BaseValueParser {
async setValue(value) {
diff --git a/packages/plugins/@nocobase/plugin-import/README.zh-CN.md b/packages/plugins/@nocobase/plugin-import/README.zh-CN.md
index 68c6546c7..d3d4cc24b 100644
--- a/packages/plugins/@nocobase/plugin-import/README.zh-CN.md
+++ b/packages/plugins/@nocobase/plugin-import/README.zh-CN.md
@@ -185,7 +185,7 @@ Excel 数据导入插件。
通过 `db.registerFieldValueParsers()` 方法注册自定义的 `ValueParser`，如：
```ts
-import { BaseValueParser } from '@nocobase/database';
+import { BaseValueParser } from '@tachybase/database';
class PointValueParser extends BaseValueParser {
async setValue(value) {
diff --git a/packages/plugins/@nocobase/plugin-import/package.json b/packages/plugins/@nocobase/plugin-import/package.json
index af5522594..813129d41 100644
--- a/packages/plugins/@nocobase/plugin-import/package.json
+++ b/packages/plugins/@nocobase/plugin-import/package.json
@@ -26,12 +26,12 @@
"xlsx": "^0.17.0"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "使用 Excel 模板导入数据，可以配置导入哪些字段，自动生成模板。",
"displayName.zh-CN": "操作：导入记录",
diff --git a/packages/plugins/@nocobase/plugin-import/src/client/ImportActionInitializer.tsx b/packages/plugins/@nocobase/plugin-import/src/client/ImportActionInitializer.tsx
index eec9046d1..5e84fc712 100644
--- a/packages/plugins/@nocobase/plugin-import/src/client/ImportActionInitializer.tsx
+++ b/packages/plugins/@nocobase/plugin-import/src/client/ImportActionInitializer.tsx
@@ -8,7 +8,7 @@ import {
useDesignable,
useSchemaInitializer,
useSchemaInitializerItem,
-} from '@nocobase/client';
+} from '@tachybase/client';
import React from 'react';
import { NAMESPACE } from './constants';
import { useFields } from './useFields';
diff --git a/packages/plugins/@nocobase/plugin-import/src/client/ImportDesigner.tsx b/packages/plugins/@nocobase/plugin-import/src/client/ImportDesigner.tsx
index 180076afd..d59c724af 100644
--- a/packages/plugins/@nocobase/plugin-import/src/client/ImportDesigner.tsx
+++ b/packages/plugins/@nocobase/plugin-import/src/client/ImportDesigner.tsx
@@ -8,7 +8,7 @@ import {
SchemaSettingsModalItem,
SchemaSettingsRemove,
useDesignable,
-} from '@nocobase/client';
+} from '@tachybase/client';
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useShared } from './useShared';
diff --git a/packages/plugins/@nocobase/plugin-import/src/client/ImportModal.tsx b/packages/plugins/@nocobase/plugin-import/src/client/ImportModal.tsx
index f579d9e28..76ca1c668 100644
--- a/packages/plugins/@nocobase/plugin-import/src/client/ImportModal.tsx
+++ b/packages/plugins/@nocobase/plugin-import/src/client/ImportModal.tsx
@@ -1,5 +1,5 @@
import { ExclamationCircleFilled, LoadingOutlined } from '@ant-design/icons';
-import { css } from '@nocobase/client';
+import { css } from '@tachybase/client';
import { Button, Modal, Space, Spin } from 'antd';
import { saveAs } from 'file-saver';
import React from 'react';
diff --git a/packages/plugins/@nocobase/plugin-import/src/client/ImportPluginProvider.tsx b/packages/plugins/@nocobase/plugin-import/src/client/ImportPluginProvider.tsx
index 17e113318..6b53c2caf 100644
--- a/packages/plugins/@nocobase/plugin-import/src/client/ImportPluginProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-import/src/client/ImportPluginProvider.tsx
@@ -1,4 +1,4 @@
-import { SchemaComponentOptions } from '@nocobase/client';
+import { SchemaComponentOptions } from '@tachybase/client';
import React, { useState } from 'react';
import { createPortal } from 'react-dom';
import { ImportActionInitializer, ImportDesigner } from '.';
diff --git a/packages/plugins/@nocobase/plugin-import/src/client/index.ts b/packages/plugins/@nocobase/plugin-import/src/client/index.ts
index b1922c29a..48438e727 100644
--- a/packages/plugins/@nocobase/plugin-import/src/client/index.ts
+++ b/packages/plugins/@nocobase/plugin-import/src/client/index.ts
@@ -6,7 +6,7 @@ export * from './ImportDesigner';
export * from './ImportPluginProvider';
export * from './useImportAction';
-import { Plugin, useCollection_deprecated } from '@nocobase/client';
+import { Plugin, useCollection_deprecated } from '@tachybase/client';
import { ImportPluginProvider } from './ImportPluginProvider';
import { importActionSchemaSettings } from './schemaSettings';
diff --git a/packages/plugins/@nocobase/plugin-import/src/client/schemaSettings.ts b/packages/plugins/@nocobase/plugin-import/src/client/schemaSettings.ts
index 9652ed1f5..f999f8c9c 100644
--- a/packages/plugins/@nocobase/plugin-import/src/client/schemaSettings.ts
+++ b/packages/plugins/@nocobase/plugin-import/src/client/schemaSettings.ts
@@ -1,6 +1,6 @@
import { ArrayItems } from '@tachybase/components';
import { ISchema, useField, useFieldSchema } from '@tachybase/schema';
-import { ButtonEditor, SchemaSettings, useDesignable, useSchemaToolbar } from '@nocobase/client';
+import { ButtonEditor, SchemaSettings, useDesignable, useSchemaToolbar } from '@tachybase/client';
import { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useShared } from './useShared';
diff --git a/packages/plugins/@nocobase/plugin-import/src/client/useFields.ts b/packages/plugins/@nocobase/plugin-import/src/client/useFields.ts
index c7a3c98b6..5114566d6 100644
--- a/packages/plugins/@nocobase/plugin-import/src/client/useFields.ts
+++ b/packages/plugins/@nocobase/plugin-import/src/client/useFields.ts
@@ -1,4 +1,4 @@
-import { useCollectionManager_deprecated } from '@nocobase/client';
+import { useCollectionManager_deprecated } from '@tachybase/client';
const EXCLUDE_INTERFACES = [
// 'icon',
diff --git a/packages/plugins/@nocobase/plugin-import/src/client/useImportAction.ts b/packages/plugins/@nocobase/plugin-import/src/client/useImportAction.ts
index 59a1363fe..20f8c7585 100644
--- a/packages/plugins/@nocobase/plugin-import/src/client/useImportAction.ts
+++ b/packages/plugins/@nocobase/plugin-import/src/client/useImportAction.ts
@@ -6,7 +6,7 @@ import {
useCollection_deprecated,
useCollectionManager_deprecated,
useCompile,
-} from '@nocobase/client';
+} from '@tachybase/client';
import lodash from 'lodash';
import { saveAs } from 'file-saver';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@nocobase/plugin-import/src/client/useShared.ts b/packages/plugins/@nocobase/plugin-import/src/client/useShared.ts
index 1d5a7df66..018a17cc6 100644
--- a/packages/plugins/@nocobase/plugin-import/src/client/useShared.ts
+++ b/packages/plugins/@nocobase/plugin-import/src/client/useShared.ts
@@ -1,5 +1,5 @@
import type { VoidField } from '@tachybase/schema';
-import { Cascader, css, useCollection_deprecated } from '@nocobase/client';
+import { Cascader, css, useCollection_deprecated } from '@tachybase/client';
import { useTranslation } from 'react-i18next';
import { NAMESPACE } from './constants';
import { useFields } from './useFields';
diff --git a/packages/plugins/@nocobase/plugin-import/src/server/actions/downloadXlsxTemplate.ts b/packages/plugins/@nocobase/plugin-import/src/server/actions/downloadXlsxTemplate.ts
index b01709b3d..c3899a07d 100644
--- a/packages/plugins/@nocobase/plugin-import/src/server/actions/downloadXlsxTemplate.ts
+++ b/packages/plugins/@nocobase/plugin-import/src/server/actions/downloadXlsxTemplate.ts
@@ -1,4 +1,4 @@
-import { Context, Next } from '@nocobase/actions';
+import { Context, Next } from '@tachybase/actions';
import xlsx from 'node-xlsx';
export async function downloadXlsxTemplate(ctx: Context, next: Next) {
diff --git a/packages/plugins/@nocobase/plugin-import/src/server/actions/importXlsx.ts b/packages/plugins/@nocobase/plugin-import/src/server/actions/importXlsx.ts
index 00ec5b62e..6d0b9ea24 100644
--- a/packages/plugins/@nocobase/plugin-import/src/server/actions/importXlsx.ts
+++ b/packages/plugins/@nocobase/plugin-import/src/server/actions/importXlsx.ts
@@ -1,6 +1,6 @@
-import { Context, Next } from '@nocobase/actions';
-import { Collection, Repository } from '@nocobase/database';
-import { uid } from '@nocobase/utils';
+import { Context, Next } from '@tachybase/actions';
+import { Collection, Repository } from '@tachybase/database';
+import { uid } from '@tachybase/utils';
import xlsx from 'node-xlsx';
import XLSX from 'xlsx';
import { namespace } from '../../';
diff --git a/packages/plugins/@nocobase/plugin-import/src/server/index.ts b/packages/plugins/@nocobase/plugin-import/src/server/index.ts
index 0f455be11..19a474d1a 100644
--- a/packages/plugins/@nocobase/plugin-import/src/server/index.ts
+++ b/packages/plugins/@nocobase/plugin-import/src/server/index.ts
@@ -1,4 +1,4 @@
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { InstallOptions, Plugin } from '@tachybase/server';
import { namespace } from '..';
import { downloadXlsxTemplate, importXlsx } from './actions';
import { enUS, zhCN } from './locale';
diff --git a/packages/plugins/@nocobase/plugin-import/src/server/middleware/index.ts b/packages/plugins/@nocobase/plugin-import/src/server/middleware/index.ts
index 0be497f3d..b45e9f977 100644
--- a/packages/plugins/@nocobase/plugin-import/src/server/middleware/index.ts
+++ b/packages/plugins/@nocobase/plugin-import/src/server/middleware/index.ts
@@ -1,5 +1,5 @@
-import { Context, Next } from '@nocobase/actions';
-import { koaMulter as multer } from '@nocobase/utils';
+import { Context, Next } from '@tachybase/actions';
+import { koaMulter as multer } from '@tachybase/utils';
export async function importMiddleware(ctx: Context, next: Next) {
if (ctx.action.actionName !== 'importXlsx') {
diff --git a/packages/plugins/@nocobase/plugin-import/src/server/utils/transform.ts b/packages/plugins/@nocobase/plugin-import/src/server/utils/transform.ts
index 1fe46e596..40dbdf8b0 100644
--- a/packages/plugins/@nocobase/plugin-import/src/server/utils/transform.ts
+++ b/packages/plugins/@nocobase/plugin-import/src/server/utils/transform.ts
@@ -1,4 +1,4 @@
-import { dayjs, str2moment } from '@nocobase/utils';
+import { dayjs, str2moment } from '@tachybase/utils';
import * as math from 'mathjs';
import { namespace } from '../../';
diff --git a/packages/plugins/@nocobase/plugin-kanban/package.json b/packages/plugins/@nocobase/plugin-kanban/package.json
index 2467a6932..0e19527c9 100644
--- a/packages/plugins/@nocobase/plugin-kanban/package.json
+++ b/packages/plugins/@nocobase/plugin-kanban/package.json
@@ -22,9 +22,9 @@
"react-i18next": "^11.15.1"
},
"peerDependencies": {
- "@nocobase/client": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*"
+ "@tachybase/client": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*"
},
"description.zh-CN": "提供看板区块。",
"displayName.zh-CN": "区块：看板",
diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/CreateAndSelectSort/index.tsx b/packages/plugins/@nocobase/plugin-kanban/src/client/CreateAndSelectSort/index.tsx
index 03baec204..d1aa7b7fa 100644
--- a/packages/plugins/@nocobase/plugin-kanban/src/client/CreateAndSelectSort/index.tsx
+++ b/packages/plugins/@nocobase/plugin-kanban/src/client/CreateAndSelectSort/index.tsx
@@ -8,7 +8,7 @@ import {
useAPIClient,
useCompile,
useGlobalTheme,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { Button, Space } from 'antd';
import React, { useContext } from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.Designer.tsx b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.Designer.tsx
index 27929a76d..1adaad24d 100644
--- a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.Designer.tsx
+++ b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.Designer.tsx
@@ -11,7 +11,7 @@ import {
useFormItemInitializerFields,
useGetAriaLabelOfDesigner,
useSchemaInitializerRender,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { Space } from 'antd';
import React from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.tsx b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.tsx
index 097f5b00a..bf1bd6e9f 100644
--- a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.tsx
+++ b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Card.tsx
@@ -7,7 +7,7 @@ import {
RecordProvider,
SchemaComponentOptions,
useCollectionParentRecordData,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { Card } from 'antd';
import cls from 'classnames';
import React, { useContext, useState } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Designer.tsx b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Designer.tsx
index ee90ca3ce..6834e0caf 100644
--- a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Designer.tsx
+++ b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Designer.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { useCollection_deprecated, GeneralSchemaDesigner, useSchemaTemplate } from '@nocobase/client';
+import { useCollection_deprecated, GeneralSchemaDesigner, useSchemaTemplate } from '@tachybase/client';
export const KanbanDesigner = () => {
const { name, title } = useCollection_deprecated();
diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Settings.tsx b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Settings.tsx
index c46d7c1b6..f00948ea7 100644
--- a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Settings.tsx
+++ b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.Settings.tsx
@@ -9,7 +9,7 @@ import {
SchemaSettingsBlockTitleItem,
removeNullCondition,
SchemaSettingsTemplate,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { useKanbanBlockContext } from './KanbanBlockProvider';
export const kanbanSettings = new SchemaSettings({
name: 'blockSettings:kanban',
diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.tsx b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.tsx
index 73ba5f85d..6c02fb80b 100644
--- a/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.tsx
+++ b/packages/plugins/@nocobase/plugin-kanban/src/client/Kanban.tsx
@@ -7,7 +7,7 @@ import {
useCollectionParentRecordData,
useProps,
withDynamicSchemaProps,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { Spin, Tag } from 'antd';
import React, { useContext, useMemo, useState } from 'react';
import { Board } from './board';
diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanActionInitializers.tsx b/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanActionInitializers.tsx
index 2864b7aca..3a7fce85b 100644
--- a/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanActionInitializers.tsx
+++ b/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanActionInitializers.tsx
@@ -1,4 +1,4 @@
-import { CompatibleSchemaInitializer, useCollection_deprecated } from '@nocobase/client';
+import { CompatibleSchemaInitializer, useCollection_deprecated } from '@tachybase/client';
/**
* @deprecated
diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanBlockInitializer.tsx b/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanBlockInitializer.tsx
index e4fdb407a..6a03182d7 100644
--- a/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanBlockInitializer.tsx
+++ b/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanBlockInitializer.tsx
@@ -15,7 +15,7 @@ import {
useSchemaInitializer,
useSchemaInitializerItem,
useAPIClient,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { createKanbanBlockUISchema } from './createKanbanBlockUISchema';
import { CreateAndSelectSort } from './CreateAndSelectSort';
import { NAMESPACE } from './locale';
diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanBlockProvider.tsx b/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanBlockProvider.tsx
index 2fd09ce4d..812e911be 100644
--- a/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanBlockProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-kanban/src/client/KanbanBlockProvider.tsx
@@ -10,7 +10,7 @@ import {
FixedBlockWrapper,
BlockProvider,
useBlockRequestContext,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { toColumns } from './Kanban';
export const KanbanBlockContext = createContext({});
diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/__e2e__/schemaInitailizer.test.ts b/packages/plugins/@nocobase/plugin-kanban/src/client/__e2e__/schemaInitailizer.test.ts
index aa79b8fd9..1efab3e96 100644
--- a/packages/plugins/@nocobase/plugin-kanban/src/client/__e2e__/schemaInitailizer.test.ts
+++ b/packages/plugins/@nocobase/plugin-kanban/src/client/__e2e__/schemaInitailizer.test.ts
@@ -1,4 +1,4 @@
-import { expect, test } from '@nocobase/test/e2e';
+import { expect, test } from '@tachybase/test/e2e';
import { generalWithSingleSelect, oneEmptyKanbanBlock } from './utils';
//在页面中可以创建看板区块
diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/__e2e__/schemaSettings.test.ts b/packages/plugins/@nocobase/plugin-kanban/src/client/__e2e__/schemaSettings.test.ts
index 97f332502..89fde40d5 100644
--- a/packages/plugins/@nocobase/plugin-kanban/src/client/__e2e__/schemaSettings.test.ts
+++ b/packages/plugins/@nocobase/plugin-kanban/src/client/__e2e__/schemaSettings.test.ts
@@ -1,4 +1,4 @@
-import { expect, test } from '@nocobase/test/e2e';
+import { expect, test } from '@tachybase/test/e2e';
import { oneEmptyKanbanBlock } from './utils';
//看板的区块参数配置
diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/__e2e__/utils.ts b/packages/plugins/@nocobase/plugin-kanban/src/client/__e2e__/utils.ts
index 22dcb9ef3..08ed93b91 100644
--- a/packages/plugins/@nocobase/plugin-kanban/src/client/__e2e__/utils.ts
+++ b/packages/plugins/@nocobase/plugin-kanban/src/client/__e2e__/utils.ts
@@ -1,4 +1,4 @@
-import { CollectionSetting, PageConfig } from '@nocobase/test/e2e';
+import { CollectionSetting, PageConfig } from '@tachybase/test/e2e';
/**
* 1. 创建一个名为 general 的 collection，其包含 single select 类型的字段
diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/board/demos/demo2.tsx b/packages/plugins/@nocobase/plugin-kanban/src/client/board/demos/demo2.tsx
index a0e8d346f..c45fbf160 100644
--- a/packages/plugins/@nocobase/plugin-kanban/src/client/board/demos/demo2.tsx
+++ b/packages/plugins/@nocobase/plugin-kanban/src/client/board/demos/demo2.tsx
@@ -1,4 +1,4 @@
-import { Board } from '@nocobase/client';
+import { Board } from '@tachybase/client';
import { Button, Card } from 'antd';
import React, { useState } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/index.tsx b/packages/plugins/@nocobase/plugin-kanban/src/client/index.tsx
index 1538f1aa3..59f3fdbfb 100644
--- a/packages/plugins/@nocobase/plugin-kanban/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-kanban/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Action, CurrentAppInfoProvider, Plugin, SchemaComponentOptions } from '@nocobase/client';
+import { Action, CurrentAppInfoProvider, Plugin, SchemaComponentOptions } from '@tachybase/client';
import React from 'react';
import { Kanban } from './Kanban';
import { KanbanCard } from './Kanban.Card';
diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/locale/index.ts b/packages/plugins/@nocobase/plugin-kanban/src/client/locale/index.ts
index 016d63abe..86c8eea71 100644
--- a/packages/plugins/@nocobase/plugin-kanban/src/client/locale/index.ts
+++ b/packages/plugins/@nocobase/plugin-kanban/src/client/locale/index.ts
@@ -1,4 +1,4 @@
-import { i18n } from '@nocobase/client';
+import { i18n } from '@tachybase/client';
import { useTranslation } from 'react-i18next';
export const NAMESPACE = 'kanban';
diff --git a/packages/plugins/@nocobase/plugin-kanban/src/client/style.tsx b/packages/plugins/@nocobase/plugin-kanban/src/client/style.tsx
index e487a498f..3faa017a4 100644
--- a/packages/plugins/@nocobase/plugin-kanban/src/client/style.tsx
+++ b/packages/plugins/@nocobase/plugin-kanban/src/client/style.tsx
@@ -1,4 +1,4 @@
-import { createStyles } from '@nocobase/client';
+import { createStyles } from '@tachybase/client';
export const useStyles = createStyles(({ token, css }) => {
return {
diff --git a/packages/plugins/@nocobase/plugin-kanban/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-kanban/src/server/plugin.ts
index ba3739ae8..7bf99b089 100644
--- a/packages/plugins/@nocobase/plugin-kanban/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-kanban/src/server/plugin.ts
@@ -1,4 +1,4 @@
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { InstallOptions, Plugin } from '@tachybase/server';
export class PluginKanbanServer extends Plugin {
afterAdd() {}
diff --git a/packages/plugins/@nocobase/plugin-localization-management/package.json b/packages/plugins/@nocobase/plugin-localization-management/package.json
index 666f0881b..23adc3bee 100644
--- a/packages/plugins/@nocobase/plugin-localization-management/package.json
+++ b/packages/plugins/@nocobase/plugin-localization-management/package.json
@@ -18,14 +18,14 @@
"react-i18next": "^11.15.1"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/cache": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
"@nocobase/plugin-client": "workspace:*",
"@nocobase/plugin-ui-schema-storage": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/cache": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*"
},
"description.zh-CN": "支持管理应用程序的本地化资源。",
"displayName.zh-CN": "本地化",
diff --git a/packages/plugins/@nocobase/plugin-localization-management/src/client/Localization.tsx b/packages/plugins/@nocobase/plugin-localization-management/src/client/Localization.tsx
index d860f004f..114b293a1 100644
--- a/packages/plugins/@nocobase/plugin-localization-management/src/client/Localization.tsx
+++ b/packages/plugins/@nocobase/plugin-localization-management/src/client/Localization.tsx
@@ -14,7 +14,7 @@ import {
useRecord,
useResourceActionContext,
useResourceContext,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { useMemoizedFn } from 'ahooks';
import { Input as AntdInput, Button, Card, Checkbox, Col, Divider, Row, Tag, Typography, message } from 'antd';
import React, { useEffect, useMemo, useState } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-localization-management/src/client/index.tsx b/packages/plugins/@nocobase/plugin-localization-management/src/client/index.tsx
index 6ab0e4eb4..619463c43 100644
--- a/packages/plugins/@nocobase/plugin-localization-management/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-localization-management/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import { Localization } from './Localization';
import { NAMESPACE } from './locale';
diff --git a/packages/plugins/@nocobase/plugin-localization-management/src/server/__tests__/actions.test.ts b/packages/plugins/@nocobase/plugin-localization-management/src/server/__tests__/actions.test.ts
index 4e7d963d6..240966e95 100644
--- a/packages/plugins/@nocobase/plugin-localization-management/src/server/__tests__/actions.test.ts
+++ b/packages/plugins/@nocobase/plugin-localization-management/src/server/__tests__/actions.test.ts
@@ -1,5 +1,5 @@
-import Database, { Repository } from '@nocobase/database';
-import { createMockServer, MockServer } from '@nocobase/test';
+import Database, { Repository } from '@tachybase/database';
+import { createMockServer, MockServer } from '@tachybase/test';
describe('actions', () => {
describe('localizations', () => {
diff --git a/packages/plugins/@nocobase/plugin-localization-management/src/server/__tests__/resources.test.ts b/packages/plugins/@nocobase/plugin-localization-management/src/server/__tests__/resources.test.ts
index b83ff1dd3..c1c6f7000 100644
--- a/packages/plugins/@nocobase/plugin-localization-management/src/server/__tests__/resources.test.ts
+++ b/packages/plugins/@nocobase/plugin-localization-management/src/server/__tests__/resources.test.ts
@@ -1,4 +1,4 @@
-import { CacheManager } from '@nocobase/cache';
+import { CacheManager } from '@tachybase/cache';
import Resources from '../resources';
describe('resources', () => {
diff --git a/packages/plugins/@nocobase/plugin-localization-management/src/server/actions/localization.ts b/packages/plugins/@nocobase/plugin-localization-management/src/server/actions/localization.ts
index 0d92d67ba..7997b9790 100644
--- a/packages/plugins/@nocobase/plugin-localization-management/src/server/actions/localization.ts
+++ b/packages/plugins/@nocobase/plugin-localization-management/src/server/actions/localization.ts
@@ -1,5 +1,5 @@
-import { Context, Next } from '@nocobase/actions';
-import { Database, Model, Op } from '@nocobase/database';
+import { Context, Next } from '@tachybase/actions';
+import { Database, Model, Op } from '@tachybase/database';
import { UiSchemaRepository } from '@nocobase/plugin-ui-schema-storage';
import { NAMESPACE_COLLECTIONS, NAMESPACE_MENUS } from '../constans';
import LocalizationManagementPlugin from '../plugin';
diff --git a/packages/plugins/@nocobase/plugin-localization-management/src/server/actions/localizationTexts.ts b/packages/plugins/@nocobase/plugin-localization-management/src/server/actions/localizationTexts.ts
index 191663c9d..1f4773546 100644
--- a/packages/plugins/@nocobase/plugin-localization-management/src/server/actions/localizationTexts.ts
+++ b/packages/plugins/@nocobase/plugin-localization-management/src/server/actions/localizationTexts.ts
@@ -1,7 +1,7 @@
-import { Context, Next, DEFAULT_PAGE, DEFAULT_PER_PAGE } from '@nocobase/actions';
-import { Cache } from '@nocobase/cache';
-import { Database, Model, Op } from '@nocobase/database';
-import { PluginManager } from '@nocobase/server';
+import { Context, Next, DEFAULT_PAGE, DEFAULT_PER_PAGE } from '@tachybase/actions';
+import { Cache } from '@tachybase/cache';
+import { Database, Model, Op } from '@tachybase/database';
+import { PluginManager } from '@tachybase/server';
import { EXTEND_MODULES } from '../constans';
const appendTranslations = async (db: Database, rows: Model[], locale: string): Promise => {
diff --git a/packages/plugins/@nocobase/plugin-localization-management/src/server/collections/localization-texts.ts b/packages/plugins/@nocobase/plugin-localization-management/src/server/collections/localization-texts.ts
index 7dc016464..03d8b3de7 100644
--- a/packages/plugins/@nocobase/plugin-localization-management/src/server/collections/localization-texts.ts
+++ b/packages/plugins/@nocobase/plugin-localization-management/src/server/collections/localization-texts.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
dumpRules: {
diff --git a/packages/plugins/@nocobase/plugin-localization-management/src/server/collections/localization-translations.ts b/packages/plugins/@nocobase/plugin-localization-management/src/server/collections/localization-translations.ts
index 9495f6a3c..070869e83 100644
--- a/packages/plugins/@nocobase/plugin-localization-management/src/server/collections/localization-translations.ts
+++ b/packages/plugins/@nocobase/plugin-localization-management/src/server/collections/localization-translations.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
namespace: 'localization.localization',
diff --git a/packages/plugins/@nocobase/plugin-localization-management/src/server/migrations/20230706200900-roles-add-translation.ts b/packages/plugins/@nocobase/plugin-localization-management/src/server/migrations/20230706200900-roles-add-translation.ts
index cd8d6a599..80faeb7a8 100644
--- a/packages/plugins/@nocobase/plugin-localization-management/src/server/migrations/20230706200900-roles-add-translation.ts
+++ b/packages/plugins/@nocobase/plugin-localization-management/src/server/migrations/20230706200900-roles-add-translation.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
export default class AddTranslationToRoleTitleMigration extends Migration {
appVersion = '<0.11.1-alpha.1';
diff --git a/packages/plugins/@nocobase/plugin-localization-management/src/server/migrations/20231206161851-fix-module.ts b/packages/plugins/@nocobase/plugin-localization-management/src/server/migrations/20231206161851-fix-module.ts
index 8e1aff81e..ae9e6c0f8 100644
--- a/packages/plugins/@nocobase/plugin-localization-management/src/server/migrations/20231206161851-fix-module.ts
+++ b/packages/plugins/@nocobase/plugin-localization-management/src/server/migrations/20231206161851-fix-module.ts
@@ -1,5 +1,5 @@
-import { Op } from '@nocobase/database';
-import { Migration } from '@nocobase/server';
+import { Op } from '@tachybase/database';
+import { Migration } from '@tachybase/server';
import { getTextsFromDB, getTextsFromMenu } from '../actions/localization';
import { NAMESPACE_COLLECTIONS, NAMESPACE_MENUS } from '../constans';
diff --git a/packages/plugins/@nocobase/plugin-localization-management/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-localization-management/src/server/plugin.ts
index 8e4adafe7..37366e31c 100644
--- a/packages/plugins/@nocobase/plugin-localization-management/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-localization-management/src/server/plugin.ts
@@ -1,6 +1,6 @@
-import { Model } from '@nocobase/database';
+import { Model } from '@tachybase/database';
import { UiSchemaStoragePlugin } from '@nocobase/plugin-ui-schema-storage';
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { InstallOptions, Plugin } from '@tachybase/server';
import deepmerge from 'deepmerge';
import { resolve } from 'path';
import localization from './actions/localization';
diff --git a/packages/plugins/@nocobase/plugin-localization-management/src/server/resources.ts b/packages/plugins/@nocobase/plugin-localization-management/src/server/resources.ts
index 7304277e6..4e7caf9e3 100644
--- a/packages/plugins/@nocobase/plugin-localization-management/src/server/resources.ts
+++ b/packages/plugins/@nocobase/plugin-localization-management/src/server/resources.ts
@@ -1,5 +1,5 @@
-import { Cache } from '@nocobase/cache';
-import { Database, Transaction } from '@nocobase/database';
+import { Cache } from '@tachybase/cache';
+import { Database, Transaction } from '@tachybase/database';
export default class Resources {
cache: Cache;
diff --git a/packages/plugins/@nocobase/plugin-logger/package.json b/packages/plugins/@nocobase/plugin-logger/package.json
index fb6a4120f..1d4033eb0 100644
--- a/packages/plugins/@nocobase/plugin-logger/package.json
+++ b/packages/plugins/@nocobase/plugin-logger/package.json
@@ -18,11 +18,11 @@
"tar-fs": "^3.0.4"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/logger": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/logger": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*"
},
"description.zh-CN": "服务端日志，主要包括接口请求日志和系统运行日志，并支持打包和下载日志文件。",
"displayName.zh-CN": "日志",
diff --git a/packages/plugins/@nocobase/plugin-logger/src/client/LogsDownloader.tsx b/packages/plugins/@nocobase/plugin-logger/src/client/LogsDownloader.tsx
index a91c9718a..cd0c08814 100644
--- a/packages/plugins/@nocobase/plugin-logger/src/client/LogsDownloader.tsx
+++ b/packages/plugins/@nocobase/plugin-logger/src/client/LogsDownloader.tsx
@@ -1,4 +1,4 @@
-import { useAPIClient, useRequest } from '@nocobase/client';
+import { useAPIClient, useRequest } from '@tachybase/client';
import React, { useCallback, useMemo } from 'react';
import { Tree, Card, Alert, Typography, Input, Button, theme, Empty } from 'antd';
import type { DataNode } from 'antd/lib/tree';
diff --git a/packages/plugins/@nocobase/plugin-logger/src/client/index.tsx b/packages/plugins/@nocobase/plugin-logger/src/client/index.tsx
index 67881a11d..1bf074bd8 100644
--- a/packages/plugins/@nocobase/plugin-logger/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-logger/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import { lang } from './locale';
import { LogsDownloader } from './LogsDownloader';
diff --git a/packages/plugins/@nocobase/plugin-logger/src/client/locale/index.ts b/packages/plugins/@nocobase/plugin-logger/src/client/locale/index.ts
index cf7e7243b..665155df6 100644
--- a/packages/plugins/@nocobase/plugin-logger/src/client/locale/index.ts
+++ b/packages/plugins/@nocobase/plugin-logger/src/client/locale/index.ts
@@ -1,4 +1,4 @@
-import { i18n } from '@nocobase/client';
+import { i18n } from '@tachybase/client';
import { useTranslation } from 'react-i18next';
export const NAMESPACE = 'logger';
diff --git a/packages/plugins/@nocobase/plugin-logger/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-logger/src/server/plugin.ts
index a84918214..6d156409c 100644
--- a/packages/plugins/@nocobase/plugin-logger/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-logger/src/server/plugin.ts
@@ -1,4 +1,4 @@
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { InstallOptions, Plugin } from '@tachybase/server';
import logger from './resourcer/logger';
export class PluginLoggerServer extends Plugin {
diff --git a/packages/plugins/@nocobase/plugin-logger/src/server/resourcer/logger.ts b/packages/plugins/@nocobase/plugin-logger/src/server/resourcer/logger.ts
index cf1eea23d..06d024924 100644
--- a/packages/plugins/@nocobase/plugin-logger/src/server/resourcer/logger.ts
+++ b/packages/plugins/@nocobase/plugin-logger/src/server/resourcer/logger.ts
@@ -1,5 +1,5 @@
-import { Context, Next } from '@nocobase/actions';
-import { getLoggerFilePath } from '@nocobase/logger';
+import { Context, Next } from '@tachybase/actions';
+import { getLoggerFilePath } from '@tachybase/logger';
import { readdir } from 'fs/promises';
import { join } from 'path';
import stream from 'stream';
diff --git a/packages/plugins/@nocobase/plugin-map/package.json b/packages/plugins/@nocobase/plugin-map/package.json
index bb7a9760c..156206210 100644
--- a/packages/plugins/@nocobase/plugin-map/package.json
+++ b/packages/plugins/@nocobase/plugin-map/package.json
@@ -28,12 +28,12 @@
"react-router-dom": "^6.11.2"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "地图区块，支持高德地图和 Google 地图，你也可以扩展更多地图类型。",
"displayName.zh-CN": "区块：地图",
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/block/MapActionInitializers.tsx b/packages/plugins/@nocobase/plugin-map/src/client/block/MapActionInitializers.tsx
index 16e645e56..44dffd138 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/block/MapActionInitializers.tsx
+++ b/packages/plugins/@nocobase/plugin-map/src/client/block/MapActionInitializers.tsx
@@ -1,4 +1,4 @@
-import { CompatibleSchemaInitializer, useCollection_deprecated } from '@nocobase/client';
+import { CompatibleSchemaInitializer, useCollection_deprecated } from '@tachybase/client';
/**
* @deprecated
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlock.Settings.tsx b/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlock.Settings.tsx
index c4802480d..789142c1a 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlock.Settings.tsx
+++ b/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlock.Settings.tsx
@@ -18,7 +18,7 @@ import {
useCollectionManager_deprecated,
setDataLoadingModeSettingsItem,
useDataLoadingMode,
-} from '@nocobase/client';
+} from '@tachybase/client';
import lodash from 'lodash';
import { useMapTranslation } from '../locale';
import { useMapBlockContext } from './MapBlockProvider';
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlock.tsx b/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlock.tsx
index 8fdae6c83..f2b81fcc5 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlock.tsx
+++ b/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlock.tsx
@@ -3,7 +3,7 @@ import {
useCollectionManager_deprecated,
useProps,
withDynamicSchemaProps,
-} from '@nocobase/client';
+} from '@tachybase/client';
import React, { useMemo } from 'react';
import { MapBlockComponent } from '../components';
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlockDesigner.tsx b/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlockDesigner.tsx
index f1157b94e..8b189bbd6 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlockDesigner.tsx
+++ b/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlockDesigner.tsx
@@ -1,4 +1,4 @@
-import { GeneralSchemaDesigner, useCollection, useSchemaTemplate } from '@nocobase/client';
+import { GeneralSchemaDesigner, useCollection, useSchemaTemplate } from '@tachybase/client';
import React from 'react';
export const MapBlockDesigner = () => {
const { name, title } = useCollection();
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlockInitializer.tsx b/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlockInitializer.tsx
index 670e04992..b6b1fbca0 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlockInitializer.tsx
+++ b/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlockInitializer.tsx
@@ -10,7 +10,7 @@ import {
useGlobalTheme,
useSchemaInitializer,
useSchemaInitializerItem,
-} from '@nocobase/client';
+} from '@tachybase/client';
import React, { useContext } from 'react';
import { useMapTranslation } from '../locale';
import { findNestedOption } from './utils';
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlockProvider.tsx b/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlockProvider.tsx
index 6678eb68d..690a0cf7e 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlockProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-map/src/client/block/MapBlockProvider.tsx
@@ -1,5 +1,5 @@
import { useField, useFieldSchema } from '@tachybase/schema';
-import { BlockProvider, FixedBlockWrapper, SchemaComponentOptions, useBlockRequestContext } from '@nocobase/client';
+import { BlockProvider, FixedBlockWrapper, SchemaComponentOptions, useBlockRequestContext } from '@tachybase/client';
import React, { createContext, useContext, useState } from 'react';
export const MapBlockContext = createContext({});
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/block/index.tsx b/packages/plugins/@nocobase/plugin-map/src/client/block/index.tsx
index 250c32ccf..f9819977a 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/block/index.tsx
+++ b/packages/plugins/@nocobase/plugin-map/src/client/block/index.tsx
@@ -1,4 +1,4 @@
-import { SchemaComponentOptions } from '@nocobase/client';
+import { SchemaComponentOptions } from '@tachybase/client';
import React from 'react';
import { MapBlock } from './MapBlock';
import { MapBlockDesigner } from './MapBlockDesigner';
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Block.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Block.tsx
index f3380d56e..b185500b3 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Block.tsx
+++ b/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Block.tsx
@@ -10,7 +10,7 @@ import {
useFilterAPI,
useCollectionParentRecordData,
useProps,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { useMemoizedFn } from 'ahooks';
import { Button, Space } from 'antd';
import React, { useEffect, useMemo, useRef, useState } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Map.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Map.tsx
index 33b1b2618..26c8fc1bd 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Map.tsx
+++ b/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Map.tsx
@@ -2,7 +2,7 @@ import AMapLoader from '@amap/amap-jsapi-loader';
import '@amap/amap-jsapi-types';
import { SyncOutlined } from '@ant-design/icons';
import { useFieldSchema } from '@tachybase/schema';
-import { css, useApp, useCollection_deprecated } from '@nocobase/client';
+import { css, useApp, useCollection_deprecated } from '@tachybase/client';
import { useMemoizedFn } from 'ahooks';
import { Alert, App, Button, Spin } from 'antd';
import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Search.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Search.tsx
index b063f4657..3f99eb72d 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Search.tsx
+++ b/packages/plugins/@nocobase/plugin-map/src/client/components/AMap/Search.tsx
@@ -1,4 +1,4 @@
-import { css } from '@nocobase/client';
+import { css } from '@tachybase/client';
import { useDebounceFn } from 'ahooks';
import { message, Select } from 'antd';
import React, { useEffect, useRef, useState } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/Configuration.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/Configuration.tsx
index 6e5f868ec..551a52693 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/components/Configuration.tsx
+++ b/packages/plugins/@nocobase/plugin-map/src/client/components/Configuration.tsx
@@ -1,4 +1,4 @@
-import { useAPIClient, useCompile } from '@nocobase/client';
+import { useAPIClient, useCompile } from '@tachybase/client';
import { useBoolean } from 'ahooks';
import { Button, Card, Form, Input, Tabs, message } from 'antd';
import React, { useEffect, useMemo } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/Designer.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/Designer.tsx
index aafa890a1..272be8b03 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/components/Designer.tsx
+++ b/packages/plugins/@nocobase/plugin-map/src/client/components/Designer.tsx
@@ -11,7 +11,7 @@ import {
useCollectionManager_deprecated,
useDesignable,
useFormBlockContext,
-} from '@nocobase/client';
+} from '@tachybase/client';
import lodash from 'lodash';
import React from 'react';
import { useMapTranslation } from '../locale';
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Block.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Block.tsx
index cb68846a6..ac202d058 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Block.tsx
+++ b/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Block.tsx
@@ -10,7 +10,7 @@ import {
useFilterAPI,
useCollectionParentRecordData,
useProps,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { useMemoizedFn } from 'ahooks';
import { Button, Space } from 'antd';
import React, { useEffect, useMemo, useRef, useState } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Map.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Map.tsx
index 8ea00a41f..f06e1b4bb 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Map.tsx
+++ b/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Map.tsx
@@ -1,7 +1,7 @@
import { SyncOutlined } from '@ant-design/icons';
import { useFieldSchema } from '@tachybase/schema';
import { Loader } from '@googlemaps/js-api-loader';
-import { css, useAPIClient, useApp, useCollection_deprecated } from '@nocobase/client';
+import { css, useAPIClient, useApp, useCollection_deprecated } from '@tachybase/client';
import { useMemoizedFn } from 'ahooks';
import { Alert, App, Button, Spin } from 'antd';
import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Search.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Search.tsx
index 28edced25..bb09a7d2c 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Search.tsx
+++ b/packages/plugins/@nocobase/plugin-map/src/client/components/GoogleMaps/Search.tsx
@@ -1,4 +1,4 @@
-import { css } from '@nocobase/client';
+import { css } from '@tachybase/client';
import { useDebounceFn } from 'ahooks';
import { message, Select } from 'antd';
import React, { useEffect, useRef, useState } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/Map.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/Map.tsx
index 41b3abc32..057ade971 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/components/Map.tsx
+++ b/packages/plugins/@nocobase/plugin-map/src/client/components/Map.tsx
@@ -1,5 +1,5 @@
import { connect, mapReadPretty } from '@tachybase/schema';
-import { css } from '@nocobase/client';
+import { css } from '@tachybase/client';
import React from 'react';
import { AMapComponentProps } from './AMap';
import Designer from './Designer';
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/components/ReadPretty.tsx b/packages/plugins/@nocobase/plugin-map/src/client/components/ReadPretty.tsx
index 2941e91df..d739908f3 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/components/ReadPretty.tsx
+++ b/packages/plugins/@nocobase/plugin-map/src/client/components/ReadPretty.tsx
@@ -1,5 +1,5 @@
import { useFieldSchema, useForm } from '@tachybase/schema';
-import { EllipsisWithTooltip, useCollection_deprecated, useFieldTitle } from '@nocobase/client';
+import { EllipsisWithTooltip, useCollection_deprecated, useFieldTitle } from '@tachybase/client';
import React from 'react';
import { MapComponent } from './MapComponent';
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/fields/schema.ts b/packages/plugins/@nocobase/plugin-map/src/client/fields/schema.ts
index 7feb6ee1d..5e78dacf3 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/fields/schema.ts
+++ b/packages/plugins/@nocobase/plugin-map/src/client/fields/schema.ts
@@ -1,5 +1,5 @@
import { ISchema } from '@tachybase/schema';
-import { CollectionFieldInterface, interfacesProperties } from '@nocobase/client';
+import { CollectionFieldInterface, interfacesProperties } from '@tachybase/client';
import { MapTypes } from '../constants';
import { generateNTemplate } from '../locale';
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/hooks/useMapConfiguration.ts b/packages/plugins/@nocobase/plugin-map/src/client/hooks/useMapConfiguration.ts
index b5784f92e..0ab688bac 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/hooks/useMapConfiguration.ts
+++ b/packages/plugins/@nocobase/plugin-map/src/client/hooks/useMapConfiguration.ts
@@ -1,4 +1,4 @@
-import { useRequest } from '@nocobase/client';
+import { useRequest } from '@tachybase/client';
import { useMemo } from 'react';
export const MapConfigurationResourceKey = 'map-configuration';
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/index.tsx b/packages/plugins/@nocobase/plugin-map/src/client/index.tsx
index 14a8e1a8e..392f43a06 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-map/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { CurrentAppInfoProvider, Plugin, SchemaComponentOptions } from '@nocobase/client';
+import { CurrentAppInfoProvider, Plugin, SchemaComponentOptions } from '@tachybase/client';
import React from 'react';
import { MapBlockOptions } from './block';
import { mapActionInitializers, mapActionInitializers_deprecated } from './block/MapActionInitializers';
diff --git a/packages/plugins/@nocobase/plugin-map/src/client/locale/index.ts b/packages/plugins/@nocobase/plugin-map/src/client/locale/index.ts
index 402124841..24fa2825b 100644
--- a/packages/plugins/@nocobase/plugin-map/src/client/locale/index.ts
+++ b/packages/plugins/@nocobase/plugin-map/src/client/locale/index.ts
@@ -1,4 +1,4 @@
-import { i18n } from '@nocobase/client';
+import { i18n } from '@tachybase/client';
import { useTranslation } from 'react-i18next';
export const NAMESPACE = 'map';
diff --git a/packages/plugins/@nocobase/plugin-map/src/server/__tests__/fields.test.ts b/packages/plugins/@nocobase/plugin-map/src/server/__tests__/fields.test.ts
index 985227d74..95bcb0f87 100644
--- a/packages/plugins/@nocobase/plugin-map/src/server/__tests__/fields.test.ts
+++ b/packages/plugins/@nocobase/plugin-map/src/server/__tests__/fields.test.ts
@@ -1,5 +1,5 @@
-import Database from '@nocobase/database';
-import { mockDatabase } from '@nocobase/test';
+import Database from '@tachybase/database';
+import { mockDatabase } from '@tachybase/test';
import { CircleField, LineStringField, PointField, PolygonField } from '../fields';
const data = {
diff --git a/packages/plugins/@nocobase/plugin-map/src/server/actions/index.ts b/packages/plugins/@nocobase/plugin-map/src/server/actions/index.ts
index 4f78a0b20..adb363f92 100644
--- a/packages/plugins/@nocobase/plugin-map/src/server/actions/index.ts
+++ b/packages/plugins/@nocobase/plugin-map/src/server/actions/index.ts
@@ -1,4 +1,4 @@
-import { Context } from '@nocobase/actions';
+import { Context } from '@tachybase/actions';
import { MapConfigurationCollectionName } from '../constants';
export const getConfiguration = async (ctx: Context, next) => {
diff --git a/packages/plugins/@nocobase/plugin-map/src/server/collections/mapConfiguration.ts b/packages/plugins/@nocobase/plugin-map/src/server/collections/mapConfiguration.ts
index a9fc64a08..d1e3cffcb 100644
--- a/packages/plugins/@nocobase/plugin-map/src/server/collections/mapConfiguration.ts
+++ b/packages/plugins/@nocobase/plugin-map/src/server/collections/mapConfiguration.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
import { MapConfigurationCollectionName } from '../constants';
export default defineCollection({
diff --git a/packages/plugins/@nocobase/plugin-map/src/server/fields/circle.ts b/packages/plugins/@nocobase/plugin-map/src/server/fields/circle.ts
index 92ccb2aaa..54541d081 100644
--- a/packages/plugins/@nocobase/plugin-map/src/server/fields/circle.ts
+++ b/packages/plugins/@nocobase/plugin-map/src/server/fields/circle.ts
@@ -1,4 +1,4 @@
-import { BaseColumnFieldOptions, DataTypes, Field, FieldContext } from '@nocobase/database';
+import { BaseColumnFieldOptions, DataTypes, Field, FieldContext } from '@tachybase/database';
import { isPg, toValue } from '../helpers';
class Circle extends DataTypes.ABSTRACT {
diff --git a/packages/plugins/@nocobase/plugin-map/src/server/fields/lineString.ts b/packages/plugins/@nocobase/plugin-map/src/server/fields/lineString.ts
index c2439d37f..63ae3228b 100644
--- a/packages/plugins/@nocobase/plugin-map/src/server/fields/lineString.ts
+++ b/packages/plugins/@nocobase/plugin-map/src/server/fields/lineString.ts
@@ -1,4 +1,4 @@
-import { BaseColumnFieldOptions, DataTypes, Field, FieldContext } from '@nocobase/database';
+import { BaseColumnFieldOptions, DataTypes, Field, FieldContext } from '@tachybase/database';
import { isMysql, isPg, joinComma, toValue } from '../helpers';
class LineString extends DataTypes.ABSTRACT {
diff --git a/packages/plugins/@nocobase/plugin-map/src/server/fields/point.ts b/packages/plugins/@nocobase/plugin-map/src/server/fields/point.ts
index 25e42efe8..afa774c9b 100644
--- a/packages/plugins/@nocobase/plugin-map/src/server/fields/point.ts
+++ b/packages/plugins/@nocobase/plugin-map/src/server/fields/point.ts
@@ -1,4 +1,4 @@
-import { BaseColumnFieldOptions, DataTypes, Field, FieldContext } from '@nocobase/database';
+import { BaseColumnFieldOptions, DataTypes, Field, FieldContext } from '@tachybase/database';
import { isMysql, isPg, joinComma, toValue } from '../helpers';
class Point extends DataTypes.ABSTRACT {
diff --git a/packages/plugins/@nocobase/plugin-map/src/server/fields/polygon.ts b/packages/plugins/@nocobase/plugin-map/src/server/fields/polygon.ts
index b72fe536f..5834ae747 100644
--- a/packages/plugins/@nocobase/plugin-map/src/server/fields/polygon.ts
+++ b/packages/plugins/@nocobase/plugin-map/src/server/fields/polygon.ts
@@ -1,4 +1,4 @@
-import { BaseColumnFieldOptions, DataTypes, Field, FieldContext } from '@nocobase/database';
+import { BaseColumnFieldOptions, DataTypes, Field, FieldContext } from '@tachybase/database';
import { isMysql, isPg, joinComma, toValue } from '../helpers';
class Polygon extends DataTypes.ABSTRACT {
diff --git a/packages/plugins/@nocobase/plugin-map/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-map/src/server/plugin.ts
index e067b3c6e..46964ba4e 100644
--- a/packages/plugins/@nocobase/plugin-map/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-map/src/server/plugin.ts
@@ -1,4 +1,4 @@
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { InstallOptions, Plugin } from '@tachybase/server';
import path from 'path';
import { getConfiguration, setConfiguration } from './actions';
import { CircleField, LineStringField, PointField, PolygonField } from './fields';
diff --git a/packages/plugins/@nocobase/plugin-map/src/server/value-parsers/index.ts b/packages/plugins/@nocobase/plugin-map/src/server/value-parsers/index.ts
index 920dd8143..db24721b3 100644
--- a/packages/plugins/@nocobase/plugin-map/src/server/value-parsers/index.ts
+++ b/packages/plugins/@nocobase/plugin-map/src/server/value-parsers/index.ts
@@ -1,4 +1,4 @@
-import { BaseValueParser } from '@nocobase/database';
+import { BaseValueParser } from '@tachybase/database';
export class PointValueParser extends BaseValueParser {
async setValue(value) {
diff --git a/packages/plugins/@nocobase/plugin-mock-collections/package.json b/packages/plugins/@nocobase/plugin-mock-collections/package.json
index 54a82ef82..3176e6ad3 100644
--- a/packages/plugins/@nocobase/plugin-mock-collections/package.json
+++ b/packages/plugins/@nocobase/plugin-mock-collections/package.json
@@ -11,12 +11,12 @@
"pg": "^8.11.3"
},
"peerDependencies": {
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
"@nocobase/plugin-error-handler": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"gitHead": "d0b4efe4be55f8c79a98a331d99d9f8cf99021a1"
}
diff --git a/packages/plugins/@nocobase/plugin-mock-collections/src/client/index.ts b/packages/plugins/@nocobase/plugin-mock-collections/src/client/index.ts
index 68b95abd4..193c727f5 100644
--- a/packages/plugins/@nocobase/plugin-mock-collections/src/client/index.ts
+++ b/packages/plugins/@nocobase/plugin-mock-collections/src/client/index.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
export default class PluginMockCollectionsClient extends Plugin {
async load() {}
diff --git a/packages/plugins/@nocobase/plugin-mock-collections/src/server/field-interfaces/association.ts b/packages/plugins/@nocobase/plugin-mock-collections/src/server/field-interfaces/association.ts
index 423444bd9..466cae611 100644
--- a/packages/plugins/@nocobase/plugin-mock-collections/src/server/field-interfaces/association.ts
+++ b/packages/plugins/@nocobase/plugin-mock-collections/src/server/field-interfaces/association.ts
@@ -1,5 +1,5 @@
import { faker } from '@faker-js/faker';
-import { uid } from '@nocobase/utils';
+import { uid } from '@tachybase/utils';
function reverseFieldHandle(defaults, { target, reverseField }) {
if (!reverseField) {
diff --git a/packages/plugins/@nocobase/plugin-mock-collections/src/server/field-interfaces/attachment.ts b/packages/plugins/@nocobase/plugin-mock-collections/src/server/field-interfaces/attachment.ts
index 6f23d0fb1..ef28bd37e 100644
--- a/packages/plugins/@nocobase/plugin-mock-collections/src/server/field-interfaces/attachment.ts
+++ b/packages/plugins/@nocobase/plugin-mock-collections/src/server/field-interfaces/attachment.ts
@@ -1,5 +1,5 @@
import { faker } from '@faker-js/faker';
-import { uid } from '@nocobase/utils';
+import { uid } from '@tachybase/utils';
import _ from 'lodash';
export function mockAttachment() {
diff --git a/packages/plugins/@nocobase/plugin-mock-collections/src/server/field-interfaces/chinaRegion.ts b/packages/plugins/@nocobase/plugin-mock-collections/src/server/field-interfaces/chinaRegion.ts
index 85ac97324..b5b83e4b8 100644
--- a/packages/plugins/@nocobase/plugin-mock-collections/src/server/field-interfaces/chinaRegion.ts
+++ b/packages/plugins/@nocobase/plugin-mock-collections/src/server/field-interfaces/chinaRegion.ts
@@ -1,4 +1,4 @@
-import { uid } from '@nocobase/utils';
+import { uid } from '@tachybase/utils';
export const chinaRegion = {
options: (options) => ({
diff --git a/packages/plugins/@nocobase/plugin-mock-collections/src/server/field-interfaces/email.ts b/packages/plugins/@nocobase/plugin-mock-collections/src/server/field-interfaces/email.ts
index f293994c3..b68256519 100644
--- a/packages/plugins/@nocobase/plugin-mock-collections/src/server/field-interfaces/email.ts
+++ b/packages/plugins/@nocobase/plugin-mock-collections/src/server/field-interfaces/email.ts
@@ -1,5 +1,5 @@
import { faker } from '@faker-js/faker';
-import { uid } from '@nocobase/utils';
+import { uid } from '@tachybase/utils';
export const email = {
options: () => ({
diff --git a/packages/plugins/@nocobase/plugin-mock-collections/src/server/field-interfaces/time.ts b/packages/plugins/@nocobase/plugin-mock-collections/src/server/field-interfaces/time.ts
index 2b0b99950..3de376ed8 100644
--- a/packages/plugins/@nocobase/plugin-mock-collections/src/server/field-interfaces/time.ts
+++ b/packages/plugins/@nocobase/plugin-mock-collections/src/server/field-interfaces/time.ts
@@ -1,5 +1,5 @@
import { faker } from '@faker-js/faker';
-import { dayjs } from '@nocobase/utils';
+import { dayjs } from '@tachybase/utils';
export const time = {
options: () => ({
diff --git a/packages/plugins/@nocobase/plugin-mock-collections/src/server/index.ts b/packages/plugins/@nocobase/plugin-mock-collections/src/server/index.ts
index 597cda6f1..4800fe360 100644
--- a/packages/plugins/@nocobase/plugin-mock-collections/src/server/index.ts
+++ b/packages/plugins/@nocobase/plugin-mock-collections/src/server/index.ts
@@ -1,7 +1,7 @@
-import Database, { Collection, Repository } from '@nocobase/database';
+import Database, { Collection, Repository } from '@tachybase/database';
import { CollectionRepository } from '@nocobase/plugin-collection-manager';
-import { InstallOptions, Plugin } from '@nocobase/server';
-import { merge, uid } from '@nocobase/utils';
+import { InstallOptions, Plugin } from '@tachybase/server';
+import { merge, uid } from '@tachybase/utils';
import _ from 'lodash';
import collectionTemplates from './collection-templates';
import * as fieldInterfaces from './field-interfaces';
diff --git a/packages/plugins/@nocobase/plugin-multi-app-manager/package.json b/packages/plugins/@nocobase/plugin-multi-app-manager/package.json
index deb011f14..5ec2f717b 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-manager/package.json
+++ b/packages/plugins/@nocobase/plugin-multi-app-manager/package.json
@@ -22,11 +22,11 @@
"react-router-dom": "^6.11.2"
},
"peerDependencies": {
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "无需单独部署即可动态创建多个应用。",
"displayName.zh-CN": "多应用管理器",
diff --git a/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/AppManager.tsx b/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/AppManager.tsx
index e614705c3..46a8bee16 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/AppManager.tsx
+++ b/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/AppManager.tsx
@@ -1,4 +1,4 @@
-import { SchemaComponent, useApp, useRecord } from '@nocobase/client';
+import { SchemaComponent, useApp, useRecord } from '@tachybase/client';
import { Card } from 'antd';
import React from 'react';
import { schema } from './settings/schemas/applications';
diff --git a/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/AppNameInput.tsx b/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/AppNameInput.tsx
index fe49f0ea1..29ebf47ef 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/AppNameInput.tsx
+++ b/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/AppNameInput.tsx
@@ -1,5 +1,5 @@
import { connect, mapReadPretty } from '@tachybase/schema';
-import { useApp } from '@nocobase/client';
+import { useApp } from '@tachybase/client';
import { Input as AntdInput } from 'antd';
import React from 'react';
diff --git a/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/MultiAppManagerProvider.tsx b/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/MultiAppManagerProvider.tsx
index 162788b84..d9b99aa9a 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/MultiAppManagerProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/MultiAppManagerProvider.tsx
@@ -1,4 +1,4 @@
-import { Icon, PinnedPluginListProvider, SchemaComponentOptions, useApp, useRequest } from '@nocobase/client';
+import { Icon, PinnedPluginListProvider, SchemaComponentOptions, useApp, useRequest } from '@tachybase/client';
import { Button, Dropdown } from 'antd';
import React from 'react';
import { Link } from 'react-router-dom';
diff --git a/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/Settings.tsx b/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/Settings.tsx
index 87e34371e..02d420a77 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/Settings.tsx
+++ b/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/Settings.tsx
@@ -1,4 +1,4 @@
-import { SchemaComponent } from '@nocobase/client';
+import { SchemaComponent } from '@tachybase/client';
import { Card } from 'antd';
import React from 'react';
diff --git a/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/index.ts b/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/index.ts
index bf4d7694c..c621fad0e 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/index.ts
+++ b/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/index.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import { MultiAppManagerProvider } from './MultiAppManagerProvider';
import { AppManager } from './AppManager';
import { NAMESPACE } from '../locale';
diff --git a/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/settings/schemas/applications.ts b/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/settings/schemas/applications.ts
index 9bad2cade..fc4d992f5 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/settings/schemas/applications.ts
+++ b/packages/plugins/@nocobase/plugin-multi-app-manager/src/client/settings/schemas/applications.ts
@@ -8,7 +8,7 @@ import {
useRequest,
useResourceActionContext,
useResourceContext,
-} from '@nocobase/client';
+} from '@tachybase/client';
import React from 'react';
import { i18nText } from '../../utils';
diff --git a/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/__tests__/gateway.test.ts b/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/__tests__/gateway.test.ts
index 311cab8aa..b3ab13b61 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/__tests__/gateway.test.ts
+++ b/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/__tests__/gateway.test.ts
@@ -1,6 +1,6 @@
-import { AppSupervisor, Gateway } from '@nocobase/server';
-import { MockServer, createMockServer, createWsClient, startServerWithRandomPort, waitSecond } from '@nocobase/test';
-import { uid } from '@nocobase/utils';
+import { AppSupervisor, Gateway } from '@tachybase/server';
+import { MockServer, createMockServer, createWsClient, startServerWithRandomPort, waitSecond } from '@tachybase/test';
+import { uid } from '@tachybase/utils';
describe('gateway with multiple apps', () => {
let app: MockServer;
diff --git a/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/__tests__/mock-get-schema.test.ts b/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/__tests__/mock-get-schema.test.ts
index 6c6e51dbf..15d496be4 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/__tests__/mock-get-schema.test.ts
+++ b/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/__tests__/mock-get-schema.test.ts
@@ -1,6 +1,6 @@
-import { AppSupervisor, Plugin, PluginManager } from '@nocobase/server';
-import { createMockServer } from '@nocobase/test';
-import { uid } from '@nocobase/utils';
+import { AppSupervisor, Plugin, PluginManager } from '@tachybase/server';
+import { createMockServer } from '@tachybase/test';
+import { uid } from '@tachybase/utils';
import { vi } from 'vitest';
describe('test with start', () => {
diff --git a/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/__tests__/multiple-apps.test.ts b/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/__tests__/multiple-apps.test.ts
index d18ef82de..252f2a887 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/__tests__/multiple-apps.test.ts
+++ b/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/__tests__/multiple-apps.test.ts
@@ -1,7 +1,7 @@
-import { Database } from '@nocobase/database';
-import { AppSupervisor, Gateway } from '@nocobase/server';
-import { createMockServer, MockServer } from '@nocobase/test';
-import { uid } from '@nocobase/utils';
+import { Database } from '@tachybase/database';
+import { AppSupervisor, Gateway } from '@tachybase/server';
+import { createMockServer, MockServer } from '@tachybase/test';
+import { uid } from '@tachybase/utils';
import { vi } from 'vitest';
import { PluginMultiAppManager } from '../server';
diff --git a/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/collections/applications.ts b/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/collections/applications.ts
index 482175df2..c106bb006 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/collections/applications.ts
+++ b/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/collections/applications.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
dumpRules: {
diff --git a/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/models/application.ts b/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/models/application.ts
index 27dc4983b..ac8120edf 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/models/application.ts
+++ b/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/models/application.ts
@@ -1,7 +1,7 @@
-import { Model, Transactionable } from '@nocobase/database';
-import { Application } from '@nocobase/server';
+import { Model, Transactionable } from '@tachybase/database';
+import { Application } from '@tachybase/server';
import { AppOptionsFactory } from '../server';
-import { merge } from '@nocobase/utils';
+import { merge } from '@tachybase/utils';
export interface registerAppOptions extends Transactionable {
skipInstall?: boolean;
diff --git a/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/server.ts b/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/server.ts
index bd0ad6ede..bf83d68bc 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/server.ts
+++ b/packages/plugins/@nocobase/plugin-multi-app-manager/src/server/server.ts
@@ -1,5 +1,5 @@
-import { Database, IDatabaseOptions, Transactionable } from '@nocobase/database';
-import Application, { AppSupervisor, Gateway, Plugin } from '@nocobase/server';
+import { Database, IDatabaseOptions, Transactionable } from '@tachybase/database';
+import Application, { AppSupervisor, Gateway, Plugin } from '@tachybase/server';
import lodash from 'lodash';
import path from 'path';
import { ApplicationModel } from '../server';
diff --git a/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json b/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json
index cc4b84587..e839dc91c 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json
+++ b/packages/plugins/@nocobase/plugin-multi-app-share-collection/package.json
@@ -15,15 +15,15 @@
"react-i18next": "^11.15.1"
},
"peerDependencies": {
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
"@nocobase/plugin-collection-manager": "workspace:*",
"@nocobase/plugin-error-handler": "workspace:*",
"@nocobase/plugin-multi-app-manager": "workspace:*",
"@nocobase/plugin-users": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "",
"displayName.zh-CN": "多应用数据表共享",
diff --git a/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/client/MultiAppShareCollectionProvider.tsx b/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/client/MultiAppShareCollectionProvider.tsx
index cc3151f6c..326e52755 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/client/MultiAppShareCollectionProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/client/MultiAppShareCollectionProvider.tsx
@@ -1,5 +1,5 @@
import { useForm } from '@tachybase/schema';
-import { useActionContext, useAPIClient, useRecord } from '@nocobase/client';
+import { useActionContext, useAPIClient, useRecord } from '@tachybase/client';
import { tableActionColumnSchema } from '@nocobase/plugin-multi-app-manager/client';
import { message } from 'antd';
import React from 'react';
diff --git a/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/client/TableTransfer.tsx b/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/client/TableTransfer.tsx
index 466df2564..40d79cbf8 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/client/TableTransfer.tsx
+++ b/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/client/TableTransfer.tsx
@@ -1,6 +1,6 @@
import { connect } from '@tachybase/schema';
-import { css, useCollectionManager_deprecated, useRecord, useRequest, useToken } from '@nocobase/client';
-import { CollectionsGraph, lodash } from '@nocobase/utils/client';
+import { css, useCollectionManager_deprecated, useRecord, useRequest, useToken } from '@tachybase/client';
+import { CollectionsGraph, lodash } from '@tachybase/utils/client';
import { App, Col, Input, Row, Select, Spin, Table, Tag } from 'antd';
import React, { useCallback, useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/client/index.tsx b/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/client/index.tsx
index 2763bf264..38e374b42 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import { MultiAppShareCollectionProvider } from './MultiAppShareCollectionProvider';
export class MultiAppShareCollectionPlugin extends Plugin {
diff --git a/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/__tests__/collection-sync.test.ts b/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/__tests__/collection-sync.test.ts
index 1cfdef11b..d0b36d4f7 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/__tests__/collection-sync.test.ts
+++ b/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/__tests__/collection-sync.test.ts
@@ -1,6 +1,6 @@
-import { BelongsToManyRepository, Database } from '@nocobase/database';
-import { AppSupervisor } from '@nocobase/server';
-import { MockServer, createMockServer, isPg } from '@nocobase/test';
+import { BelongsToManyRepository, Database } from '@tachybase/database';
+import { AppSupervisor } from '@tachybase/server';
+import { MockServer, createMockServer, isPg } from '@tachybase/test';
import * as process from 'process';
describe.runIf(isPg())('enable plugin', () => {
diff --git a/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/__tests__/index.ts b/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/__tests__/index.ts
index 979ecb166..f386072f6 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/__tests__/index.ts
+++ b/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/__tests__/index.ts
@@ -1,4 +1,4 @@
-import { createMockServer } from '@nocobase/test';
+import { createMockServer } from '@tachybase/test';
export async function createApp(options = {}) {
const app = await createMockServer({
diff --git a/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/collections/applications.ts b/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/collections/applications.ts
index 69850d567..b64cc125f 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/collections/applications.ts
+++ b/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/collections/applications.ts
@@ -1,4 +1,4 @@
-import { extendCollection } from '@nocobase/database';
+import { extendCollection } from '@tachybase/database';
export default extendCollection({
name: 'applications',
diff --git a/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/collections/collections.ts b/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/collections/collections.ts
index 69413f5ad..941e074c9 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/collections/collections.ts
+++ b/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/collections/collections.ts
@@ -1,4 +1,4 @@
-import { extendCollection } from '@nocobase/database';
+import { extendCollection } from '@tachybase/database';
export default extendCollection({
name: 'collections',
diff --git a/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/migrations/20230319111111-update-apps-collections.ts b/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/migrations/20230319111111-update-apps-collections.ts
index 53cbb03ef..33116e406 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/migrations/20230319111111-update-apps-collections.ts
+++ b/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/migrations/20230319111111-update-apps-collections.ts
@@ -1,5 +1,5 @@
-import { Migration } from '@nocobase/server';
-import { CollectionsGraph } from '@nocobase/utils';
+import { Migration } from '@tachybase/server';
+import { CollectionsGraph } from '@tachybase/utils';
export default class extends Migration {
appVersion = '<0.9.3-alpha.1';
diff --git a/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/plugin.ts
index af5121e17..ec7e1aca8 100644
--- a/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-multi-app-share-collection/src/server/plugin.ts
@@ -1,6 +1,6 @@
-import Database from '@nocobase/database';
+import Database from '@tachybase/database';
import PluginMultiAppManager from '@nocobase/plugin-multi-app-manager';
-import { Application, AppSupervisor, Plugin } from '@nocobase/server';
+import { Application, AppSupervisor, Plugin } from '@tachybase/server';
import lodash from 'lodash';
import { resolve } from 'path';
diff --git a/packages/plugins/@nocobase/plugin-notifications/package.json b/packages/plugins/@nocobase/plugin-notifications/package.json
index b1e4a0566..98a77c562 100644
--- a/packages/plugins/@nocobase/plugin-notifications/package.json
+++ b/packages/plugins/@nocobase/plugin-notifications/package.json
@@ -11,11 +11,11 @@
"nodemailer-mock": "^1.5.11"
},
"peerDependencies": {
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"gitHead": "d0b4efe4be55f8c79a98a331d99d9f8cf99021a1"
}
diff --git a/packages/plugins/@nocobase/plugin-notifications/src/client/index.ts b/packages/plugins/@nocobase/plugin-notifications/src/client/index.ts
index ea8c0651c..c5b072e37 100644
--- a/packages/plugins/@nocobase/plugin-notifications/src/client/index.ts
+++ b/packages/plugins/@nocobase/plugin-notifications/src/client/index.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
class NotificationPlugin extends Plugin {
async load() {}
diff --git a/packages/plugins/@nocobase/plugin-notifications/src/server/__tests__/notifications.test.ts b/packages/plugins/@nocobase/plugin-notifications/src/server/__tests__/notifications.test.ts
index f1f532077..fd430290a 100644
--- a/packages/plugins/@nocobase/plugin-notifications/src/server/__tests__/notifications.test.ts
+++ b/packages/plugins/@nocobase/plugin-notifications/src/server/__tests__/notifications.test.ts
@@ -1,5 +1,5 @@
-import Database from '@nocobase/database';
-import { createMockServer } from '@nocobase/test';
+import Database from '@tachybase/database';
+import { createMockServer } from '@tachybase/test';
import nodemailerMock from 'nodemailer-mock';
import { Notification, NotificationService } from '../models';
diff --git a/packages/plugins/@nocobase/plugin-notifications/src/server/collections/notification_logs.ts b/packages/plugins/@nocobase/plugin-notifications/src/server/collections/notification_logs.ts
index 6f517f779..89c8f66c7 100644
--- a/packages/plugins/@nocobase/plugin-notifications/src/server/collections/notification_logs.ts
+++ b/packages/plugins/@nocobase/plugin-notifications/src/server/collections/notification_logs.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
import { NotificationLog } from '../models';
export default {
diff --git a/packages/plugins/@nocobase/plugin-notifications/src/server/collections/notification_services.ts b/packages/plugins/@nocobase/plugin-notifications/src/server/collections/notification_services.ts
index d7fbedd76..678fdaa03 100644
--- a/packages/plugins/@nocobase/plugin-notifications/src/server/collections/notification_services.ts
+++ b/packages/plugins/@nocobase/plugin-notifications/src/server/collections/notification_services.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
import { NotificationService } from '../models';
export default {
diff --git a/packages/plugins/@nocobase/plugin-notifications/src/server/collections/notifications.ts b/packages/plugins/@nocobase/plugin-notifications/src/server/collections/notifications.ts
index b218c013c..fba847e96 100644
--- a/packages/plugins/@nocobase/plugin-notifications/src/server/collections/notifications.ts
+++ b/packages/plugins/@nocobase/plugin-notifications/src/server/collections/notifications.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
import { Notification } from '../models';
export default {
diff --git a/packages/plugins/@nocobase/plugin-notifications/src/server/models/Notification.ts b/packages/plugins/@nocobase/plugin-notifications/src/server/models/Notification.ts
index fe44dfd6a..d82705ae5 100644
--- a/packages/plugins/@nocobase/plugin-notifications/src/server/models/Notification.ts
+++ b/packages/plugins/@nocobase/plugin-notifications/src/server/models/Notification.ts
@@ -1,4 +1,4 @@
-import Database, { Model } from '@nocobase/database';
+import Database, { Model } from '@tachybase/database';
import lodash from 'lodash';
import { NotificationService } from './NotificationService';
diff --git a/packages/plugins/@nocobase/plugin-notifications/src/server/models/NotificationLog.ts b/packages/plugins/@nocobase/plugin-notifications/src/server/models/NotificationLog.ts
index 8e845dbc3..601ac1876 100644
--- a/packages/plugins/@nocobase/plugin-notifications/src/server/models/NotificationLog.ts
+++ b/packages/plugins/@nocobase/plugin-notifications/src/server/models/NotificationLog.ts
@@ -1,3 +1,3 @@
-import { Model } from '@nocobase/database';
+import { Model } from '@tachybase/database';
export class NotificationLog extends Model {}
diff --git a/packages/plugins/@nocobase/plugin-notifications/src/server/models/NotificationService.ts b/packages/plugins/@nocobase/plugin-notifications/src/server/models/NotificationService.ts
index db4de94ef..a2e8fb7ff 100644
--- a/packages/plugins/@nocobase/plugin-notifications/src/server/models/NotificationService.ts
+++ b/packages/plugins/@nocobase/plugin-notifications/src/server/models/NotificationService.ts
@@ -1,4 +1,4 @@
-import { Model } from '@nocobase/database';
+import { Model } from '@tachybase/database';
import nodemailer from 'nodemailer';
export class NotificationService extends Model {
diff --git a/packages/plugins/@nocobase/plugin-notifications/src/server/server.ts b/packages/plugins/@nocobase/plugin-notifications/src/server/server.ts
index 03a5943c4..2fc47b437 100644
--- a/packages/plugins/@nocobase/plugin-notifications/src/server/server.ts
+++ b/packages/plugins/@nocobase/plugin-notifications/src/server/server.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/server';
+import { Plugin } from '@tachybase/server';
import path from 'path';
export default class PluginNotifications extends Plugin {
diff --git a/packages/plugins/@nocobase/plugin-oidc/package.json b/packages/plugins/@nocobase/plugin-oidc/package.json
index 7281c8531..8754edc17 100644
--- a/packages/plugins/@nocobase/plugin-oidc/package.json
+++ b/packages/plugins/@nocobase/plugin-oidc/package.json
@@ -22,13 +22,13 @@
"react-router-dom": "^6.11.2"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/auth": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
"@nocobase/plugin-auth": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/auth": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*"
},
"description.zh-CN": "通过 OIDC (OpenID Connect) 协议认证身份。",
"displayName.zh-CN": "认证：OIDC",
diff --git a/packages/plugins/@nocobase/plugin-oidc/src/client/OIDCButton.tsx b/packages/plugins/@nocobase/plugin-oidc/src/client/OIDCButton.tsx
index 1246d51ac..df3223844 100644
--- a/packages/plugins/@nocobase/plugin-oidc/src/client/OIDCButton.tsx
+++ b/packages/plugins/@nocobase/plugin-oidc/src/client/OIDCButton.tsx
@@ -1,5 +1,5 @@
import { LoginOutlined } from '@ant-design/icons';
-import { css, useAPIClient } from '@nocobase/client';
+import { css, useAPIClient } from '@tachybase/client';
import { Button, Space, message } from 'antd';
import React, { useEffect } from 'react';
import { useOidcTranslation } from './locale';
diff --git a/packages/plugins/@nocobase/plugin-oidc/src/client/Options.tsx b/packages/plugins/@nocobase/plugin-oidc/src/client/Options.tsx
index 39596be4d..dc8407185 100644
--- a/packages/plugins/@nocobase/plugin-oidc/src/client/Options.tsx
+++ b/packages/plugins/@nocobase/plugin-oidc/src/client/Options.tsx
@@ -1,7 +1,7 @@
import { CopyOutlined } from '@ant-design/icons';
import { ArrayItems, FormTab } from '@tachybase/components';
import { observer } from '@tachybase/schema';
-import { FormItem, Input, SchemaComponent, useApp } from '@nocobase/client';
+import { FormItem, Input, SchemaComponent, useApp } from '@tachybase/client';
import { Card, Space, message } from 'antd';
import React, { useMemo } from 'react';
import { lang, useOidcTranslation } from './locale';
diff --git a/packages/plugins/@nocobase/plugin-oidc/src/client/index.tsx b/packages/plugins/@nocobase/plugin-oidc/src/client/index.tsx
index ec108556b..9ce306b3f 100644
--- a/packages/plugins/@nocobase/plugin-oidc/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-oidc/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import AuthPlugin from '@nocobase/plugin-auth/client';
import { authType } from '../constants';
import { OIDCButton } from './OIDCButton';
diff --git a/packages/plugins/@nocobase/plugin-oidc/src/client/locale/index.ts b/packages/plugins/@nocobase/plugin-oidc/src/client/locale/index.ts
index 4492ea69f..dc7d77e03 100644
--- a/packages/plugins/@nocobase/plugin-oidc/src/client/locale/index.ts
+++ b/packages/plugins/@nocobase/plugin-oidc/src/client/locale/index.ts
@@ -1,4 +1,4 @@
-import { i18n } from '@nocobase/client';
+import { i18n } from '@tachybase/client';
import { useTranslation } from 'react-i18next';
export const NAMESPACE = 'oidc';
diff --git a/packages/plugins/@nocobase/plugin-oidc/src/server/__tests__/oidc.test.ts b/packages/plugins/@nocobase/plugin-oidc/src/server/__tests__/oidc.test.ts
index 3fec2e75b..ee2f0bebd 100644
--- a/packages/plugins/@nocobase/plugin-oidc/src/server/__tests__/oidc.test.ts
+++ b/packages/plugins/@nocobase/plugin-oidc/src/server/__tests__/oidc.test.ts
@@ -1,5 +1,5 @@
-import { Database } from '@nocobase/database';
-import { MockServer, createMockServer } from '@nocobase/test';
+import { Database } from '@tachybase/database';
+import { MockServer, createMockServer } from '@tachybase/test';
import { vi } from 'vitest';
import { authType } from '../../constants';
import { OIDCAuth } from '../oidc-auth';
diff --git a/packages/plugins/@nocobase/plugin-oidc/src/server/actions/getAuthUrl.ts b/packages/plugins/@nocobase/plugin-oidc/src/server/actions/getAuthUrl.ts
index c96f6e25c..32037e873 100644
--- a/packages/plugins/@nocobase/plugin-oidc/src/server/actions/getAuthUrl.ts
+++ b/packages/plugins/@nocobase/plugin-oidc/src/server/actions/getAuthUrl.ts
@@ -1,4 +1,4 @@
-import { Context, Next } from '@nocobase/actions';
+import { Context, Next } from '@tachybase/actions';
import { OIDCAuth } from '../oidc-auth';
import { nanoid } from 'nanoid';
import { cookieName } from '../../constants';
diff --git a/packages/plugins/@nocobase/plugin-oidc/src/server/actions/redirect.ts b/packages/plugins/@nocobase/plugin-oidc/src/server/actions/redirect.ts
index 40eb78767..52934c671 100644
--- a/packages/plugins/@nocobase/plugin-oidc/src/server/actions/redirect.ts
+++ b/packages/plugins/@nocobase/plugin-oidc/src/server/actions/redirect.ts
@@ -1,5 +1,5 @@
-import { Context, Next } from '@nocobase/actions';
-import { AppSupervisor } from '@nocobase/server';
+import { Context, Next } from '@tachybase/actions';
+import { AppSupervisor } from '@tachybase/server';
import { OIDCAuth } from '../oidc-auth';
export const redirect = async (ctx: Context, next: Next) => {
diff --git a/packages/plugins/@nocobase/plugin-oidc/src/server/migrations/20231007124508-update-autosignup.ts b/packages/plugins/@nocobase/plugin-oidc/src/server/migrations/20231007124508-update-autosignup.ts
index 2590ff746..aafea6fe5 100644
--- a/packages/plugins/@nocobase/plugin-oidc/src/server/migrations/20231007124508-update-autosignup.ts
+++ b/packages/plugins/@nocobase/plugin-oidc/src/server/migrations/20231007124508-update-autosignup.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
import { authType } from '../../constants';
export default class UpdateAutoSignupMigration extends Migration {
diff --git a/packages/plugins/@nocobase/plugin-oidc/src/server/oidc-auth.ts b/packages/plugins/@nocobase/plugin-oidc/src/server/oidc-auth.ts
index 180aa4868..bb428273e 100644
--- a/packages/plugins/@nocobase/plugin-oidc/src/server/oidc-auth.ts
+++ b/packages/plugins/@nocobase/plugin-oidc/src/server/oidc-auth.ts
@@ -1,8 +1,8 @@
-import { AuthConfig, BaseAuth } from '@nocobase/auth';
+import { AuthConfig, BaseAuth } from '@tachybase/auth';
import { AuthModel } from '@nocobase/plugin-auth';
import { Issuer } from 'openid-client';
import { cookieName } from '../constants';
-export { Model } from '@nocobase/database';
+export { Model } from '@tachybase/database';
export class OIDCAuth extends BaseAuth {
constructor(config: AuthConfig) {
diff --git a/packages/plugins/@nocobase/plugin-oidc/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-oidc/src/server/plugin.ts
index 4d4dba980..fd07caa72 100644
--- a/packages/plugins/@nocobase/plugin-oidc/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-oidc/src/server/plugin.ts
@@ -1,4 +1,4 @@
-import { Gateway, InstallOptions, Plugin } from '@nocobase/server';
+import { Gateway, InstallOptions, Plugin } from '@tachybase/server';
import { getAuthUrl } from './actions/getAuthUrl';
import { redirect } from './actions/redirect';
import { authType } from '../constants';
diff --git a/packages/plugins/@nocobase/plugin-saml/README.zh-CN.md b/packages/plugins/@nocobase/plugin-saml/README.zh-CN.md
index 1fa35a61e..9994cde94 100644
--- a/packages/plugins/@nocobase/plugin-saml/README.zh-CN.md
+++ b/packages/plugins/@nocobase/plugin-saml/README.zh-CN.md
@@ -4,7 +4,7 @@
## 依赖
-- `@nocobase/auth` 认证插件，提供认证相关功能，表、模型、函数复用等。
+- `@tachybase/auth` 认证插件，提供认证相关功能，表、模型、函数复用等。
## 使用方法
@@ -52,4 +52,4 @@
`nameID`为SAML协议携带，无需映射，将作为用户唯一标识保存。
-在有email或nameID为email的情况下，登录时将尝试匹配已有用户，否则创建新用户。
\ No newline at end of file
+在有email或nameID为email的情况下，登录时将尝试匹配已有用户，否则创建新用户。
diff --git a/packages/plugins/@nocobase/plugin-saml/package.json b/packages/plugins/@nocobase/plugin-saml/package.json
index bbdf5d93b..867fbdfe5 100644
--- a/packages/plugins/@nocobase/plugin-saml/package.json
+++ b/packages/plugins/@nocobase/plugin-saml/package.json
@@ -19,14 +19,14 @@
"react-router-dom": "^6.11.2"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/auth": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
"@nocobase/plugin-auth": "workspace:*",
- "@nocobase/sdk": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/auth": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/sdk": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*"
},
"description.zh-CN": "通过 SAML 2.0 协议认证身份。",
"displayName.zh-CN": "认证：SAML 2.0",
diff --git a/packages/plugins/@nocobase/plugin-saml/src/client/Options.tsx b/packages/plugins/@nocobase/plugin-saml/src/client/Options.tsx
index 111504837..9bb0ca2ed 100644
--- a/packages/plugins/@nocobase/plugin-saml/src/client/Options.tsx
+++ b/packages/plugins/@nocobase/plugin-saml/src/client/Options.tsx
@@ -1,7 +1,7 @@
import { CopyOutlined } from '@ant-design/icons';
import { observer, useForm } from '@tachybase/schema';
-import { FormItem, Input, SchemaComponent, useApp, useRecord } from '@nocobase/client';
-import { getSubAppName } from '@nocobase/sdk';
+import { FormItem, Input, SchemaComponent, useApp, useRecord } from '@tachybase/client';
+import { getSubAppName } from '@tachybase/sdk';
import { Card, message } from 'antd';
import React, { useMemo } from 'react';
import { lang, useSamlTranslation } from './locale';
diff --git a/packages/plugins/@nocobase/plugin-saml/src/client/SAMLButton.tsx b/packages/plugins/@nocobase/plugin-saml/src/client/SAMLButton.tsx
index ad88a2e6a..07738860f 100644
--- a/packages/plugins/@nocobase/plugin-saml/src/client/SAMLButton.tsx
+++ b/packages/plugins/@nocobase/plugin-saml/src/client/SAMLButton.tsx
@@ -1,5 +1,5 @@
import { LoginOutlined } from '@ant-design/icons';
-import { css, useAPIClient } from '@nocobase/client';
+import { css, useAPIClient } from '@tachybase/client';
import { Button, Space, message } from 'antd';
import React, { useEffect } from 'react';
import { useSamlTranslation } from './locale';
diff --git a/packages/plugins/@nocobase/plugin-saml/src/client/index.tsx b/packages/plugins/@nocobase/plugin-saml/src/client/index.tsx
index 7aed83a9b..043fec28d 100644
--- a/packages/plugins/@nocobase/plugin-saml/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-saml/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import AuthPlugin from '@nocobase/plugin-auth/client';
import { authType } from '../constants';
import { SAMLButton } from './SAMLButton';
diff --git a/packages/plugins/@nocobase/plugin-saml/src/client/locale/index.ts b/packages/plugins/@nocobase/plugin-saml/src/client/locale/index.ts
index 5b802647b..d9e35926c 100644
--- a/packages/plugins/@nocobase/plugin-saml/src/client/locale/index.ts
+++ b/packages/plugins/@nocobase/plugin-saml/src/client/locale/index.ts
@@ -1,4 +1,4 @@
-import { i18n } from '@nocobase/client';
+import { i18n } from '@tachybase/client';
import { useTranslation } from 'react-i18next';
export const NAMESPACE = 'saml';
diff --git a/packages/plugins/@nocobase/plugin-saml/src/client/schemas/saml.ts b/packages/plugins/@nocobase/plugin-saml/src/client/schemas/saml.ts
index 96f647258..f1ed13506 100644
--- a/packages/plugins/@nocobase/plugin-saml/src/client/schemas/saml.ts
+++ b/packages/plugins/@nocobase/plugin-saml/src/client/schemas/saml.ts
@@ -1,5 +1,5 @@
import { ISchema } from '@tachybase/schema';
-import { useActionContext, useRequest } from '@nocobase/client';
+import { useActionContext, useRequest } from '@tachybase/client';
const collection = {
name: 'samlProviders',
diff --git a/packages/plugins/@nocobase/plugin-saml/src/server/__tests__/saml.test.ts b/packages/plugins/@nocobase/plugin-saml/src/server/__tests__/saml.test.ts
index 8d7c902ab..817c6ca0d 100644
--- a/packages/plugins/@nocobase/plugin-saml/src/server/__tests__/saml.test.ts
+++ b/packages/plugins/@nocobase/plugin-saml/src/server/__tests__/saml.test.ts
@@ -1,5 +1,5 @@
-import { Database } from '@nocobase/database';
-import { MockServer, createMockServer } from '@nocobase/test';
+import { Database } from '@tachybase/database';
+import { MockServer, createMockServer } from '@tachybase/test';
import { SAML } from '@node-saml/node-saml';
import { vi } from 'vitest';
import { authType } from '../../constants';
diff --git a/packages/plugins/@nocobase/plugin-saml/src/server/actions/getAuthUrl.ts b/packages/plugins/@nocobase/plugin-saml/src/server/actions/getAuthUrl.ts
index c3fad8eb3..58935de8b 100644
--- a/packages/plugins/@nocobase/plugin-saml/src/server/actions/getAuthUrl.ts
+++ b/packages/plugins/@nocobase/plugin-saml/src/server/actions/getAuthUrl.ts
@@ -1,4 +1,4 @@
-import { Context, Next } from '@nocobase/actions';
+import { Context, Next } from '@tachybase/actions';
import { SAML } from '@node-saml/node-saml';
import { SAMLAuth } from '../saml-auth';
diff --git a/packages/plugins/@nocobase/plugin-saml/src/server/actions/metadata.ts b/packages/plugins/@nocobase/plugin-saml/src/server/actions/metadata.ts
index 1b4f1662f..a53ea3fa8 100644
--- a/packages/plugins/@nocobase/plugin-saml/src/server/actions/metadata.ts
+++ b/packages/plugins/@nocobase/plugin-saml/src/server/actions/metadata.ts
@@ -1,4 +1,4 @@
-import { Context, Next } from '@nocobase/actions';
+import { Context, Next } from '@tachybase/actions';
import { SAMLAuth } from '../saml-auth';
import { SAML } from '@node-saml/node-saml';
diff --git a/packages/plugins/@nocobase/plugin-saml/src/server/actions/redirect.ts b/packages/plugins/@nocobase/plugin-saml/src/server/actions/redirect.ts
index 8a1573b15..c6f377fc6 100644
--- a/packages/plugins/@nocobase/plugin-saml/src/server/actions/redirect.ts
+++ b/packages/plugins/@nocobase/plugin-saml/src/server/actions/redirect.ts
@@ -1,5 +1,5 @@
-import { Context, Next } from '@nocobase/actions';
-import { AppSupervisor } from '@nocobase/server';
+import { Context, Next } from '@tachybase/actions';
+import { AppSupervisor } from '@tachybase/server';
import { SAMLAuth } from '../saml-auth';
export const redirect = async (ctx: Context, next: Next) => {
diff --git a/packages/plugins/@nocobase/plugin-saml/src/server/migrations/20231008112900-update-autosignup.ts b/packages/plugins/@nocobase/plugin-saml/src/server/migrations/20231008112900-update-autosignup.ts
index 0d05aab40..9c0526a9f 100644
--- a/packages/plugins/@nocobase/plugin-saml/src/server/migrations/20231008112900-update-autosignup.ts
+++ b/packages/plugins/@nocobase/plugin-saml/src/server/migrations/20231008112900-update-autosignup.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
import { authType } from '../../constants';
export default class UpdateAutoSignupMigration extends Migration {
diff --git a/packages/plugins/@nocobase/plugin-saml/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-saml/src/server/plugin.ts
index c33a18e55..45bce4b30 100644
--- a/packages/plugins/@nocobase/plugin-saml/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-saml/src/server/plugin.ts
@@ -1,4 +1,4 @@
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { InstallOptions, Plugin } from '@tachybase/server';
import { getAuthUrl } from './actions/getAuthUrl';
import { metadata } from './actions/metadata';
import { redirect } from './actions/redirect';
diff --git a/packages/plugins/@nocobase/plugin-saml/src/server/saml-auth.ts b/packages/plugins/@nocobase/plugin-saml/src/server/saml-auth.ts
index 6ee6f79d6..bc7674572 100644
--- a/packages/plugins/@nocobase/plugin-saml/src/server/saml-auth.ts
+++ b/packages/plugins/@nocobase/plugin-saml/src/server/saml-auth.ts
@@ -1,7 +1,7 @@
-import { AuthConfig, BaseAuth } from '@nocobase/auth';
+import { AuthConfig, BaseAuth } from '@tachybase/auth';
import { AuthModel } from '@nocobase/plugin-auth';
import { SAML, SamlConfig } from '@node-saml/node-saml';
-export { Model } from '@nocobase/database';
+export { Model } from '@tachybase/database';
interface SAMLOptions {
ssoUrl?: string;
diff --git a/packages/plugins/@nocobase/plugin-sample-hello/package.json b/packages/plugins/@nocobase/plugin-sample-hello/package.json
index 0179e22e4..12e416b9d 100644
--- a/packages/plugins/@nocobase/plugin-sample-hello/package.json
+++ b/packages/plugins/@nocobase/plugin-sample-hello/package.json
@@ -12,9 +12,9 @@
"react-i18next": "^11.15.1"
},
"peerDependencies": {
- "@nocobase/client": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*"
+ "@tachybase/client": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*"
},
"description.zh-CN": "一个简单的 NocoBase 插件",
"displayName.zh-CN": "Hello",
diff --git a/packages/plugins/@nocobase/plugin-sample-hello/src/client/index.tsx b/packages/plugins/@nocobase/plugin-sample-hello/src/client/index.tsx
index 4e86e06b5..b01d2dcba 100644
--- a/packages/plugins/@nocobase/plugin-sample-hello/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-sample-hello/src/client/index.tsx
@@ -1,5 +1,5 @@
import { TableOutlined } from '@ant-design/icons';
-import { Plugin, SchemaInitializerItem, SchemaSettings, useSchemaInitializer } from '@nocobase/client';
+import { Plugin, SchemaInitializerItem, SchemaSettings, useSchemaInitializer } from '@tachybase/client';
import { Card } from 'antd';
import React from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@nocobase/plugin-sample-hello/src/server/index.ts b/packages/plugins/@nocobase/plugin-sample-hello/src/server/index.ts
index 8eae593ec..c2c5db5f8 100644
--- a/packages/plugins/@nocobase/plugin-sample-hello/src/server/index.ts
+++ b/packages/plugins/@nocobase/plugin-sample-hello/src/server/index.ts
@@ -1,4 +1,4 @@
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { InstallOptions, Plugin } from '@tachybase/server';
export class HelloPlugin extends Plugin {
beforeLoad() {
diff --git a/packages/plugins/@nocobase/plugin-sequence-field/package.json b/packages/plugins/@nocobase/plugin-sequence-field/package.json
index 3f84bbc2e..d9155417d 100644
--- a/packages/plugins/@nocobase/plugin-sequence-field/package.json
+++ b/packages/plugins/@nocobase/plugin-sequence-field/package.json
@@ -22,13 +22,13 @@
"react-js-cron": "^3.1.0"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
"@nocobase/plugin-collection-manager": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "根据配置的规则自动生成编码，支持日期、数字、文本的组合。",
"displayName.zh-CN": "数据表字段：自动编码",
diff --git a/packages/plugins/@nocobase/plugin-sequence-field/src/client/SequenceFieldProvider.tsx b/packages/plugins/@nocobase/plugin-sequence-field/src/client/SequenceFieldProvider.tsx
index 434e23575..d70568373 100644
--- a/packages/plugins/@nocobase/plugin-sequence-field/src/client/SequenceFieldProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-sequence-field/src/client/SequenceFieldProvider.tsx
@@ -1,6 +1,6 @@
import React, { FC } from 'react';
-import { SchemaComponentOptions } from '@nocobase/client';
+import { SchemaComponentOptions } from '@tachybase/client';
import { RuleConfigForm } from './sequence';
diff --git a/packages/plugins/@nocobase/plugin-sequence-field/src/client/index.tsx b/packages/plugins/@nocobase/plugin-sequence-field/src/client/index.tsx
index 511c4a872..63f9de1e7 100644
--- a/packages/plugins/@nocobase/plugin-sequence-field/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-sequence-field/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import { SequenceFieldProvider } from './SequenceFieldProvider';
import { SequenceFieldInterface } from './sequence';
diff --git a/packages/plugins/@nocobase/plugin-sequence-field/src/client/locale/index.ts b/packages/plugins/@nocobase/plugin-sequence-field/src/client/locale/index.ts
index 30422f938..df20d6d68 100644
--- a/packages/plugins/@nocobase/plugin-sequence-field/src/client/locale/index.ts
+++ b/packages/plugins/@nocobase/plugin-sequence-field/src/client/locale/index.ts
@@ -1,4 +1,4 @@
-import { i18n } from '@nocobase/client';
+import { i18n } from '@tachybase/client';
import { useTranslation } from 'react-i18next';
export const NAMESPACE = 'sequence-field';
diff --git a/packages/plugins/@nocobase/plugin-sequence-field/src/client/sequence.tsx b/packages/plugins/@nocobase/plugin-sequence-field/src/client/sequence.tsx
index f20837dc0..34b68bd37 100644
--- a/packages/plugins/@nocobase/plugin-sequence-field/src/client/sequence.tsx
+++ b/packages/plugins/@nocobase/plugin-sequence-field/src/client/sequence.tsx
@@ -10,8 +10,8 @@ import {
interfacesProperties,
useCompile,
useToken,
-} from '@nocobase/client';
-import { error } from '@nocobase/utils/client';
+} from '@tachybase/client';
+import { error } from '@tachybase/utils/client';
import { Button, Select } from 'antd';
import React, { useContext } from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@nocobase/plugin-sequence-field/src/server/Plugin.ts b/packages/plugins/@nocobase/plugin-sequence-field/src/server/Plugin.ts
index c11c29a53..1333163c5 100644
--- a/packages/plugins/@nocobase/plugin-sequence-field/src/server/Plugin.ts
+++ b/packages/plugins/@nocobase/plugin-sequence-field/src/server/Plugin.ts
@@ -2,8 +2,8 @@ import { randomInt } from 'crypto';
import path from 'path';
import { promisify } from 'util';
-import { Plugin } from '@nocobase/server';
-import { Registry } from '@nocobase/utils';
+import { Plugin } from '@tachybase/server';
+import { Registry } from '@tachybase/utils';
import { Pattern, SequenceField } from './fields/sequence-field';
const asyncRandomInt = promisify(randomInt);
diff --git a/packages/plugins/@nocobase/plugin-sequence-field/src/server/__tests__/sequence-field.test.ts b/packages/plugins/@nocobase/plugin-sequence-field/src/server/__tests__/sequence-field.test.ts
index 21d1e94b1..309ce2f7f 100644
--- a/packages/plugins/@nocobase/plugin-sequence-field/src/server/__tests__/sequence-field.test.ts
+++ b/packages/plugins/@nocobase/plugin-sequence-field/src/server/__tests__/sequence-field.test.ts
@@ -1,5 +1,5 @@
-import { Database } from '@nocobase/database';
-import { MockServer, createMockServer } from '@nocobase/test';
+import { Database } from '@tachybase/database';
+import { MockServer, createMockServer } from '@tachybase/test';
import dayjs from 'dayjs';
import { SequenceField } from '..';
diff --git a/packages/plugins/@nocobase/plugin-sequence-field/src/server/collections/sequences.ts b/packages/plugins/@nocobase/plugin-sequence-field/src/server/collections/sequences.ts
index 6b2d3695b..b5c5ecb54 100644
--- a/packages/plugins/@nocobase/plugin-sequence-field/src/server/collections/sequences.ts
+++ b/packages/plugins/@nocobase/plugin-sequence-field/src/server/collections/sequences.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
dumpRules: {
diff --git a/packages/plugins/@nocobase/plugin-sequence-field/src/server/fields/sequence-field.ts b/packages/plugins/@nocobase/plugin-sequence-field/src/server/fields/sequence-field.ts
index 21f621403..0dd686a7e 100644
--- a/packages/plugins/@nocobase/plugin-sequence-field/src/server/fields/sequence-field.ts
+++ b/packages/plugins/@nocobase/plugin-sequence-field/src/server/fields/sequence-field.ts
@@ -7,8 +7,8 @@ import {
Transactionable,
ValidationError,
ValidationErrorItem,
-} from '@nocobase/database';
-import { Registry } from '@nocobase/utils';
+} from '@tachybase/database';
+import { Registry } from '@tachybase/utils';
import parser from 'cron-parser';
import dayjs from 'dayjs';
import lodash from 'lodash';
diff --git a/packages/plugins/@nocobase/plugin-sequence-field/src/server/migrations/20221207022250-sequence-field-key.ts b/packages/plugins/@nocobase/plugin-sequence-field/src/server/migrations/20221207022250-sequence-field-key.ts
index acb11116b..9dbe3f626 100644
--- a/packages/plugins/@nocobase/plugin-sequence-field/src/server/migrations/20221207022250-sequence-field-key.ts
+++ b/packages/plugins/@nocobase/plugin-sequence-field/src/server/migrations/20221207022250-sequence-field-key.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
export default class extends Migration {
appVersion = '<0.8.1-alpha.2';
diff --git a/packages/plugins/@nocobase/plugin-sms-auth/README.md b/packages/plugins/@nocobase/plugin-sms-auth/README.md
index 16e8a088d..b3d39191e 100644
--- a/packages/plugins/@nocobase/plugin-sms-auth/README.md
+++ b/packages/plugins/@nocobase/plugin-sms-auth/README.md
@@ -4,7 +4,7 @@
## 依赖
-- `@nocobase/auth` 认证插件，提供认证相关功能，表、模型、函数复用等。
+- `@tachybase/auth` 认证插件，提供认证相关功能，表、模型、函数复用等。
- `@nocobase/plugin-verification` 验证码插件，提供短信发送功能。
## 使用方法
diff --git a/packages/plugins/@nocobase/plugin-sms-auth/package.json b/packages/plugins/@nocobase/plugin-sms-auth/package.json
index 9db0eed6e..68ac1082a 100644
--- a/packages/plugins/@nocobase/plugin-sms-auth/package.json
+++ b/packages/plugins/@nocobase/plugin-sms-auth/package.json
@@ -16,14 +16,14 @@
"react-i18next": "^11.15.1"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/auth": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
"@nocobase/plugin-auth": "workspace:*",
"@nocobase/plugin-verification": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/auth": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*"
},
"description.zh-CN": "通过短信验证码认证身份。",
"displayName.zh-CN": "认证：短信",
diff --git a/packages/plugins/@nocobase/plugin-sms-auth/src/client/Options.tsx b/packages/plugins/@nocobase/plugin-sms-auth/src/client/Options.tsx
index 534b609f4..25659ef9a 100644
--- a/packages/plugins/@nocobase/plugin-sms-auth/src/client/Options.tsx
+++ b/packages/plugins/@nocobase/plugin-sms-auth/src/client/Options.tsx
@@ -1,4 +1,4 @@
-import { SchemaComponent } from '@nocobase/client';
+import { SchemaComponent } from '@tachybase/client';
import React from 'react';
import { useAuthTranslation } from './locale';
diff --git a/packages/plugins/@nocobase/plugin-sms-auth/src/client/SigninPage.tsx b/packages/plugins/@nocobase/plugin-sms-auth/src/client/SigninPage.tsx
index 3ecc47bca..c7d1a4509 100644
--- a/packages/plugins/@nocobase/plugin-sms-auth/src/client/SigninPage.tsx
+++ b/packages/plugins/@nocobase/plugin-sms-auth/src/client/SigninPage.tsx
@@ -1,4 +1,4 @@
-import { SchemaComponent } from '@nocobase/client';
+import { SchemaComponent } from '@tachybase/client';
import { ISchema } from '@tachybase/schema';
import React from 'react';
import VerificationCode from './VerificationCode';
diff --git a/packages/plugins/@nocobase/plugin-sms-auth/src/client/VerificationCode.tsx b/packages/plugins/@nocobase/plugin-sms-auth/src/client/VerificationCode.tsx
index 6e81a6d76..10e1b38b8 100644
--- a/packages/plugins/@nocobase/plugin-sms-auth/src/client/VerificationCode.tsx
+++ b/packages/plugins/@nocobase/plugin-sms-auth/src/client/VerificationCode.tsx
@@ -1,5 +1,5 @@
import { useForm } from '@tachybase/schema';
-import { css, useAPIClient } from '@nocobase/client';
+import { css, useAPIClient } from '@tachybase/client';
import { Button, Input, message } from 'antd';
import React, { useEffect, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@nocobase/plugin-sms-auth/src/client/index.tsx b/packages/plugins/@nocobase/plugin-sms-auth/src/client/index.tsx
index 351b380fb..15093d297 100644
--- a/packages/plugins/@nocobase/plugin-sms-auth/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-sms-auth/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import AuthPlugin from '@nocobase/plugin-auth/client';
import { SigninPage } from './SigninPage';
import { Options } from './Options';
diff --git a/packages/plugins/@nocobase/plugin-sms-auth/src/server/__tests__/signin.test.ts b/packages/plugins/@nocobase/plugin-sms-auth/src/server/__tests__/signin.test.ts
index 7e95c91ec..310b111ff 100644
--- a/packages/plugins/@nocobase/plugin-sms-auth/src/server/__tests__/signin.test.ts
+++ b/packages/plugins/@nocobase/plugin-sms-auth/src/server/__tests__/signin.test.ts
@@ -1,6 +1,6 @@
-import { Database, Model, ModelStatic } from '@nocobase/database';
+import { Database, Model, ModelStatic } from '@tachybase/database';
import VerificationPlugin from '@nocobase/plugin-verification';
-import { createMockServer, MockServer } from '@nocobase/test';
+import { createMockServer, MockServer } from '@tachybase/test';
import { authType } from '../../constants';
class Provider {
diff --git a/packages/plugins/@nocobase/plugin-sms-auth/src/server/migrations/20230607180000-sms-authenticator.ts b/packages/plugins/@nocobase/plugin-sms-auth/src/server/migrations/20230607180000-sms-authenticator.ts
index 0248e66df..c0031bd88 100644
--- a/packages/plugins/@nocobase/plugin-sms-auth/src/server/migrations/20230607180000-sms-authenticator.ts
+++ b/packages/plugins/@nocobase/plugin-sms-auth/src/server/migrations/20230607180000-sms-authenticator.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
import { authType } from '../../constants';
export default class AddBasicAuthMigration extends Migration {
diff --git a/packages/plugins/@nocobase/plugin-sms-auth/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-sms-auth/src/server/plugin.ts
index b58045dca..c05f921e3 100644
--- a/packages/plugins/@nocobase/plugin-sms-auth/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-sms-auth/src/server/plugin.ts
@@ -1,5 +1,5 @@
import VerificationPlugin from '@nocobase/plugin-verification';
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { InstallOptions, Plugin } from '@tachybase/server';
import { resolve } from 'path';
import { authType } from '../constants';
import { SMSAuth } from './sms-auth';
diff --git a/packages/plugins/@nocobase/plugin-sms-auth/src/server/sms-auth.ts b/packages/plugins/@nocobase/plugin-sms-auth/src/server/sms-auth.ts
index 911548a78..a3b4a3ef2 100644
--- a/packages/plugins/@nocobase/plugin-sms-auth/src/server/sms-auth.ts
+++ b/packages/plugins/@nocobase/plugin-sms-auth/src/server/sms-auth.ts
@@ -1,5 +1,5 @@
-import { AuthConfig, BaseAuth } from '@nocobase/auth';
-import { Model } from '@nocobase/database';
+import { AuthConfig, BaseAuth } from '@tachybase/auth';
+import { Model } from '@tachybase/database';
import { AuthModel } from '@nocobase/plugin-auth';
import VerificationPlugin from '@nocobase/plugin-verification';
import { namespace } from '../constants';
diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/package.json b/packages/plugins/@nocobase/plugin-snapshot-field/package.json
index 7bde866d8..a0eb91d61 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/package.json
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/package.json
@@ -19,11 +19,11 @@
"react-i18next": "^11.15.1"
},
"peerDependencies": {
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "在添加数据时，为它的关系数据创建快照，并保存在当前的数据中。关系数据更新时，快照不会更新。",
"displayName.zh-CN": "数据表字段：关系快照",
diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/src/__tests__/fieldsHistory.test.ts b/packages/plugins/@nocobase/plugin-snapshot-field/src/__tests__/fieldsHistory.test.ts
index ba6e68254..a34cc7a75 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/src/__tests__/fieldsHistory.test.ts
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/src/__tests__/fieldsHistory.test.ts
@@ -1,4 +1,4 @@
-import { createMockServer, MockServer } from '@nocobase/test';
+import { createMockServer, MockServer } from '@tachybase/test';
describe('actions', () => {
let app: MockServer;
diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/src/__tests__/snapshots.test.ts b/packages/plugins/@nocobase/plugin-snapshot-field/src/__tests__/snapshots.test.ts
index 49a054837..6c1e0c87c 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/src/__tests__/snapshots.test.ts
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/src/__tests__/snapshots.test.ts
@@ -1,4 +1,4 @@
-import { createMockServer, MockServer } from '@nocobase/test';
+import { createMockServer, MockServer } from '@tachybase/test';
import { field_linkto } from './data/field_linkto';
import { field_m2m } from './data/field_m2m';
import { field_o2m } from './data/field_o2m';
diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotBlock/SnapshotBlockInitializers/SnapshotBlockInitializers.tsx b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotBlock/SnapshotBlockInitializers/SnapshotBlockInitializers.tsx
index 5991c94e9..ecc85cf83 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotBlock/SnapshotBlockInitializers/SnapshotBlockInitializers.tsx
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotBlock/SnapshotBlockInitializers/SnapshotBlockInitializers.tsx
@@ -1,4 +1,4 @@
-import { CompatibleSchemaInitializer, gridRowColWrap } from '@nocobase/client';
+import { CompatibleSchemaInitializer, gridRowColWrap } from '@tachybase/client';
import { NAMESPACE } from '../../locale';
/**
diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotBlock/SnapshotBlockInitializers/SnapshotBlockInitializersDetailItem.tsx b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotBlock/SnapshotBlockInitializers/SnapshotBlockInitializersDetailItem.tsx
index 9fc6af448..f2d5790bf 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotBlock/SnapshotBlockInitializers/SnapshotBlockInitializersDetailItem.tsx
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotBlock/SnapshotBlockInitializers/SnapshotBlockInitializersDetailItem.tsx
@@ -9,7 +9,7 @@ import {
useSchemaInitializer,
SchemaInitializerItem,
useSchemaInitializerItem,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { ISchema } from '@tachybase/schema';
import { uid } from '@tachybase/schema';
diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotBlock/SnapshotBlockProvider.tsx b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotBlock/SnapshotBlockProvider.tsx
index 619ca0409..1f19af42b 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotBlock/SnapshotBlockProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotBlock/SnapshotBlockProvider.tsx
@@ -14,7 +14,7 @@ import {
useDesignable,
useRecord,
useResource,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { Spin } from 'antd';
import React, { useMemo, useRef } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotFieldProvider.tsx b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotFieldProvider.tsx
index f130498b5..c9f9a528d 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotFieldProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotFieldProvider.tsx
@@ -1,4 +1,4 @@
-import { CollectionHistoryProvider, SchemaComponentOptions } from '@nocobase/client';
+import { CollectionHistoryProvider, SchemaComponentOptions } from '@tachybase/client';
import React from 'react';
import { SnapshotOwnerCollectionFieldsSelect } from './components/SnapshotOwnerCollectionFieldsSelect';
import { SnapshotBlockInitializersDetailItem } from './SnapshotBlock/SnapshotBlockInitializers/SnapshotBlockInitializersDetailItem';
diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotHistoryCollectionProvider.tsx b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotHistoryCollectionProvider.tsx
index 465d53ad1..633211433 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotHistoryCollectionProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotHistoryCollectionProvider.tsx
@@ -3,7 +3,7 @@ import {
ExtendCollectionsProvider,
useCollectionManager_deprecated,
useHistoryCollectionsByNames,
-} from '@nocobase/client';
+} from '@tachybase/client';
import React from 'react';
export const SnapshotHistoryCollectionProvider: React.FC<{ collectionName: string }> = (props) => {
diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotRecordPicker.tsx b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotRecordPicker.tsx
index 174dc84d6..018c7daba 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotRecordPicker.tsx
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/SnapshotRecordPicker.tsx
@@ -1,5 +1,5 @@
import { connect, mapReadPretty, useFieldSchema } from '@tachybase/schema';
-import { ReadPrettyRecordPicker, useCollection_deprecated } from '@nocobase/client';
+import { ReadPrettyRecordPicker, useCollection_deprecated } from '@tachybase/client';
import React from 'react';
import { SnapshotHistoryCollectionProvider } from './SnapshotHistoryCollectionProvider';
diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/components/SnapshotOwnerCollectionFieldsSelect.tsx b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/components/SnapshotOwnerCollectionFieldsSelect.tsx
index dd841427f..84297c3ef 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/components/SnapshotOwnerCollectionFieldsSelect.tsx
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/components/SnapshotOwnerCollectionFieldsSelect.tsx
@@ -1,4 +1,4 @@
-import { useCollectionManager_deprecated, useCompile } from '@nocobase/client';
+import { useCollectionManager_deprecated, useCompile } from '@tachybase/client';
import { Select, SelectProps } from 'antd';
import React from 'react';
import { useTopRecord } from '../interface';
diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/index.tsx b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/index.tsx
index 147849327..b21f1e322 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import { SnapshotFieldProvider } from './SnapshotFieldProvider';
import {
snapshotBlockInitializers,
diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/interface.ts b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/interface.ts
index 8e312158a..46383ae59 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/interface.ts
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/interface.ts
@@ -5,7 +5,7 @@ import {
interfacesProperties,
useCollectionManager_deprecated,
useRecord,
-} from '@nocobase/client';
+} from '@tachybase/client';
import lodash from 'lodash';
import { NAMESPACE } from './locale';
diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/locale/index.ts b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/locale/index.ts
index 87cd97316..5ba58d81c 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/src/client/locale/index.ts
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/src/client/locale/index.ts
@@ -1,4 +1,4 @@
-import { i18n } from '@nocobase/client';
+import { i18n } from '@tachybase/client';
import { useTranslation } from 'react-i18next';
export const NAMESPACE = 'snapshot-field';
diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/src/server/collections/collectionsHistory.ts b/packages/plugins/@nocobase/plugin-snapshot-field/src/server/collections/collectionsHistory.ts
index 5ddabde1f..47beb7b34 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/src/server/collections/collectionsHistory.ts
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/src/server/collections/collectionsHistory.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
dumpRules: 'required',
diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/src/server/collections/fieldsHistory.ts b/packages/plugins/@nocobase/plugin-snapshot-field/src/server/collections/fieldsHistory.ts
index 159ead8eb..dc96c69f7 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/src/server/collections/fieldsHistory.ts
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/src/server/collections/fieldsHistory.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
dumpRules: 'required',
diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/src/server/fields/snapshot-field.ts b/packages/plugins/@nocobase/plugin-snapshot-field/src/server/fields/snapshot-field.ts
index ff3432d64..ea7164697 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/src/server/fields/snapshot-field.ts
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/src/server/fields/snapshot-field.ts
@@ -1,4 +1,4 @@
-import { BaseColumnFieldOptions, CreateOptions, DataTypes, Field, Model } from '@nocobase/database';
+import { BaseColumnFieldOptions, CreateOptions, DataTypes, Field, Model } from '@tachybase/database';
export class SnapshotField extends Field {
get dataType() {
diff --git a/packages/plugins/@nocobase/plugin-snapshot-field/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-snapshot-field/src/server/plugin.ts
index de6ce6e10..4d81a4396 100644
--- a/packages/plugins/@nocobase/plugin-snapshot-field/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-snapshot-field/src/server/plugin.ts
@@ -1,5 +1,5 @@
-import { Model } from '@nocobase/database';
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { Model } from '@tachybase/database';
+import { InstallOptions, Plugin } from '@tachybase/server';
import { resolve } from 'path';
import { SnapshotField } from './fields/snapshot-field';
diff --git a/packages/plugins/@nocobase/plugin-system-settings/package.json b/packages/plugins/@nocobase/plugin-system-settings/package.json
index 9d4df9665..e7078223f 100644
--- a/packages/plugins/@nocobase/plugin-system-settings/package.json
+++ b/packages/plugins/@nocobase/plugin-system-settings/package.json
@@ -10,10 +10,10 @@
"license": "AGPL-3.0",
"main": "./dist/server/index.js",
"peerDependencies": {
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*"
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*"
},
"description.zh-CN": "用于调整系统的标题、LOGO、语言等。",
"displayName.zh-CN": "系统设置",
diff --git a/packages/plugins/@nocobase/plugin-system-settings/src/client/index.ts b/packages/plugins/@nocobase/plugin-system-settings/src/client/index.ts
index 64cc5c927..8b3bc6584 100644
--- a/packages/plugins/@nocobase/plugin-system-settings/src/client/index.ts
+++ b/packages/plugins/@nocobase/plugin-system-settings/src/client/index.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
class SystemSettingPlugin extends Plugin {
async load() {}
diff --git a/packages/plugins/@nocobase/plugin-system-settings/src/server/collections/systemSettings.ts b/packages/plugins/@nocobase/plugin-system-settings/src/server/collections/systemSettings.ts
index ccfaa744b..fe3a72391 100644
--- a/packages/plugins/@nocobase/plugin-system-settings/src/server/collections/systemSettings.ts
+++ b/packages/plugins/@nocobase/plugin-system-settings/src/server/collections/systemSettings.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
dumpRules: 'required',
diff --git a/packages/plugins/@nocobase/plugin-system-settings/src/server/migrations/20220714204714-update-enabled-languages.ts b/packages/plugins/@nocobase/plugin-system-settings/src/server/migrations/20220714204714-update-enabled-languages.ts
index d33d0bfe6..b013cd719 100644
--- a/packages/plugins/@nocobase/plugin-system-settings/src/server/migrations/20220714204714-update-enabled-languages.ts
+++ b/packages/plugins/@nocobase/plugin-system-settings/src/server/migrations/20220714204714-update-enabled-languages.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
export default class extends Migration {
appVersion = '<0.7.3-alpha.1';
diff --git a/packages/plugins/@nocobase/plugin-system-settings/src/server/server.ts b/packages/plugins/@nocobase/plugin-system-settings/src/server/server.ts
index 428cce345..84d163ab1 100644
--- a/packages/plugins/@nocobase/plugin-system-settings/src/server/server.ts
+++ b/packages/plugins/@nocobase/plugin-system-settings/src/server/server.ts
@@ -1,4 +1,4 @@
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { InstallOptions, Plugin } from '@tachybase/server';
import { resolve } from 'path';
export class SystemSettingsPlugin extends Plugin {
diff --git a/packages/plugins/@nocobase/plugin-theme-editor/package.json b/packages/plugins/@nocobase/plugin-theme-editor/package.json
index 38f8e28da..c78cd7c34 100644
--- a/packages/plugins/@nocobase/plugin-theme-editor/package.json
+++ b/packages/plugins/@nocobase/plugin-theme-editor/package.json
@@ -27,12 +27,12 @@
"vanilla-jsoneditor": "^0.17.8"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "自定义 UI 的颜色、尺寸等，并将结果保存为主题，可在多个主题间切换。",
"displayName.zh-CN": "主题编辑器",
diff --git a/packages/plugins/@nocobase/plugin-theme-editor/src/client/antd-token-previewer/interface.ts b/packages/plugins/@nocobase/plugin-theme-editor/src/client/antd-token-previewer/interface.ts
index eefa6dceb..4321bbec6 100644
--- a/packages/plugins/@nocobase/plugin-theme-editor/src/client/antd-token-previewer/interface.ts
+++ b/packages/plugins/@nocobase/plugin-theme-editor/src/client/antd-token-previewer/interface.ts
@@ -1,4 +1,4 @@
-import type { ThemeConfig } from '@nocobase/client';
+import type { ThemeConfig } from '@tachybase/client';
import type { ReactElement } from 'react';
export type Theme = {
diff --git a/packages/plugins/@nocobase/plugin-theme-editor/src/client/antd-token-previewer/token-panel-pro/TokenContent.tsx b/packages/plugins/@nocobase/plugin-theme-editor/src/client/antd-token-previewer/token-panel-pro/TokenContent.tsx
index cff835901..428feb1bf 100644
--- a/packages/plugins/@nocobase/plugin-theme-editor/src/client/antd-token-previewer/token-panel-pro/TokenContent.tsx
+++ b/packages/plugins/@nocobase/plugin-theme-editor/src/client/antd-token-previewer/token-panel-pro/TokenContent.tsx
@@ -1,6 +1,6 @@
import { CaretRightOutlined, ExpandOutlined, QuestionCircleOutlined } from '@ant-design/icons';
-import type { ThemeConfig } from '@nocobase/client';
-import { StablePopover } from '@nocobase/client';
+import type { ThemeConfig } from '@tachybase/client';
+import { StablePopover } from '@tachybase/client';
import { Button, Checkbox, Collapse, ConfigProvider, Switch, Tooltip, Typography } from 'antd';
import seed from 'antd/es/theme/themes/seed';
import classNames from 'classnames';
diff --git a/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/InitializeTheme.tsx b/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/InitializeTheme.tsx
index b8b503e52..873e2c692 100644
--- a/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/InitializeTheme.tsx
+++ b/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/InitializeTheme.tsx
@@ -1,5 +1,5 @@
-import { defaultTheme as presetTheme, useAPIClient, useCurrentUserContext, useGlobalTheme } from '@nocobase/client';
-import { error } from '@nocobase/utils/client';
+import { defaultTheme as presetTheme, useAPIClient, useCurrentUserContext, useGlobalTheme } from '@tachybase/client';
+import { error } from '@tachybase/utils/client';
import { Spin } from 'antd';
import React, { useEffect, useMemo, useRef } from 'react';
import { changeAlgorithmFromFunctionToString } from '../utils/changeAlgorithmFromFunctionToString';
diff --git a/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/ThemeCard.tsx b/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/ThemeCard.tsx
index d333a85c3..0e6340658 100644
--- a/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/ThemeCard.tsx
+++ b/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/ThemeCard.tsx
@@ -1,6 +1,6 @@
import { DeleteOutlined, EditOutlined, EllipsisOutlined } from '@ant-design/icons';
-import { compatOldTheme, useAPIClient, useCurrentUserContext, useGlobalTheme, useToken } from '@nocobase/client';
-import { error } from '@nocobase/utils/client';
+import { compatOldTheme, useAPIClient, useCurrentUserContext, useGlobalTheme, useToken } from '@tachybase/client';
+import { error } from '@tachybase/utils/client';
import { App, Card, ConfigProvider, Dropdown, Space, Switch, Tag, message } from 'antd';
import React, { useCallback, useMemo } from 'react';
import { ThemeConfig, ThemeItem } from '../../types';
diff --git a/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/ThemeList.tsx b/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/ThemeList.tsx
index 447883940..d1028881a 100644
--- a/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/ThemeList.tsx
+++ b/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/ThemeList.tsx
@@ -1,5 +1,5 @@
-import { useToken } from '@nocobase/client';
-import { error } from '@nocobase/utils/client';
+import { useToken } from '@tachybase/client';
+import { error } from '@tachybase/utils/client';
import { Space } from 'antd';
import React, { useCallback, useEffect } from 'react';
import ThemeCard from './ThemeCard';
diff --git a/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/ThemeListProvider.tsx b/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/ThemeListProvider.tsx
index 8951840d0..047d87bc6 100644
--- a/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/ThemeListProvider.tsx
+++ b/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/ThemeListProvider.tsx
@@ -1,5 +1,5 @@
-import { ReturnTypeOfUseRequest, useRequest } from '@nocobase/client';
-import { error } from '@nocobase/utils/client';
+import { ReturnTypeOfUseRequest, useRequest } from '@tachybase/client';
+import { error } from '@tachybase/utils/client';
import React, { createContext, useMemo } from 'react';
import { ThemeItem } from '../../types';
import { changeAlgorithmFromStringToFunction } from '../utils/changeAlgorithmFromStringToFunction';
diff --git a/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/ToEditTheme.tsx b/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/ToEditTheme.tsx
index 36ddc1a5d..418b42fc9 100644
--- a/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/ToEditTheme.tsx
+++ b/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/ToEditTheme.tsx
@@ -1,5 +1,5 @@
import { PlusOutlined } from '@ant-design/icons';
-import { compatOldTheme, defaultTheme, useGlobalTheme, useToken } from '@nocobase/client';
+import { compatOldTheme, defaultTheme, useGlobalTheme, useToken } from '@tachybase/client';
import { App, Button, Space } from 'antd';
import React, { useCallback } from 'react';
import { useTranslation } from '../locale';
diff --git a/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/theme-editor/index.tsx b/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/theme-editor/index.tsx
index 75007bcdc..1605cc4c3 100644
--- a/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/theme-editor/index.tsx
+++ b/packages/plugins/@nocobase/plugin-theme-editor/src/client/components/theme-editor/index.tsx
@@ -1,6 +1,6 @@
import { css, cx } from '@emotion/css';
-import { createStyles, useAPIClient, useGlobalTheme } from '@nocobase/client';
-import { error } from '@nocobase/utils/client';
+import { createStyles, useAPIClient, useGlobalTheme } from '@tachybase/client';
+import { error } from '@tachybase/utils/client';
import { Button, ConfigProvider, Input, Space, message } from 'antd';
import antdEnUs from 'antd/locale/en_US';
import antdZhCN from 'antd/locale/zh_CN';
diff --git a/packages/plugins/@nocobase/plugin-theme-editor/src/client/hooks/useThemeSettings.tsx b/packages/plugins/@nocobase/plugin-theme-editor/src/client/hooks/useThemeSettings.tsx
index 7f565ab7a..bd363acd2 100644
--- a/packages/plugins/@nocobase/plugin-theme-editor/src/client/hooks/useThemeSettings.tsx
+++ b/packages/plugins/@nocobase/plugin-theme-editor/src/client/hooks/useThemeSettings.tsx
@@ -1,5 +1,5 @@
-import { SelectWithTitle, useAPIClient, useCurrentUserContext, useSystemSettings } from '@nocobase/client';
-import { error } from '@nocobase/utils/client';
+import { SelectWithTitle, useAPIClient, useCurrentUserContext, useSystemSettings } from '@tachybase/client';
+import { error } from '@tachybase/utils/client';
import { MenuProps } from 'antd';
import React, { useEffect, useMemo } from 'react';
import { useThemeId } from '../components/InitializeTheme';
diff --git a/packages/plugins/@nocobase/plugin-theme-editor/src/client/hooks/useUpdateThemeSettings.tsx b/packages/plugins/@nocobase/plugin-theme-editor/src/client/hooks/useUpdateThemeSettings.tsx
index d4113928a..2af1070a5 100644
--- a/packages/plugins/@nocobase/plugin-theme-editor/src/client/hooks/useUpdateThemeSettings.tsx
+++ b/packages/plugins/@nocobase/plugin-theme-editor/src/client/hooks/useUpdateThemeSettings.tsx
@@ -1,5 +1,5 @@
-import { useAPIClient, useCurrentUserContext, useSystemSettings } from '@nocobase/client';
-import { error } from '@nocobase/utils/client';
+import { useAPIClient, useCurrentUserContext, useSystemSettings } from '@tachybase/client';
+import { error } from '@tachybase/utils/client';
import { useCallback } from 'react';
export function useUpdateThemeSettings() {
diff --git a/packages/plugins/@nocobase/plugin-theme-editor/src/client/index.tsx b/packages/plugins/@nocobase/plugin-theme-editor/src/client/index.tsx
index c7bb746fa..47fe44638 100644
--- a/packages/plugins/@nocobase/plugin-theme-editor/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-theme-editor/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin, createStyles, defaultTheme, useCurrentUserSettingsMenu, useGlobalTheme } from '@nocobase/client';
+import { Plugin, createStyles, defaultTheme, useCurrentUserSettingsMenu, useGlobalTheme } from '@tachybase/client';
import { ConfigProvider } from 'antd';
import _ from 'lodash';
import React, { useEffect, useMemo } from 'react';
diff --git a/packages/plugins/@nocobase/plugin-theme-editor/src/server/collections/theme-config.ts b/packages/plugins/@nocobase/plugin-theme-editor/src/server/collections/theme-config.ts
index 6e229d7be..338232f97 100644
--- a/packages/plugins/@nocobase/plugin-theme-editor/src/server/collections/theme-config.ts
+++ b/packages/plugins/@nocobase/plugin-theme-editor/src/server/collections/theme-config.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
name: 'themeConfig',
diff --git a/packages/plugins/@nocobase/plugin-theme-editor/src/server/migrations/202307250853-theme-editor.ts b/packages/plugins/@nocobase/plugin-theme-editor/src/server/migrations/202307250853-theme-editor.ts
index 446cdb0f7..faf5e4f43 100644
--- a/packages/plugins/@nocobase/plugin-theme-editor/src/server/migrations/202307250853-theme-editor.ts
+++ b/packages/plugins/@nocobase/plugin-theme-editor/src/server/migrations/202307250853-theme-editor.ts
@@ -1,6 +1,6 @@
-import { Model } from '@nocobase/database';
-import { Migration } from '@nocobase/server';
-import { uid } from '@nocobase/utils';
+import { Model } from '@tachybase/database';
+import { Migration } from '@tachybase/server';
+import { uid } from '@tachybase/utils';
import { compact, compactDark, dark, defaultTheme } from '../builtinThemes';
export default class extends Migration {
diff --git a/packages/plugins/@nocobase/plugin-theme-editor/src/server/migrations/20231210132610-add-default-field.ts b/packages/plugins/@nocobase/plugin-theme-editor/src/server/migrations/20231210132610-add-default-field.ts
index 1931db8b5..1ee6bdd68 100644
--- a/packages/plugins/@nocobase/plugin-theme-editor/src/server/migrations/20231210132610-add-default-field.ts
+++ b/packages/plugins/@nocobase/plugin-theme-editor/src/server/migrations/20231210132610-add-default-field.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
export default class extends Migration {
appVersion = '<0.17.0-alpha.5';
diff --git a/packages/plugins/@nocobase/plugin-theme-editor/src/server/plugin.ts b/packages/plugins/@nocobase/plugin-theme-editor/src/server/plugin.ts
index 8203f3b48..b820fe21a 100644
--- a/packages/plugins/@nocobase/plugin-theme-editor/src/server/plugin.ts
+++ b/packages/plugins/@nocobase/plugin-theme-editor/src/server/plugin.ts
@@ -1,4 +1,4 @@
-import { InstallOptions, Plugin } from '@nocobase/server';
+import { InstallOptions, Plugin } from '@tachybase/server';
import path, { resolve } from 'path';
import { compact, compactDark, dark, defaultTheme } from './builtinThemes';
diff --git a/packages/plugins/@nocobase/plugin-theme-editor/src/types.ts b/packages/plugins/@nocobase/plugin-theme-editor/src/types.ts
index 0d4a752e6..ffe1190c0 100644
--- a/packages/plugins/@nocobase/plugin-theme-editor/src/types.ts
+++ b/packages/plugins/@nocobase/plugin-theme-editor/src/types.ts
@@ -1,4 +1,4 @@
-import type { ThemeConfig as Config } from '@nocobase/client';
+import type { ThemeConfig as Config } from '@tachybase/client';
import type { ReactElement } from 'react';
export type ThemeConfig = Config;
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json b/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json
index 8eb1c3568..238d93025 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/package.json
@@ -14,16 +14,16 @@
"lodash": "4.17.21"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/cache": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
"@nocobase/plugin-error-handler": "workspace:*",
"@nocobase/plugin-users": "workspace:*",
- "@nocobase/resourcer": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/cache": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/resourcer": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "提供中心化的 UI schema 存储服务。",
"displayName.zh-CN": "UI schema 存储服务",
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/client/index.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/client/index.ts
index 1104fdfc9..b03fe2995 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/client/index.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/client/index.ts
@@ -1,7 +1,7 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
class UiSchemaStoragePlugin extends Plugin {
- async load() { }
+ async load() {}
}
export default UiSchemaStoragePlugin;
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/action.test.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/action.test.ts
index fe35689c2..43f417b5b 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/action.test.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/action.test.ts
@@ -1,5 +1,5 @@
-import { Database } from '@nocobase/database';
-import { MockServer, createMockServer } from '@nocobase/test';
+import { Database } from '@tachybase/database';
+import { MockServer, createMockServer } from '@tachybase/test';
describe('action test', () => {
let app: MockServer;
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/migrations/20230330214649-filter-form-block.test.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/migrations/20230330214649-filter-form-block.test.ts
index 4adcd35f0..74d782185 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/migrations/20230330214649-filter-form-block.test.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/migrations/20230330214649-filter-form-block.test.ts
@@ -1,7 +1,7 @@
import Migration from '../../migrations/20230330214649-filter-form-block';
-import { Database } from '@nocobase/database';
-import { createMockServer, MockServer } from '@nocobase/test';
+import { Database } from '@tachybase/database';
+import { createMockServer, MockServer } from '@tachybase/test';
import { UiSchemaRepository } from '../..';
describe.skip('migration-20230330214649-filter-form-block', () => {
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/server-hook-impl.test.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/server-hook-impl.test.ts
index 4bcfd988f..888594827 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/server-hook-impl.test.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/server-hook-impl.test.ts
@@ -1,6 +1,6 @@
-import { BelongsToManyRepository, Database } from '@nocobase/database';
+import { BelongsToManyRepository, Database } from '@tachybase/database';
import UiSchemaStoragePlugin, { UiSchemaRepository } from '@nocobase/plugin-ui-schema-storage';
-import { createMockServer, MockServer } from '@nocobase/test';
+import { createMockServer, MockServer } from '@tachybase/test';
describe('server hooks', () => {
let app: MockServer;
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/server-hook.test.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/server-hook.test.ts
index 5443458a0..b196e2187 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/server-hook.test.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/server-hook.test.ts
@@ -1,6 +1,6 @@
-import { Database } from '@nocobase/database';
+import { Database } from '@tachybase/database';
import UiSchemaStoragePlugin, { UiSchemaRepository } from '@nocobase/plugin-ui-schema-storage';
-import { createMockServer, MockServer } from '@nocobase/test';
+import { createMockServer, MockServer } from '@tachybase/test';
import { vi } from 'vitest';
describe('server hooks', () => {
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema-model.test.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema-model.test.ts
index 3ef246f16..56396b2c6 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema-model.test.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema-model.test.ts
@@ -1,5 +1,5 @@
-import { Collection, Database } from '@nocobase/database';
-import { MockServer, createMockServer } from '@nocobase/test';
+import { Collection, Database } from '@tachybase/database';
+import { MockServer, createMockServer } from '@tachybase/test';
import { UiSchemaRepository } from '..';
describe('ui schema model', () => {
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema-repository-with-cache.test.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema-repository-with-cache.test.ts
index 6b085f366..557809cf3 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema-repository-with-cache.test.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema-repository-with-cache.test.ts
@@ -1,6 +1,6 @@
-import { Cache } from '@nocobase/cache';
-import { Database } from '@nocobase/database';
-import { createMockServer, MockServer } from '@nocobase/test';
+import { Cache } from '@tachybase/cache';
+import { Database } from '@tachybase/database';
+import { createMockServer, MockServer } from '@tachybase/test';
import UiSchemaRepository, { GetJsonSchemaOptions, GetPropertiesOptions } from '../repository';
describe('ui_schema repository with cache', () => {
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema-repository.test.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema-repository.test.ts
index 00a6aae25..6ea9749ec 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema-repository.test.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema-repository.test.ts
@@ -1,5 +1,5 @@
-import { Collection, Database } from '@nocobase/database';
-import { createMockServer, MockServer } from '@nocobase/test';
+import { Collection, Database } from '@tachybase/database';
+import { createMockServer, MockServer } from '@tachybase/test';
import { SchemaNode } from '../dao/ui_schema_node_dao';
import UiSchemaRepository from '../repository';
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema.test.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema.test.ts
index 59478e813..9f5ff5812 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema.test.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/__tests__/ui-schema.test.ts
@@ -1,6 +1,6 @@
import { ISchema } from '@formily/json-schema';
-import { Database } from '@nocobase/database';
-import { createMockServer, MockServer } from '@nocobase/test';
+import { Database } from '@tachybase/database';
+import { createMockServer, MockServer } from '@tachybase/test';
import { UiSchemaRepository } from '..';
describe('ui-schema', () => {
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/actions/ui-schema-action.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/actions/ui-schema-action.ts
index 308a5a7b8..4e4d82ab5 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/actions/ui-schema-action.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/actions/ui-schema-action.ts
@@ -1,5 +1,5 @@
-import { Context } from '@nocobase/actions';
-import { ActionParams } from '@nocobase/resourcer';
+import { Context } from '@tachybase/actions';
+import { ActionParams } from '@tachybase/resourcer';
import lodash from 'lodash';
import UiSchemaRepository, { GetJsonSchemaOptions, GetPropertiesOptions } from '../repository';
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/collections/uiSchemaServerHooks.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/collections/uiSchemaServerHooks.ts
index bac2cf370..c22e5925b 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/collections/uiSchemaServerHooks.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/collections/uiSchemaServerHooks.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
export default {
dumpRules: 'required',
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/collections/uiSchemaTemplates.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/collections/uiSchemaTemplates.ts
index be0500091..6a15dd50d 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/collections/uiSchemaTemplates.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/collections/uiSchemaTemplates.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
dumpRules: 'required',
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/collections/uiSchemaTreePath.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/collections/uiSchemaTreePath.ts
index 9504112fd..6d73fb289 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/collections/uiSchemaTreePath.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/collections/uiSchemaTreePath.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
export default {
dumpRules: 'required',
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/collections/uiSchemas.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/collections/uiSchemas.ts
index 723147a15..661a8b756 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/collections/uiSchemas.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/collections/uiSchemas.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
export default {
dumpRules: 'required',
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230330214649-filter-form-block.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230330214649-filter-form-block.ts
index 747f32bc2..1152a7c77 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230330214649-filter-form-block.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230330214649-filter-form-block.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
export default class extends Migration {
appVersion = '<0.9.1-alpha.3';
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230509221649-association-select.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230509221649-association-select.ts
index efa36dd74..48a251f00 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230509221649-association-select.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230509221649-association-select.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
export default class extends Migration {
appVersion = '<0.9.3-alpha.1';
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230509235247-record-picker.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230509235247-record-picker.ts
index b575a0fc1..fedd06a6d 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230509235247-record-picker.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230509235247-record-picker.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
export default class extends Migration {
appVersion = '<0.9.3-alpha.1';
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230510235247-form-field.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230510235247-form-field.ts
index 32ca49fde..aa2919649 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230510235247-form-field.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230510235247-form-field.ts
@@ -1,6 +1,6 @@
import { Schema } from '@formily/json-schema';
-import { Migration } from '@nocobase/server';
-import { uid } from '@nocobase/utils';
+import { Migration } from '@tachybase/server';
+import { uid } from '@tachybase/utils';
import UiSchemaRepository from '../repository';
import _ from 'lodash';
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230522231231-association-field.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230522231231-association-field.ts
index 89231d766..7ebf90cd4 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230522231231-association-field.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20230522231231-association-field.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
import UiSchemaRepository from '../repository';
export default class extends Migration {
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20231015125000-support-filter-blocks-in-select-record-drawer.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20231015125000-support-filter-blocks-in-select-record-drawer.ts
index 9fbb08c32..6f3553723 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20231015125000-support-filter-blocks-in-select-record-drawer.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/migrations/20231015125000-support-filter-blocks-in-select-record-drawer.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
export default class extends Migration {
appVersion = '<0.14.0-alpha.8';
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/model.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/model.ts
index 63f969730..160117acb 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/model.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/model.ts
@@ -1,4 +1,4 @@
-import { MagicAttributeModel } from '@nocobase/database';
+import { MagicAttributeModel } from '@tachybase/database';
import { HookType } from './server-hooks';
class UiSchemaModel extends MagicAttributeModel {
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/repository.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/repository.ts
index 7b7f5cf71..3783a2afa 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/repository.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/repository.ts
@@ -1,6 +1,6 @@
-import { Cache } from '@nocobase/cache';
-import { Repository, Transaction, Transactionable } from '@nocobase/database';
-import { uid } from '@nocobase/utils';
+import { Cache } from '@tachybase/cache';
+import { Repository, Transaction, Transactionable } from '@tachybase/database';
+import { uid } from '@tachybase/utils';
import lodash from 'lodash';
import { ChildOptions, SchemaNode, TargetPosition } from './dao/ui_schema_node_dao';
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/server-hooks/index.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/server-hooks/index.ts
index 0a5635e19..64c8590ae 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/server-hooks/index.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/server-hooks/index.ts
@@ -1,4 +1,4 @@
-import { Database } from '@nocobase/database';
+import { Database } from '@tachybase/database';
import { hooks } from './hooks';
import { ServerHookModel } from './model';
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/server-hooks/model.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/server-hooks/model.ts
index c95f4db13..3ac5f9012 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/server-hooks/model.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/server-hooks/model.ts
@@ -1,3 +1,3 @@
-import { Model } from '@nocobase/database';
+import { Model } from '@tachybase/database';
export class ServerHookModel extends Model {}
diff --git a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/server.ts b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/server.ts
index 64fa4f372..0b6ed2131 100644
--- a/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/server.ts
+++ b/packages/plugins/@nocobase/plugin-ui-schema-storage/src/server/server.ts
@@ -1,6 +1,6 @@
-import { MagicAttributeModel } from '@nocobase/database';
-import { Plugin } from '@nocobase/server';
-import { uid } from '@nocobase/utils';
+import { MagicAttributeModel } from '@tachybase/database';
+import { Plugin } from '@tachybase/server';
+import { uid } from '@tachybase/utils';
import path, { resolve } from 'path';
import { uiSchemaActions } from './actions/ui-schema-action';
import { UiSchemaModel } from './model';
diff --git a/packages/plugins/@nocobase/plugin-users/package.json b/packages/plugins/@nocobase/plugin-users/package.json
index 0c464acd2..b1fb0e1ad 100644
--- a/packages/plugins/@nocobase/plugin-users/package.json
+++ b/packages/plugins/@nocobase/plugin-users/package.json
@@ -17,16 +17,16 @@
"react-i18next": "^11.15.1"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/cache": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
"@nocobase/plugin-acl": "workspace:*",
"@nocobase/plugin-auth": "workspace:*",
- "@nocobase/resourcer": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/cache": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/resourcer": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "提供了基础的用户模型，以及创建人和最后更新人字段。",
"displayName.zh-CN": "用户",
diff --git a/packages/plugins/@nocobase/plugin-users/src/client/PasswordField.tsx b/packages/plugins/@nocobase/plugin-users/src/client/PasswordField.tsx
index 61516738f..11992ca5d 100644
--- a/packages/plugins/@nocobase/plugin-users/src/client/PasswordField.tsx
+++ b/packages/plugins/@nocobase/plugin-users/src/client/PasswordField.tsx
@@ -1,6 +1,6 @@
import React, { useEffect } from 'react';
import { Input, Row, Col, Button } from 'antd';
-import { Password, useActionContext } from '@nocobase/client';
+import { Password, useActionContext } from '@tachybase/client';
import { useField } from '@tachybase/schema';
import { Field } from '@tachybase/schema';
import { useUsersTranslation } from './locale';
diff --git a/packages/plugins/@nocobase/plugin-users/src/client/RoleUsersManager.tsx b/packages/plugins/@nocobase/plugin-users/src/client/RoleUsersManager.tsx
index db0b56876..ef39039e4 100644
--- a/packages/plugins/@nocobase/plugin-users/src/client/RoleUsersManager.tsx
+++ b/packages/plugins/@nocobase/plugin-users/src/client/RoleUsersManager.tsx
@@ -10,7 +10,7 @@ import {
useRecord,
useRequest,
useResourceActionContext,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { RolesManagerContext } from '@nocobase/plugin-acl/client';
import { useUsersTranslation } from './locale';
import { getRoleUsersSchema, userCollection } from './schemas/users';
diff --git a/packages/plugins/@nocobase/plugin-users/src/client/UsersManagement.tsx b/packages/plugins/@nocobase/plugin-users/src/client/UsersManagement.tsx
index b1876aa88..0d19a7fd3 100644
--- a/packages/plugins/@nocobase/plugin-users/src/client/UsersManagement.tsx
+++ b/packages/plugins/@nocobase/plugin-users/src/client/UsersManagement.tsx
@@ -1,4 +1,4 @@
-import { SchemaComponent, SchemaComponentContext, useSchemaComponentContext } from '@nocobase/client';
+import { SchemaComponent, SchemaComponentContext, useSchemaComponentContext } from '@tachybase/client';
import React from 'react';
import { usersSchema } from './schemas/users';
import { Card } from 'antd';
diff --git a/packages/plugins/@nocobase/plugin-users/src/client/hooks.ts b/packages/plugins/@nocobase/plugin-users/src/client/hooks.ts
index 766fbec70..4f87f4ada 100644
--- a/packages/plugins/@nocobase/plugin-users/src/client/hooks.ts
+++ b/packages/plugins/@nocobase/plugin-users/src/client/hooks.ts
@@ -3,7 +3,7 @@ import {
useFilterFieldOptions,
useFilterFieldProps,
useResourceActionContext,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { useContext } from 'react';
export const useFilterActionProps = () => {
diff --git a/packages/plugins/@nocobase/plugin-users/src/client/index.ts b/packages/plugins/@nocobase/plugin-users/src/client/index.ts
index 9929c2247..a5db48bd2 100644
--- a/packages/plugins/@nocobase/plugin-users/src/client/index.ts
+++ b/packages/plugins/@nocobase/plugin-users/src/client/index.ts
@@ -1,4 +1,4 @@
-import { Plugin, tval } from '@nocobase/client';
+import { Plugin, tval } from '@tachybase/client';
import { UsersManagement } from './UsersManagement';
import ACLPlugin from '@nocobase/plugin-acl/client';
import { RoleUsersManager } from './RoleUsersManager';
diff --git a/packages/plugins/@nocobase/plugin-users/src/client/schemas/users.ts b/packages/plugins/@nocobase/plugin-users/src/client/schemas/users.ts
index 49c66e37e..ea7bfc913 100644
--- a/packages/plugins/@nocobase/plugin-users/src/client/schemas/users.ts
+++ b/packages/plugins/@nocobase/plugin-users/src/client/schemas/users.ts
@@ -1,5 +1,5 @@
import { ISchema } from '@tachybase/schema';
-import { useActionContext, useCollectionRecord, useRecord, useRequest } from '@nocobase/client';
+import { useActionContext, useCollectionRecord, useRecord, useRequest } from '@tachybase/client';
import { useEffect } from 'react';
import { uid } from '@tachybase/schema';
diff --git a/packages/plugins/@nocobase/plugin-users/src/server/__tests__/actions.test.ts b/packages/plugins/@nocobase/plugin-users/src/server/__tests__/actions.test.ts
index fe9630d3a..8f8335e0e 100644
--- a/packages/plugins/@nocobase/plugin-users/src/server/__tests__/actions.test.ts
+++ b/packages/plugins/@nocobase/plugin-users/src/server/__tests__/actions.test.ts
@@ -1,5 +1,5 @@
-import Database from '@nocobase/database';
-import { createMockServer, MockServer } from '@nocobase/test';
+import Database from '@tachybase/database';
+import { createMockServer, MockServer } from '@tachybase/test';
describe('actions', () => {
let app: MockServer;
diff --git a/packages/plugins/@nocobase/plugin-users/src/server/__tests__/fields.test.ts b/packages/plugins/@nocobase/plugin-users/src/server/__tests__/fields.test.ts
index 69255bb19..eff872b64 100644
--- a/packages/plugins/@nocobase/plugin-users/src/server/__tests__/fields.test.ts
+++ b/packages/plugins/@nocobase/plugin-users/src/server/__tests__/fields.test.ts
@@ -1,5 +1,5 @@
-import Database, { Collection as DBCollection } from '@nocobase/database';
-import { createMockServer, MockServer } from '@nocobase/test';
+import Database, { Collection as DBCollection } from '@tachybase/database';
+import { createMockServer, MockServer } from '@tachybase/test';
describe('createdBy/updatedBy', () => {
let api: MockServer;
diff --git a/packages/plugins/@nocobase/plugin-users/src/server/__tests__/model.test.ts b/packages/plugins/@nocobase/plugin-users/src/server/__tests__/model.test.ts
index fb7317af9..6d5d5d6b2 100644
--- a/packages/plugins/@nocobase/plugin-users/src/server/__tests__/model.test.ts
+++ b/packages/plugins/@nocobase/plugin-users/src/server/__tests__/model.test.ts
@@ -1,5 +1,5 @@
-import Database from '@nocobase/database';
-import { createMockServer, MockServer } from '@nocobase/test';
+import Database from '@tachybase/database';
+import { createMockServer, MockServer } from '@tachybase/test';
import { UserModel } from '../models/UserModel';
describe('models', () => {
diff --git a/packages/plugins/@nocobase/plugin-users/src/server/__tests__/role-users.test.ts b/packages/plugins/@nocobase/plugin-users/src/server/__tests__/role-users.test.ts
index 5bb0589ab..6691e47bb 100644
--- a/packages/plugins/@nocobase/plugin-users/src/server/__tests__/role-users.test.ts
+++ b/packages/plugins/@nocobase/plugin-users/src/server/__tests__/role-users.test.ts
@@ -1,5 +1,5 @@
-import { Database, Repository } from '@nocobase/database';
-import { MockServer, createMockServer } from '@nocobase/test';
+import { Database, Repository } from '@tachybase/database';
+import { MockServer, createMockServer } from '@tachybase/test';
describe('actions', () => {
let app: MockServer;
diff --git a/packages/plugins/@nocobase/plugin-users/src/server/actions/users.ts b/packages/plugins/@nocobase/plugin-users/src/server/actions/users.ts
index a843ce57c..1c35e24ce 100644
--- a/packages/plugins/@nocobase/plugin-users/src/server/actions/users.ts
+++ b/packages/plugins/@nocobase/plugin-users/src/server/actions/users.ts
@@ -1,4 +1,4 @@
-import { Context, DEFAULT_PAGE, DEFAULT_PER_PAGE, Next } from '@nocobase/actions';
+import { Context, DEFAULT_PAGE, DEFAULT_PER_PAGE, Next } from '@tachybase/actions';
export async function updateProfile(ctx: Context, next: Next) {
const { values } = ctx.action.params;
diff --git a/packages/plugins/@nocobase/plugin-users/src/server/collections/users.ts b/packages/plugins/@nocobase/plugin-users/src/server/collections/users.ts
index 1f576adc6..38a5c0aab 100644
--- a/packages/plugins/@nocobase/plugin-users/src/server/collections/users.ts
+++ b/packages/plugins/@nocobase/plugin-users/src/server/collections/users.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
origin: '@nocobase/plugin-users',
diff --git a/packages/plugins/@nocobase/plugin-users/src/server/migrations/20220818072639-add-users-phone-constraint.ts b/packages/plugins/@nocobase/plugin-users/src/server/migrations/20220818072639-add-users-phone-constraint.ts
index 770306b74..86d64d894 100644
--- a/packages/plugins/@nocobase/plugin-users/src/server/migrations/20220818072639-add-users-phone-constraint.ts
+++ b/packages/plugins/@nocobase/plugin-users/src/server/migrations/20220818072639-add-users-phone-constraint.ts
@@ -1,5 +1,5 @@
-import { DataTypes } from '@nocobase/database';
-import { Migration } from '@nocobase/server';
+import { DataTypes } from '@tachybase/database';
+import { Migration } from '@tachybase/server';
export default class AddUsersPhoneMigration extends Migration {
on = 'beforeLoad';
diff --git a/packages/plugins/@nocobase/plugin-users/src/server/migrations/20220818072639-add-users-phone.ts b/packages/plugins/@nocobase/plugin-users/src/server/migrations/20220818072639-add-users-phone.ts
index 9eb68debd..89ba85efb 100644
--- a/packages/plugins/@nocobase/plugin-users/src/server/migrations/20220818072639-add-users-phone.ts
+++ b/packages/plugins/@nocobase/plugin-users/src/server/migrations/20220818072639-add-users-phone.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
export default class AddUsersPhoneMigration extends Migration {
appVersion = '<0.7.5-alpha.1';
diff --git a/packages/plugins/@nocobase/plugin-users/src/server/migrations/20230802170800-add-username-constraint.ts b/packages/plugins/@nocobase/plugin-users/src/server/migrations/20230802170800-add-username-constraint.ts
index f5977d288..34bd8e816 100644
--- a/packages/plugins/@nocobase/plugin-users/src/server/migrations/20230802170800-add-username-constraint.ts
+++ b/packages/plugins/@nocobase/plugin-users/src/server/migrations/20230802170800-add-username-constraint.ts
@@ -1,5 +1,5 @@
-import { DataTypes } from '@nocobase/database';
-import { Migration } from '@nocobase/server';
+import { DataTypes } from '@tachybase/database';
+import { Migration } from '@tachybase/server';
export default class AddUserNameMigration extends Migration {
on = 'beforeLoad';
diff --git a/packages/plugins/@nocobase/plugin-users/src/server/migrations/20230802170800-add-username.ts b/packages/plugins/@nocobase/plugin-users/src/server/migrations/20230802170800-add-username.ts
index 4053d9753..1ac25001e 100644
--- a/packages/plugins/@nocobase/plugin-users/src/server/migrations/20230802170800-add-username.ts
+++ b/packages/plugins/@nocobase/plugin-users/src/server/migrations/20230802170800-add-username.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
export default class AddUserNameMigration extends Migration {
appVersion = '<0.13.0-alpha.1';
diff --git a/packages/plugins/@nocobase/plugin-users/src/server/migrations/20230802183100-update-username.ts b/packages/plugins/@nocobase/plugin-users/src/server/migrations/20230802183100-update-username.ts
index 22db9bd39..c60769ddf 100644
--- a/packages/plugins/@nocobase/plugin-users/src/server/migrations/20230802183100-update-username.ts
+++ b/packages/plugins/@nocobase/plugin-users/src/server/migrations/20230802183100-update-username.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
export default class UpdateUserNameMigration extends Migration {
appVersion = '<0.13.0-alpha.1';
diff --git a/packages/plugins/@nocobase/plugin-users/src/server/migrations/20230908164036-update-username-interface.ts b/packages/plugins/@nocobase/plugin-users/src/server/migrations/20230908164036-update-username-interface.ts
index 01ce9656e..971d8b226 100644
--- a/packages/plugins/@nocobase/plugin-users/src/server/migrations/20230908164036-update-username-interface.ts
+++ b/packages/plugins/@nocobase/plugin-users/src/server/migrations/20230908164036-update-username-interface.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
export default class UpdateUserNameInterfaceMigration extends Migration {
appVersion = '<0.13.0-alpha.10';
diff --git a/packages/plugins/@nocobase/plugin-users/src/server/models/UserModel.ts b/packages/plugins/@nocobase/plugin-users/src/server/models/UserModel.ts
index 93575c9dc..21f3a1534 100644
--- a/packages/plugins/@nocobase/plugin-users/src/server/models/UserModel.ts
+++ b/packages/plugins/@nocobase/plugin-users/src/server/models/UserModel.ts
@@ -1,4 +1,4 @@
-import { Model } from '@nocobase/database';
+import { Model } from '@tachybase/database';
export class UserModel extends Model {
desensitize() {
diff --git a/packages/plugins/@nocobase/plugin-users/src/server/server.ts b/packages/plugins/@nocobase/plugin-users/src/server/server.ts
index 402bfa288..5c3e06ba6 100644
--- a/packages/plugins/@nocobase/plugin-users/src/server/server.ts
+++ b/packages/plugins/@nocobase/plugin-users/src/server/server.ts
@@ -1,10 +1,10 @@
-import { Collection, Op } from '@nocobase/database';
-import { Plugin } from '@nocobase/server';
-import { parse } from '@nocobase/utils';
+import { Collection, Op } from '@tachybase/database';
+import { Plugin } from '@tachybase/server';
+import { parse } from '@tachybase/utils';
import { resolve } from 'path';
import * as actions from './actions/users';
-import { Cache } from '@nocobase/cache';
+import { Cache } from '@tachybase/cache';
import { UserModel } from './models/UserModel';
export default class PluginUsersServer extends Plugin {
diff --git a/packages/plugins/@nocobase/plugin-verification/package.json b/packages/plugins/@nocobase/plugin-verification/package.json
index 0a45d3320..66b2db0b5 100644
--- a/packages/plugins/@nocobase/plugin-verification/package.json
+++ b/packages/plugins/@nocobase/plugin-verification/package.json
@@ -22,13 +22,13 @@
"tencentcloud-sdk-nodejs": "^4.0.525"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/resourcer": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/resourcer": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "验证码配置。",
"displayName.zh-CN": "验证码",
diff --git a/packages/plugins/@nocobase/plugin-verification/src/client/VerificationProviders.tsx b/packages/plugins/@nocobase/plugin-verification/src/client/VerificationProviders.tsx
index 7c3690efa..c119111d7 100644
--- a/packages/plugins/@nocobase/plugin-verification/src/client/VerificationProviders.tsx
+++ b/packages/plugins/@nocobase/plugin-verification/src/client/VerificationProviders.tsx
@@ -1,4 +1,4 @@
-import { SchemaComponent } from '@nocobase/client';
+import { SchemaComponent } from '@tachybase/client';
import React from 'react';
import { Card } from 'antd';
diff --git a/packages/plugins/@nocobase/plugin-verification/src/client/index.tsx b/packages/plugins/@nocobase/plugin-verification/src/client/index.tsx
index 87d4b8be9..c0b4738ef 100644
--- a/packages/plugins/@nocobase/plugin-verification/src/client/index.tsx
+++ b/packages/plugins/@nocobase/plugin-verification/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import { VerificationProviders } from './VerificationProviders';
import { NAMESPACE } from './locale';
diff --git a/packages/plugins/@nocobase/plugin-verification/src/client/locale/index.ts b/packages/plugins/@nocobase/plugin-verification/src/client/locale/index.ts
index 7a79087b8..8e4502007 100644
--- a/packages/plugins/@nocobase/plugin-verification/src/client/locale/index.ts
+++ b/packages/plugins/@nocobase/plugin-verification/src/client/locale/index.ts
@@ -1,4 +1,4 @@
-import { i18n } from '@nocobase/client';
+import { i18n } from '@tachybase/client';
import { useTranslation } from 'react-i18next';
export const NAMESPACE = 'verification';
diff --git a/packages/plugins/@nocobase/plugin-verification/src/client/providerTypes/index.ts b/packages/plugins/@nocobase/plugin-verification/src/client/providerTypes/index.ts
index ee2fa7347..694362238 100644
--- a/packages/plugins/@nocobase/plugin-verification/src/client/providerTypes/index.ts
+++ b/packages/plugins/@nocobase/plugin-verification/src/client/providerTypes/index.ts
@@ -1,5 +1,5 @@
import { ISchema } from '@tachybase/schema';
-import { Registry } from '@nocobase/utils/client';
+import { Registry } from '@tachybase/utils/client';
import SMSAliyun from './sms-aliyun';
import SMSTencent from './sms-tencent';
diff --git a/packages/plugins/@nocobase/plugin-verification/src/client/schemas/providers.ts b/packages/plugins/@nocobase/plugin-verification/src/client/schemas/providers.ts
index 305dd9830..e2b9c0d3d 100644
--- a/packages/plugins/@nocobase/plugin-verification/src/client/schemas/providers.ts
+++ b/packages/plugins/@nocobase/plugin-verification/src/client/schemas/providers.ts
@@ -1,5 +1,5 @@
import { uid } from '@tachybase/schema';
-import { useActionContext, useRequest } from '@nocobase/client';
+import { useActionContext, useRequest } from '@tachybase/client';
import { NAMESPACE } from '../locale';
const collection = {
diff --git a/packages/plugins/@nocobase/plugin-verification/src/server/Plugin.ts b/packages/plugins/@nocobase/plugin-verification/src/server/Plugin.ts
index f80b0f837..69adfaaa2 100644
--- a/packages/plugins/@nocobase/plugin-verification/src/server/Plugin.ts
+++ b/packages/plugins/@nocobase/plugin-verification/src/server/Plugin.ts
@@ -1,10 +1,10 @@
import path from 'path';
-import { Context } from '@nocobase/actions';
-import { Op } from '@nocobase/database';
-import { HandlerType } from '@nocobase/resourcer';
-import { Plugin } from '@nocobase/server';
-import { Registry } from '@nocobase/utils';
+import { Context } from '@tachybase/actions';
+import { Op } from '@tachybase/database';
+import { HandlerType } from '@tachybase/resourcer';
+import { Plugin } from '@tachybase/server';
+import { Registry } from '@tachybase/utils';
import { Provider, namespace } from '.';
import initActions from './actions';
diff --git a/packages/plugins/@nocobase/plugin-verification/src/server/__tests__/Plugin.test.ts b/packages/plugins/@nocobase/plugin-verification/src/server/__tests__/Plugin.test.ts
index f99f7675d..b6a30ac8b 100644
--- a/packages/plugins/@nocobase/plugin-verification/src/server/__tests__/Plugin.test.ts
+++ b/packages/plugins/@nocobase/plugin-verification/src/server/__tests__/Plugin.test.ts
@@ -1,5 +1,5 @@
-import Database from '@nocobase/database';
-import { MockServer } from '@nocobase/test';
+import Database from '@tachybase/database';
+import { MockServer } from '@tachybase/test';
import Plugin, { Provider } from '..';
diff --git a/packages/plugins/@nocobase/plugin-verification/src/server/__tests__/collections/authors.ts b/packages/plugins/@nocobase/plugin-verification/src/server/__tests__/collections/authors.ts
index ab6dbdb8f..e80fdc2ad 100644
--- a/packages/plugins/@nocobase/plugin-verification/src/server/__tests__/collections/authors.ts
+++ b/packages/plugins/@nocobase/plugin-verification/src/server/__tests__/collections/authors.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
export default {
name: 'authors',
diff --git a/packages/plugins/@nocobase/plugin-verification/src/server/__tests__/index.ts b/packages/plugins/@nocobase/plugin-verification/src/server/__tests__/index.ts
index f2e469a9c..f6c92923f 100644
--- a/packages/plugins/@nocobase/plugin-verification/src/server/__tests__/index.ts
+++ b/packages/plugins/@nocobase/plugin-verification/src/server/__tests__/index.ts
@@ -1,7 +1,7 @@
-import { MockServer, createMockServer } from '@nocobase/test';
+import { MockServer, createMockServer } from '@tachybase/test';
import path from 'path';
-import { ApplicationOptions } from '@nocobase/server';
+import { ApplicationOptions } from '@tachybase/server';
export function sleep(ms: number) {
return new Promise((resolve) => {
diff --git a/packages/plugins/@nocobase/plugin-verification/src/server/actions/verifications.ts b/packages/plugins/@nocobase/plugin-verification/src/server/actions/verifications.ts
index 816a7b813..5d4196429 100644
--- a/packages/plugins/@nocobase/plugin-verification/src/server/actions/verifications.ts
+++ b/packages/plugins/@nocobase/plugin-verification/src/server/actions/verifications.ts
@@ -1,5 +1,5 @@
-import actions, { Context, Next } from '@nocobase/actions';
-import { Op } from '@nocobase/database';
+import actions, { Context, Next } from '@tachybase/actions';
+import { Op } from '@tachybase/database';
import dayjs from 'dayjs';
import { randomInt, randomUUID } from 'crypto';
import { promisify } from 'util';
diff --git a/packages/plugins/@nocobase/plugin-verification/src/server/collections/verifications.ts b/packages/plugins/@nocobase/plugin-verification/src/server/collections/verifications.ts
index c5c14182a..ca9ead990 100644
--- a/packages/plugins/@nocobase/plugin-verification/src/server/collections/verifications.ts
+++ b/packages/plugins/@nocobase/plugin-verification/src/server/collections/verifications.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
dumpRules: {
diff --git a/packages/plugins/@nocobase/plugin-verification/src/server/collections/verifications_providers.ts b/packages/plugins/@nocobase/plugin-verification/src/server/collections/verifications_providers.ts
index 037503b4c..e6c6c64e8 100644
--- a/packages/plugins/@nocobase/plugin-verification/src/server/collections/verifications_providers.ts
+++ b/packages/plugins/@nocobase/plugin-verification/src/server/collections/verifications_providers.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
dumpRules: {
diff --git a/packages/plugins/@tachybase/plugin-field-markdown-vditor/build.config.ts b/packages/plugins/@tachybase/plugin-field-markdown-vditor/build.config.ts
index 696749bed..2eacb1a5a 100644
--- a/packages/plugins/@tachybase/plugin-field-markdown-vditor/build.config.ts
+++ b/packages/plugins/@tachybase/plugin-field-markdown-vditor/build.config.ts
@@ -1,4 +1,4 @@
-import { defineConfig } from '@nocobase/build';
+import { defineConfig } from '@tachybase/build';
import fs from 'fs/promises';
import path from 'path';
diff --git a/packages/plugins/@tachybase/plugin-field-markdown-vditor/package.json b/packages/plugins/@tachybase/plugin-field-markdown-vditor/package.json
index c517f2b97..8091e6245 100644
--- a/packages/plugins/@tachybase/plugin-field-markdown-vditor/package.json
+++ b/packages/plugins/@tachybase/plugin-field-markdown-vditor/package.json
@@ -16,9 +16,10 @@
"vditor": "^3.10.3"
},
"peerDependencies": {
- "@nocobase/client": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*"
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*"
},
"description.zh-CN": "用于存储 Markdown，并使用 Vditor 编辑器渲染，支持常见 Markdown 语法，如列表，代码，引用等，并支持上传图片，录音等。同时可以做到即时渲染，所见即所得。",
"displayName.zh-CN": "数据表字段：Markdown(Vditor)"
diff --git a/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/components/Display.tsx b/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/components/Display.tsx
index dd8b517ce..50f732a6c 100644
--- a/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/components/Display.tsx
+++ b/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/components/Display.tsx
@@ -1,5 +1,5 @@
import { Field, useField } from '@tachybase/schema';
-import { withDynamicSchemaProps } from '@nocobase/client';
+import { withDynamicSchemaProps } from '@tachybase/client';
import { Popover } from 'antd';
import React, { CSSProperties, useCallback, useEffect, useRef, useState } from 'react';
import Vditor from 'vditor';
diff --git a/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/components/Edit.tsx b/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/components/Edit.tsx
index 7240f62f7..e6839b564 100644
--- a/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/components/Edit.tsx
+++ b/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/components/Edit.tsx
@@ -1,4 +1,4 @@
-import { useAPIClient, useApp, withDynamicSchemaProps } from '@nocobase/client';
+import { useAPIClient, useApp, withDynamicSchemaProps } from '@tachybase/client';
import React, { useEffect, useLayoutEffect, useRef } from 'react';
import Vditor from 'vditor';
import { defaultToolbar } from '../interfaces/markdown-vditor';
diff --git a/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/components/const.ts b/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/components/const.ts
index 0d02033e8..a5ee31c48 100644
--- a/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/components/const.ts
+++ b/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/components/const.ts
@@ -1,4 +1,4 @@
-import { usePlugin } from '@nocobase/client';
+import { usePlugin } from '@tachybase/client';
import { PluginFieldMarkdownVditorClient } from '../';
export const useCDN = () => {
diff --git a/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/components/index.tsx b/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/components/index.tsx
index 3816fb0ff..586e57082 100644
--- a/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/components/index.tsx
+++ b/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/components/index.tsx
@@ -1,5 +1,5 @@
import { connect, mapReadPretty } from '@tachybase/schema';
-import { withDynamicSchemaProps } from '@nocobase/client';
+import { withDynamicSchemaProps } from '@tachybase/client';
import { Display } from './Display';
import { Edit } from './Edit';
diff --git a/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/components/style.ts b/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/components/style.ts
index 6362855af..a65f24fcb 100644
--- a/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/components/style.ts
+++ b/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/components/style.ts
@@ -1,4 +1,4 @@
-import { genStyleHook } from '@nocobase/client';
+import { genStyleHook } from '@tachybase/client';
export default genStyleHook('nb-field-markdown-vditor', (token) => {
const { componentCls } = token;
diff --git a/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/index.tsx b/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/index.tsx
index 974cc0ce8..0bd7631c6 100644
--- a/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/index.tsx
+++ b/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import 'vditor/dist/index.css';
import { MarkdownVditor } from './components';
import { MarkdownVditorFieldInterface } from './interfaces/markdown-vditor';
diff --git a/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/interfaces/markdown-vditor.tsx b/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/interfaces/markdown-vditor.tsx
index 0b37858ef..b55afca24 100644
--- a/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/interfaces/markdown-vditor.tsx
+++ b/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/interfaces/markdown-vditor.tsx
@@ -1,4 +1,4 @@
-import { CollectionFieldInterface, interfacesProperties } from '@nocobase/client';
+import { CollectionFieldInterface, interfacesProperties } from '@tachybase/client';
import { generateNTemplate } from '../locale';
import { ISchema } from '@tachybase/schema';
diff --git a/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/locale/index.ts b/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/locale/index.ts
index 3527fecf3..65aeddf5d 100644
--- a/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/locale/index.ts
+++ b/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/client/locale/index.ts
@@ -1,4 +1,4 @@
-import { tval } from '@nocobase/client';
+import { tval } from '@tachybase/client';
const NAMESPACE = 'field-markdown-vditor';
diff --git a/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/server/markdown-vditor-field.ts b/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/server/markdown-vditor-field.ts
index c53ca9241..7a39d82f4 100644
--- a/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/server/markdown-vditor-field.ts
+++ b/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/server/markdown-vditor-field.ts
@@ -1,4 +1,4 @@
-import { DataTypes, Field } from '@nocobase/database';
+import { DataTypes, Field } from '@tachybase/database';
export class MarkdownVditorField extends Field {
get dataType() {
diff --git a/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/server/plugin.ts b/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/server/plugin.ts
index d6c05326c..d4ae9cb1b 100644
--- a/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/server/plugin.ts
+++ b/packages/plugins/@tachybase/plugin-field-markdown-vditor/src/server/plugin.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/server';
+import { Plugin } from '@tachybase/server';
export class PluginFieldMarkdownVditorServer extends Plugin {
async afterAdd() {}
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/package.json b/packages/plugins/@tachybase/plugin-mobile-client/package.json
index 1af3c8867..bcd84cb71 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/package.json
+++ b/packages/plugins/@tachybase/plugin-mobile-client/package.json
@@ -24,11 +24,11 @@
"react-router-dom": "6.x"
},
"peerDependencies": {
- "@nocobase/client": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/client": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "提供移动端页面配置的能力。",
"displayName.zh-CN": "移动端"
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/configuration/App.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/configuration/App.tsx
index 2e1b576e8..9022208bb 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/configuration/App.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/configuration/App.tsx
@@ -1,4 +1,4 @@
-import { useApp } from '@nocobase/client';
+import { useApp } from '@tachybase/client';
import { Card, Form, Input } from 'antd';
import React, { useMemo } from 'react';
import { useTranslation } from '../locale';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/assets/svg/index.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/assets/svg/index.tsx
index f8900f6c8..a603503c7 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/assets/svg/index.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/assets/svg/index.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { Icon } from '@nocobase/client';
+import { Icon } from '@tachybase/client';
import NoticeSvg from './notice.svg';
import SwiperSvg from './swiper.svg';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/index.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/index.tsx
index cd9671b4f..aadb68c09 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/index.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/index.tsx
@@ -1,4 +1,4 @@
-import { SchemaComponentOptions } from '@nocobase/client';
+import { SchemaComponentOptions } from '@tachybase/client';
import React from 'react';
import {
MMenuBlockInitializer,
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/container/Container.Designer.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/container/Container.Designer.tsx
index 80462a073..6d000ee99 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/container/Container.Designer.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/container/Container.Designer.tsx
@@ -1,7 +1,7 @@
import { MenuOutlined } from '@ant-design/icons';
import { useField, useFieldSchema } from '@tachybase/schema';
import { uid } from '@tachybase/schema';
-import { SchemaSettingsDropdown, SchemaSettingsSwitchItem, useDesignable } from '@nocobase/client';
+import { SchemaSettingsDropdown, SchemaSettingsSwitchItem, useDesignable } from '@tachybase/client';
import { Button } from 'antd';
import React from 'react';
import { useNavigate } from 'react-router-dom';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/container/Container.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/container/Container.tsx
index 4e32eca97..86d12f679 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/container/Container.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/container/Container.tsx
@@ -1,5 +1,5 @@
import { useField, useFieldSchema } from '@tachybase/schema';
-import { cx, SchemaComponent, SortableItem, useDesigner, useToken } from '@nocobase/client';
+import { cx, SchemaComponent, SortableItem, useDesigner, useToken } from '@tachybase/client';
import React, { useEffect } from 'react';
import { Navigate, useLocation, useNavigate, useParams } from 'react-router-dom';
import { ContainerDesigner } from './Container.Designer';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/container/style.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/container/style.ts
index e8db45b3c..ba1b4c3ad 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/container/style.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/container/style.ts
@@ -1,4 +1,4 @@
-import { createStyles } from '@nocobase/client';
+import { createStyles } from '@tachybase/client';
const useStyles = createStyles(({ token, css }) => {
return {
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/header/Header.Designer.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/header/Header.Designer.tsx
index 477e201b6..e0f919a9e 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/header/Header.Designer.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/header/Header.Designer.tsx
@@ -1,6 +1,6 @@
import { Switch } from '@tachybase/components';
import { useField } from '@tachybase/schema';
-import { GeneralSchemaDesigner, SchemaSettingsModalItem } from '@nocobase/client';
+import { GeneralSchemaDesigner, SchemaSettingsModalItem } from '@tachybase/client';
import React from 'react';
import { useTranslation } from '../../../../locale';
import { useSchemaPatch } from '../../hooks';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/header/Header.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/header/Header.tsx
index 30eaa6aa0..11d37d344 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/header/Header.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/header/Header.tsx
@@ -1,5 +1,5 @@
import { useField } from '@tachybase/schema';
-import { cx, SortableItem, useCompile, useDesigner, useDocumentTitle, useToken } from '@nocobase/client';
+import { cx, SortableItem, useCompile, useDesigner, useDocumentTitle, useToken } from '@tachybase/client';
import { NavBar, NavBarProps } from 'antd-mobile';
import React, { useEffect, useMemo } from 'react';
import { useNavigate } from 'react-router-dom';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.configure.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.configure.ts
index 825f18d23..ad7dd8214 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.configure.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.configure.ts
@@ -1,4 +1,4 @@
-import { SchemaInitializer, useCollection, useCollectionManager } from '@nocobase/client';
+import { SchemaInitializer, useCollection, useCollectionManager } from '@tachybase/client';
import { useIsMobile } from '../tab-search/components/field-item/hooks';
import { canBeOptionalField, canBeRelatedField } from '../tab-search/utils';
import { createSchemaImageSearchItem } from './search-item/ImageSearchItem.schema';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.initializer.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.initializer.tsx
index 256d925da..11ac830c5 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.initializer.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.initializer.tsx
@@ -1,4 +1,4 @@
-import { DataBlockInitializer, useSchemaInitializer, useSchemaInitializerItem } from '@nocobase/client';
+import { DataBlockInitializer, useSchemaInitializer, useSchemaInitializerItem } from '@tachybase/client';
import React from 'react';
import { createSchemaImageSearchBlock } from './ImageSearch.schema';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.provider.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.provider.tsx
index 10a9a0f83..6c832a2f9 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.provider.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.provider.tsx
@@ -1,4 +1,4 @@
-import { DataBlockProvider } from '@nocobase/client';
+import { DataBlockProvider } from '@tachybase/client';
import React from 'react';
export const ImageSearchProvider = ({ collection, children }) => {
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.schema.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.schema.ts
index 8ae5dd1f4..5c038cd6f 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.schema.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.schema.ts
@@ -1,5 +1,5 @@
import { ISchema } from '@tachybase/schema';
-import { uid } from '@nocobase/utils/client';
+import { uid } from '@tachybase/utils/client';
interface OptionsType {
collection: string;
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.view.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.view.tsx
index 7d2ee09eb..c8793bf49 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.view.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/ImageSearch.view.tsx
@@ -1,4 +1,4 @@
-import { useDesigner, useSchemaInitializerRender } from '@nocobase/client';
+import { useDesigner, useSchemaInitializerRender } from '@tachybase/client';
import { RecursionField, useFieldSchema } from '@tachybase/schema';
import React from 'react';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/hooks/useAction.ImageSearchItemView.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/hooks/useAction.ImageSearchItemView.ts
index a851d4cc0..716b6b1e6 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/hooks/useAction.ImageSearchItemView.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/hooks/useAction.ImageSearchItemView.ts
@@ -1,4 +1,4 @@
-import { useCollection, useDesigner } from '@nocobase/client';
+import { useCollection, useDesigner } from '@tachybase/client';
import { useFieldSchema } from '@tachybase/schema';
import React from 'react';
import { useTranslation } from '../../../../../locale';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/hooks/useSelect.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/hooks/useSelect.ts
index 878aaedaa..deb48a182 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/hooks/useSelect.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/hooks/useSelect.ts
@@ -1,4 +1,4 @@
-import { findFilterTargets, mergeFilter, useCollection, useFilterBlock } from '@nocobase/client';
+import { findFilterTargets, mergeFilter, useCollection, useFilterBlock } from '@tachybase/client';
import { useFieldSchema } from '@tachybase/schema';
import _ from 'lodash';
import { useMemo } from 'react';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.intializer.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.intializer.tsx
index d78dffbce..4c9b7aad7 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.intializer.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.intializer.tsx
@@ -3,7 +3,7 @@ import {
useCurrentSchema,
useSchemaInitializer,
useSchemaInitializerItem,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { merge } from '@tachybase/schema';
import React from 'react';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.schema.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.schema.ts
index 6ecdfd648..1ef5cc36c 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.schema.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.schema.ts
@@ -1,4 +1,4 @@
-import { SchemaInitializerItemType } from '@nocobase/client';
+import { SchemaInitializerItemType } from '@tachybase/client';
interface OptionsType {
label?: string;
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.setting.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.setting.tsx
index e317371c2..ce0b39d71 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.setting.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.setting.tsx
@@ -6,7 +6,7 @@ import {
useCompile,
useDesignable,
useFormBlockContext,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { useField, useFieldSchema } from '@tachybase/schema';
import _ from 'lodash';
import { useTranslation } from '../../../../../locale';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.toolbar.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.toolbar.tsx
index 03f81c074..d9b5446d4 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.toolbar.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.toolbar.tsx
@@ -1,4 +1,4 @@
-import { SchemaToolbar } from '@nocobase/client';
+import { SchemaToolbar } from '@tachybase/client';
import React from 'react';
export const ImageSearchItemToolbar = (props) => {
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.view.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.view.tsx
index a9f5c7bc8..cfe780825 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.view.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/ImageSearchItem.view.tsx
@@ -1,4 +1,4 @@
-import { SortableItem, css, withDynamicSchemaProps } from '@nocobase/client';
+import { SortableItem, css, withDynamicSchemaProps } from '@tachybase/client';
import { Image, JumboTabs } from 'antd-mobile';
import React from 'react';
import { useActionImageSearchItemView } from '../hooks/useAction.ImageSearchItemView';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/useProps.Optional.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/useProps.Optional.ts
index 7d9ffb01c..6f277b8ec 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/useProps.Optional.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/useProps.Optional.ts
@@ -1,5 +1,5 @@
import { useMemo } from 'react';
-import { useCollection, useCollectionManager } from '@nocobase/client';
+import { useCollection, useCollectionManager } from '@tachybase/client';
import { useFieldSchema } from '@tachybase/schema';
import _ from 'lodash';
import { useTabSearchCollapsibleInputItem } from '../../tab-search/components/field-item/hooks';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/useProps.Related.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/useProps.Related.tsx
index 81169d13e..962ba1dbc 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/useProps.Related.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/image-search/search-item/useProps.Related.tsx
@@ -1,5 +1,5 @@
// 关系字段类型
-import { useCollection, useCollectionManager, useDataSourceHeaders, useRequest } from '@nocobase/client';
+import { useCollection, useCollectionManager, useDataSourceHeaders, useRequest } from '@tachybase/client';
import { useField, useFieldSchema } from '@tachybase/schema';
import { useEffect, useMemo } from 'react';
import { canBeRelatedField } from '../../tab-search/utils';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.Designer.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.Designer.tsx
index 8be24989a..91547cd6d 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.Designer.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.Designer.tsx
@@ -1,6 +1,6 @@
import { MenuOutlined } from '@ant-design/icons';
import { useField, useFieldSchema } from '@tachybase/schema';
-import { SchemaSettingsDropdown, SchemaSettingsRemove, useDesignable } from '@nocobase/client';
+import { SchemaSettingsDropdown, SchemaSettingsRemove, useDesignable } from '@tachybase/client';
import { Button } from 'antd';
import React from 'react';
import { useTranslation } from '../../../../locale';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.Item.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.Item.tsx
index cec81b366..1918e457f 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.Item.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.Item.tsx
@@ -9,7 +9,7 @@ import {
cx,
useCompile,
useDesigner,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { List, ListItemProps } from 'antd-mobile';
import React from 'react';
import { useLocation, useNavigate, useParams } from 'react-router-dom';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.tsx
index 0a35cf550..84eb3bbe0 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/menu/Menu.tsx
@@ -7,7 +7,7 @@ import {
SortableItem,
useDesignable,
useDesigner,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { List } from 'antd-mobile';
import React from 'react';
import { useTranslation } from '../../../../locale';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/menu/MenuBlockInitializer.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/menu/MenuBlockInitializer.tsx
index 6e7b254a2..9aeeb1d91 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/menu/MenuBlockInitializer.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/menu/MenuBlockInitializer.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { MenuOutlined } from '@ant-design/icons';
-import { SchemaInitializerItem, useSchemaInitializer, useSchemaInitializerItem } from '@nocobase/client';
+import { SchemaInitializerItem, useSchemaInitializer, useSchemaInitializerItem } from '@tachybase/client';
export const MMenuBlockInitializer = () => {
const itemConfig = useSchemaInitializerItem();
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/menu/style.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/menu/style.ts
index 4ba46e9b2..6d1c418d3 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/menu/style.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/menu/style.ts
@@ -1,4 +1,4 @@
-import { createStyles } from '@nocobase/client';
+import { createStyles } from '@tachybase/client';
const useStyles = createStyles(({ token, css }) => {
return {
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/notice/schema-create/createGridCardBlockSchma.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/notice/schema-create/createGridCardBlockSchma.ts
index d1fac8170..cfcdb672d 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/notice/schema-create/createGridCardBlockSchma.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/notice/schema-create/createGridCardBlockSchma.ts
@@ -1,5 +1,5 @@
import { ISchema } from '@tachybase/schema';
-import { uid } from '@nocobase/utils/client';
+import { uid } from '@tachybase/utils/client';
export const createGridCardBlockSchema = (options, componentName) => {
const {
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/notice/schema-initializer/NoticeBlockInitializer.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/notice/schema-initializer/NoticeBlockInitializer.tsx
index 74831abb4..ebb8ed9f9 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/notice/schema-initializer/NoticeBlockInitializer.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/notice/schema-initializer/NoticeBlockInitializer.tsx
@@ -5,7 +5,7 @@ import {
useCollectionManager,
useSchemaInitializer,
useSchemaInitializerItem,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { NoticeBar } from 'antd-mobile';
import { createGridCardBlockSchema } from '../schema-create/createGridCardBlockSchma';
import { NoticeIcon } from '../../../../assets/svg';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/page/Page.Designer.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/page/Page.Designer.tsx
index 451549e67..7fe34dfdc 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/page/Page.Designer.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/page/Page.Designer.tsx
@@ -1,7 +1,7 @@
import { MenuOutlined } from '@ant-design/icons';
import { useField, useFieldSchema } from '@tachybase/schema';
import { uid } from '@tachybase/schema';
-import { SchemaSettingsDropdown, SchemaSettingsSwitchItem, useDesignable } from '@nocobase/client';
+import { SchemaSettingsDropdown, SchemaSettingsSwitchItem, useDesignable } from '@tachybase/client';
import { Button } from 'antd';
import React from 'react';
import { generateNTemplate, useTranslation } from '../../../../locale';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/page/Page.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/page/Page.tsx
index e979e5791..e4de87916 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/page/Page.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/page/Page.tsx
@@ -7,7 +7,7 @@ import {
css,
cx,
useDesigner,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { TabsProps } from 'antd';
import React, { useCallback } from 'react';
import { useSearchParams } from 'react-router-dom';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/page/style.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/page/style.ts
index 6625d0654..9518ae7dc 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/page/style.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/page/style.ts
@@ -1,4 +1,4 @@
-import { createStyles } from '@nocobase/client';
+import { createStyles } from '@tachybase/client';
const useStyles = createStyles(({ token, css }) => {
return {
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/settings/Settings.Designer.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/settings/Settings.Designer.tsx
index f8f60cf82..0a01a4c10 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/settings/Settings.Designer.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/settings/Settings.Designer.tsx
@@ -1,4 +1,4 @@
-import { GeneralSchemaDesigner, SchemaSettingsRemove } from '@nocobase/client';
+import { GeneralSchemaDesigner, SchemaSettingsRemove } from '@tachybase/client';
import React from 'react';
import { useTranslation } from '../../../../locale';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/settings/Settings.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/settings/Settings.tsx
index 60ed61c11..4ce854248 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/settings/Settings.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/settings/Settings.tsx
@@ -1,4 +1,4 @@
-import { css, cx, SettingsMenu, SortableItem, useDesigner } from '@nocobase/client';
+import { css, cx, SettingsMenu, SortableItem, useDesigner } from '@tachybase/client';
import React from 'react';
import { SettingsDesigner } from './Settings.Designer';
export const InternalSettings = () => {
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/settings/SettingsBlockInitializer.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/settings/SettingsBlockInitializer.tsx
index 668e985f5..207f844a6 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/settings/SettingsBlockInitializer.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/settings/SettingsBlockInitializer.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { SettingOutlined } from '@ant-design/icons';
-import { SchemaInitializerItem, useSchemaInitializer, useSchemaInitializerItem } from '@nocobase/client';
+import { SchemaInitializerItem, useSchemaInitializer, useSchemaInitializerItem } from '@tachybase/client';
export const MSettingsBlockInitializer = () => {
const itemConfig = useSchemaInitializerItem();
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperBlock.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperBlock.tsx
index 5b48f938f..37cafd3e6 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperBlock.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperBlock.tsx
@@ -1,4 +1,4 @@
-import { BlockItem, css, useDesignable, useRequest, withDynamicSchemaProps } from '@nocobase/client';
+import { BlockItem, css, useDesignable, useRequest, withDynamicSchemaProps } from '@tachybase/client';
import { Swiper } from 'antd-mobile';
import React from 'react';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperBlockInitializer.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperBlockInitializer.tsx
index 47f08b4f8..9173a24e5 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperBlockInitializer.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperBlockInitializer.tsx
@@ -4,7 +4,7 @@ import {
useCollectionManager,
useSchemaInitializer,
useSchemaInitializerItem,
-} from '@nocobase/client';
+} from '@tachybase/client';
import React from 'react';
import { ISchema } from '@tachybase/schema';
import { Toast } from 'antd-mobile';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperFieldSettings.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperFieldSettings.tsx
index 7f554f289..2014ea7d9 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperFieldSettings.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperFieldSettings.tsx
@@ -5,7 +5,7 @@ import {
useCompile,
useDesignable,
useFormBlockContext,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { useField, useFieldSchema } from '@tachybase/schema';
import _ from 'lodash';
import { useTranslation } from '../../../../locale';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperPage.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperPage.tsx
index 98f444987..afed96093 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperPage.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/SwiperPage.tsx
@@ -1,4 +1,4 @@
-import { CollectionRecordProvider, DataBlockProvider, RemoteSchemaComponent } from '@nocobase/client';
+import { CollectionRecordProvider, DataBlockProvider, RemoteSchemaComponent } from '@tachybase/client';
import React from 'react';
import { useParams } from 'react-router-dom';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/useSwiperBlockProps.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/useSwiperBlockProps.ts
index 5a9d2b19a..6488c3c50 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/useSwiperBlockProps.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/swiper/useSwiperBlockProps.ts
@@ -1,7 +1,7 @@
import { useFieldSchema } from '@tachybase/schema';
import { useNavigate } from 'react-router-dom';
import React, { useEffect } from 'react';
-import { useCollection, useDesignable, useRequest } from '@nocobase/client';
+import { useCollection, useDesignable, useRequest } from '@tachybase/client';
export const useSwiperBlockProps = () => {
const fieldSchema = useFieldSchema();
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-bar/TabBar.Item.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-bar/TabBar.Item.tsx
index 77756db1f..0168cef31 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-bar/TabBar.Item.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-bar/TabBar.Item.tsx
@@ -7,7 +7,7 @@ import {
SchemaSettingsRemove,
SortableItem,
useDesigner,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { TabBarItemProps } from 'antd-mobile';
import React from 'react';
import { useTranslation } from '../../../../locale';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-bar/TabBar.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-bar/TabBar.tsx
index 3d874528e..36d969617 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-bar/TabBar.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-bar/TabBar.tsx
@@ -10,7 +10,7 @@ import {
SortableItem,
useCompile,
useDesignable,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { TabBar } from 'antd-mobile';
import React, { useCallback } from 'react';
import { useNavigate, useParams } from 'react-router-dom';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/TabSearchAction.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/TabSearchAction.ts
index 9ad958f33..2eba80036 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/TabSearchAction.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/TabSearchAction.ts
@@ -1,4 +1,4 @@
-import { useDesigner, useSchemaInitializerRender } from '@nocobase/client';
+import { useDesigner, useSchemaInitializerRender } from '@tachybase/client';
import { useFieldSchema } from '@tachybase/schema';
import { isTabSearchCollapsibleInputItem } from '../utils';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputItem.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputItem.tsx
index 67e5ad6ce..f1f933591 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputItem.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputItem.tsx
@@ -1,4 +1,4 @@
-import { SortableItem, withDynamicSchemaProps } from '@nocobase/client';
+import { SortableItem, withDynamicSchemaProps } from '@tachybase/client';
import { ConfigProvider, Row } from 'antd';
import React from 'react';
import { IButton, IInput, ISelect } from './TabSearchCollapsibleInputItemChild';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputItemAction.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputItemAction.ts
index f9b42c43c..b5f09104c 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputItemAction.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputItemAction.ts
@@ -1,6 +1,6 @@
import { useMemo, useRef, useState } from 'react';
import { useFieldSchema } from '@tachybase/schema';
-import { useCollection, useCollectionManager, useDesignable, useDesigner } from '@nocobase/client';
+import { useCollection, useCollectionManager, useDesignable, useDesigner } from '@tachybase/client';
import {
canBeCalculatedField,
canBeDataField,
@@ -9,7 +9,7 @@ import {
isTabSearchCollapsibleInputItem,
} from '../../utils';
import { useTabSearchCollapsibleInputItem } from './hooks';
-import { dayjs } from '@nocobase/utils/client';
+import { dayjs } from '@tachybase/utils/client';
export const useTabSearchCollapsibleInputItemAction = (props) => {
const { onSelected } = useTabSearchCollapsibleInputItem();
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputMItem.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputMItem.tsx
index 701677c83..7f784b758 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputMItem.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputMItem.tsx
@@ -1,4 +1,4 @@
-import { SortableItem, css, withDynamicSchemaProps } from '@nocobase/client';
+import { SortableItem, css, withDynamicSchemaProps } from '@tachybase/client';
import { Checkbox, Grid, Switch } from 'antd-mobile';
import React from 'react';
import { useTabSearchCollapsibleInputItemAction } from './TabSearchCollapsibleInputItemAction';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputMItemChild.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputMItemChild.tsx
index d22007359..e861a8e55 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputMItemChild.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchCollapsibleInputMItemChild.tsx
@@ -4,7 +4,7 @@ import { Grid, Divider, Picker, Input, Space, ActionSheet, DatePicker, CalendarP
import { DownOutline } from 'antd-mobile-icons';
import type { Action } from 'antd-mobile/es/components/action-sheet';
import { changFormat, convertFormat } from '../../utils';
-import { dayjs } from '@nocobase/utils/client';
+import { dayjs } from '@tachybase/utils/client';
export const ISelect = (props) => {
const { options, onChange, customLabelKey } = props;
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldItem.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldItem.tsx
index 8f17f0597..5b91430e1 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldItem.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldItem.tsx
@@ -1,4 +1,4 @@
-import { SortableItem, withDynamicSchemaProps } from '@nocobase/client';
+import { SortableItem, withDynamicSchemaProps } from '@tachybase/client';
import { ConfigProvider, Menu } from 'antd';
import React from 'react';
import { useTabSearchFieldItemAction } from './TabSearchFieldItemAction';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldItemAction.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldItemAction.ts
index cb77fef8c..dcab99ce4 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldItemAction.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldItemAction.ts
@@ -1,6 +1,6 @@
import React from 'react';
import { MenuProps } from 'antd';
-import { useCollection, useDesigner } from '@nocobase/client';
+import { useCollection, useDesigner } from '@tachybase/client';
import { useFieldSchema } from '@tachybase/schema';
import { useTranslation } from '../../../../../../locale';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldItemProps.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldItemProps.ts
index 3c7f2b829..1af9f2e51 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldItemProps.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldItemProps.ts
@@ -1,5 +1,5 @@
import { useMemo } from 'react';
-import { useCollection, useCollectionManager } from '@nocobase/client';
+import { useCollection, useCollectionManager } from '@tachybase/client';
import { useFieldSchema } from '@tachybase/schema';
import _ from 'lodash';
import { useTabSearchCollapsibleInputItem } from './hooks';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldMItem.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldMItem.tsx
index 3cddd521f..20cfa57ae 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldMItem.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSearchFieldMItem.tsx
@@ -1,4 +1,4 @@
-import { SortableItem, withDynamicSchemaProps } from '@nocobase/client';
+import { SortableItem, withDynamicSchemaProps } from '@tachybase/client';
import React from 'react';
import { useTabSearchFieldItemAction } from './TabSearchFieldItemAction';
import { Tabs } from 'antd-mobile';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSerachFieldItemRelatedProps.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSerachFieldItemRelatedProps.tsx
index 25f2aa99d..fe1798533 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSerachFieldItemRelatedProps.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/TabSerachFieldItemRelatedProps.tsx
@@ -6,7 +6,7 @@ import {
useDataSourceHeaders,
useFilterBlock,
useRequest,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { useField, useFieldSchema } from '@tachybase/schema';
import _ from 'lodash';
import { useTabSearchCollapsibleInputItem } from './hooks';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/hooks.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/hooks.tsx
index 6d77b9001..1822e817a 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/hooks.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/components/field-item/hooks.tsx
@@ -1,4 +1,4 @@
-import { findFilterTargets, mergeFilter, useCollection, useFilterBlock } from '@nocobase/client';
+import { findFilterTargets, mergeFilter, useCollection, useFilterBlock } from '@tachybase/client';
import { useFieldSchema } from '@tachybase/schema';
import _ from 'lodash';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/create/createTabSearchBlockSchema.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/create/createTabSearchBlockSchema.ts
index bc8f4dfd3..f999218a4 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/create/createTabSearchBlockSchema.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/create/createTabSearchBlockSchema.ts
@@ -1,5 +1,5 @@
import { ISchema } from '@tachybase/schema';
-import { uid } from '@nocobase/utils/client';
+import { uid } from '@tachybase/utils/client';
export const createTabSearchBlockSchema = (options: {
collectionName: string;
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/TabSearchBlockInitializer.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/TabSearchBlockInitializer.tsx
index 08bebea8d..56bb1edf3 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/TabSearchBlockInitializer.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/TabSearchBlockInitializer.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import _ from 'lodash';
-import { DataBlockInitializer, Icon, useSchemaInitializer, useSchemaInitializerItem } from '@nocobase/client';
+import { DataBlockInitializer, Icon, useSchemaInitializer, useSchemaInitializerItem } from '@tachybase/client';
import { createTabSearchBlockSchema } from '../create/createTabSearchBlockSchema';
export const TabSearchBlockInitializer = (props) => {
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/TabSearchFieldSchemaInitializer.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/TabSearchFieldSchemaInitializer.tsx
index a26db300e..4c6d42e0f 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/TabSearchFieldSchemaInitializer.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/TabSearchFieldSchemaInitializer.tsx
@@ -1,4 +1,4 @@
-import { SchemaInitializer, SchemaInitializerItemType, useCollection, useCollectionManager } from '@nocobase/client';
+import { SchemaInitializer, SchemaInitializerItemType, useCollection, useCollectionManager } from '@tachybase/client';
import _ from 'lodash';
import { canBeDataField, canBeOptionalField, canBeRelatedField, canBeSearchField } from '../utils';
import { createTabSearchItemSchema } from '../create/createTabSearchItemSchema';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/TabSearchFieldSchemaInitializerGadget.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/TabSearchFieldSchemaInitializerGadget.tsx
index af5b90f76..2df5af17b 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/TabSearchFieldSchemaInitializerGadget.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/initializer/TabSearchFieldSchemaInitializerGadget.tsx
@@ -3,7 +3,7 @@ import {
useCurrentSchema,
useSchemaInitializer,
useSchemaInitializerItem,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { merge } from '@tachybase/schema';
import React from 'react';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/provider/TabSearchProvider.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/provider/TabSearchProvider.tsx
index 9b75c2b4c..99b6803e4 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/provider/TabSearchProvider.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/provider/TabSearchProvider.tsx
@@ -1,4 +1,4 @@
-import { DataBlockProvider } from '@nocobase/client';
+import { DataBlockProvider } from '@tachybase/client';
import React from 'react';
export const TabSearchProvider = (props) => {
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/settings/TabSearchItemFieldSettings.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/settings/TabSearchItemFieldSettings.tsx
index a1c2b7192..6ceacfeea 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/settings/TabSearchItemFieldSettings.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/settings/TabSearchItemFieldSettings.tsx
@@ -6,7 +6,7 @@ import {
useCompile,
useDesignable,
useFormBlockContext,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { useTranslation } from '../../../../../locale';
import { useField, useFieldSchema } from '@tachybase/schema';
import _ from 'lodash';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/utils.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/utils.ts
index 9626782e3..7ce1ce444 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/utils.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/components/tab-search/utils.ts
@@ -1,4 +1,4 @@
-import { dayjs } from '@nocobase/utils/client';
+import { dayjs } from '@tachybase/utils/client';
const canBeOptionalFields = ['select', 'multipleSelect', 'radioGroup', 'checkboxGroup'];
const canBeRelatedFields = ['oho', 'obo', 'o2m', 'm2o', 'm2m'];
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/hooks/useSchemaPatch.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/hooks/useSchemaPatch.ts
index 6f7a408f7..ea04ad7c8 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/hooks/useSchemaPatch.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/hooks/useSchemaPatch.ts
@@ -1,5 +1,5 @@
import { useField, useFieldSchema } from '@tachybase/schema';
-import { useDesignable } from '@nocobase/client';
+import { useDesignable } from '@tachybase/client';
import lodash from 'lodash';
import { useMemoizedFn } from 'ahooks';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/initializers/BlockInitializers.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/initializers/BlockInitializers.ts
index 3b2ac2155..94ed86365 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/initializers/BlockInitializers.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/initializers/BlockInitializers.ts
@@ -1,4 +1,4 @@
-import { CompatibleSchemaInitializer, gridRowColWrap } from '@nocobase/client';
+import { CompatibleSchemaInitializer, gridRowColWrap } from '@tachybase/client';
import { generateNTemplate, tval } from '../../../locale';
/**
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/scopes/grid-card.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/scopes/grid-card.ts
index e87973fa9..557e2749e 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/scopes/grid-card.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/core/schema/scopes/grid-card.ts
@@ -1,4 +1,4 @@
-import { css } from '@nocobase/client';
+import { css } from '@tachybase/client';
import { useInterfaceContext } from '../../../router/InterfaceProvider';
import { PaginationProps } from 'antd';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/devices/iOS6.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/devices/iOS6.tsx
index e898f58b9..4c2e95dab 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/devices/iOS6.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/devices/iOS6.tsx
@@ -1,4 +1,4 @@
-import { css, cx } from '@nocobase/client';
+import { css, cx } from '@tachybase/client';
import React from 'react';
const iOS6: React.FC<{
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/devices/index.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/devices/index.tsx
index 71bf3ad35..a6e71b27b 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/devices/index.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/devices/index.tsx
@@ -1,4 +1,4 @@
-import { css, cx } from '@nocobase/client';
+import { css, cx } from '@tachybase/client';
import React from 'react';
import { useLocation } from 'react-router-dom';
import Device from './iOS6';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/index.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/index.tsx
index 6ad4c4b95..dfbdcb6f2 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/index.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/index.tsx
@@ -1,4 +1,4 @@
-import { createRouterManager, Plugin, RouterManager, RouteSchemaComponent } from '@nocobase/client';
+import { createRouterManager, Plugin, RouterManager, RouteSchemaComponent } from '@tachybase/client';
import React from 'react';
import { Navigate, Outlet } from 'react-router-dom';
import { MobileClientProvider } from './MobileClientProvider';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/locale/index.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/client/locale/index.ts
index 83610b094..b73516481 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/locale/index.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/locale/index.ts
@@ -1,4 +1,4 @@
-import {tval as nTval, i18n } from '@nocobase/client';
+import {tval as nTval, i18n } from '@tachybase/client';
import { useTranslation as useT } from 'react-i18next';
export const NAMESPACE = 'mobile-client';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/router/Application.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/router/Application.tsx
index 08817e66c..6f92c3b1e 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/router/Application.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/router/Application.tsx
@@ -1,4 +1,4 @@
-import { ActionContextProvider, AdminProvider, css, cx, RemoteSchemaComponent, useViewport } from '@nocobase/client';
+import { ActionContextProvider, AdminProvider, css, cx, RemoteSchemaComponent, useViewport } from '@tachybase/client';
import { DrawerProps, ModalProps } from 'antd';
import React, { useMemo } from 'react';
import { Outlet, useParams } from 'react-router-dom';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/router/InterfaceRouter.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/router/InterfaceRouter.tsx
index bd4ec7bcc..e43871e8e 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/router/InterfaceRouter.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/router/InterfaceRouter.tsx
@@ -1,4 +1,4 @@
-import { css, usePlugin } from '@nocobase/client';
+import { css, usePlugin } from '@tachybase/client';
import React from 'react';
import { MobileClientPlugin } from '../index';
import { InterfaceProvider } from './InterfaceProvider';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/client/router/OpenInNewTab.tsx b/packages/plugins/@tachybase/plugin-mobile-client/src/client/router/OpenInNewTab.tsx
index 56b3d1b73..774f1c20b 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/client/router/OpenInNewTab.tsx
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/client/router/OpenInNewTab.tsx
@@ -1,5 +1,5 @@
import { LinkOutlined } from '@ant-design/icons';
-import { css, useApp } from '@nocobase/client';
+import { css, useApp } from '@tachybase/client';
import { Button } from 'antd';
import React from 'react';
import { useTranslation } from '../locale';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/server/migrations/20230620203218-mobile-ui-schema-uid.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/server/migrations/20230620203218-mobile-ui-schema-uid.ts
index b01332afc..0b63945c0 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/server/migrations/20230620203218-mobile-ui-schema-uid.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/server/migrations/20230620203218-mobile-ui-schema-uid.ts
@@ -1,5 +1,5 @@
-import { Model } from '@nocobase/database';
-import { Migration } from '@nocobase/server';
+import { Model } from '@tachybase/database';
+import { Migration } from '@tachybase/server';
export default class extends Migration {
appVersion = '<0.14.0-alpha.1';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/server/migrations/20231215215233-mobile-container-uid.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/server/migrations/20231215215233-mobile-container-uid.ts
index 650d542bd..2a678c62b 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/server/migrations/20231215215233-mobile-container-uid.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/server/migrations/20231215215233-mobile-container-uid.ts
@@ -1,5 +1,5 @@
-import { Model } from '@nocobase/database';
-import { Migration } from '@nocobase/server';
+import { Model } from '@tachybase/database';
+import { Migration } from '@tachybase/server';
export default class extends Migration {
appVersion = '<0.17.0-alpha.8';
diff --git a/packages/plugins/@tachybase/plugin-mobile-client/src/server/plugin.ts b/packages/plugins/@tachybase/plugin-mobile-client/src/server/plugin.ts
index a895263ae..14a59684e 100644
--- a/packages/plugins/@tachybase/plugin-mobile-client/src/server/plugin.ts
+++ b/packages/plugins/@tachybase/plugin-mobile-client/src/server/plugin.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/server';
+import { Plugin } from '@tachybase/server';
import { resolve } from 'path';
export class MobileClientPlugin extends Plugin {
diff --git a/packages/plugins/@tachybase/plugin-workflow-test/package.json b/packages/plugins/@tachybase/plugin-workflow-test/package.json
index a3f93ff7e..ed1601538 100644
--- a/packages/plugins/@tachybase/plugin-workflow-test/package.json
+++ b/packages/plugins/@tachybase/plugin-workflow-test/package.json
@@ -9,13 +9,13 @@
"lodash": "4.17.21"
},
"peerDependencies": {
- "@nocobase/client": "workspace:*",
- "@nocobase/data-source-manager": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/resourcer": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*"
+ "@tachybase/client": "workspace:*",
+ "@tachybase/data-source-manager": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/resourcer": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"displayName.zh-CN": "工作流：测试工具包"
}
diff --git a/packages/plugins/@tachybase/plugin-workflow-test/src/client/index.ts b/packages/plugins/@tachybase/plugin-workflow-test/src/client/index.ts
index 30c93b8ab..a4ee09fa2 100644
--- a/packages/plugins/@tachybase/plugin-workflow-test/src/client/index.ts
+++ b/packages/plugins/@tachybase/plugin-workflow-test/src/client/index.ts
@@ -1,3 +1,3 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
export default class extends Plugin {}
diff --git a/packages/plugins/@tachybase/plugin-workflow-test/src/e2e/e2eCollectionModel.ts b/packages/plugins/@tachybase/plugin-workflow-test/src/e2e/e2eCollectionModel.ts
index 687b64c8d..2e62c53d0 100644
--- a/packages/plugins/@tachybase/plugin-workflow-test/src/e2e/e2eCollectionModel.ts
+++ b/packages/plugins/@tachybase/plugin-workflow-test/src/e2e/e2eCollectionModel.ts
@@ -1,4 +1,4 @@
-import { dayjs } from '@nocobase/utils';
+import { dayjs } from '@tachybase/utils';
import { lowerCase } from 'lodash';
/**
diff --git a/packages/plugins/@tachybase/plugin-workflow-test/src/e2e/e2ePageObjectModel.ts b/packages/plugins/@tachybase/plugin-workflow-test/src/e2e/e2ePageObjectModel.ts
index 8f744651a..150749e87 100644
--- a/packages/plugins/@tachybase/plugin-workflow-test/src/e2e/e2ePageObjectModel.ts
+++ b/packages/plugins/@tachybase/plugin-workflow-test/src/e2e/e2ePageObjectModel.ts
@@ -1,4 +1,4 @@
-import { Locator, Page } from '@nocobase/test/e2e';
+import { Locator, Page } from '@tachybase/test/e2e';
export class CreateWorkFlow {
readonly page: Page;
name: Locator;
diff --git a/packages/plugins/@tachybase/plugin-workflow-test/src/e2e/e2eUtils.ts b/packages/plugins/@tachybase/plugin-workflow-test/src/e2e/e2eUtils.ts
index 4d39877eb..f5b70f122 100644
--- a/packages/plugins/@tachybase/plugin-workflow-test/src/e2e/e2eUtils.ts
+++ b/packages/plugins/@tachybase/plugin-workflow-test/src/e2e/e2eUtils.ts
@@ -1,4 +1,4 @@
-import { request, Page } from '@nocobase/test/e2e';
+import { request, Page } from '@tachybase/test/e2e';
const PORT = process.env.APP_PORT || 20000;
const APP_BASE_URL = process.env.APP_BASE_URL || `http://localhost:${PORT}`;
diff --git a/packages/plugins/@tachybase/plugin-workflow-test/src/server/collections/categories.ts b/packages/plugins/@tachybase/plugin-workflow-test/src/server/collections/categories.ts
index 1c73e2e43..d2977193f 100644
--- a/packages/plugins/@tachybase/plugin-workflow-test/src/server/collections/categories.ts
+++ b/packages/plugins/@tachybase/plugin-workflow-test/src/server/collections/categories.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
export default {
name: 'categories',
diff --git a/packages/plugins/@tachybase/plugin-workflow-test/src/server/collections/comments.ts b/packages/plugins/@tachybase/plugin-workflow-test/src/server/collections/comments.ts
index 30494fae0..b5d172b97 100644
--- a/packages/plugins/@tachybase/plugin-workflow-test/src/server/collections/comments.ts
+++ b/packages/plugins/@tachybase/plugin-workflow-test/src/server/collections/comments.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
export default {
name: 'comments',
diff --git a/packages/plugins/@tachybase/plugin-workflow-test/src/server/collections/posts.ts b/packages/plugins/@tachybase/plugin-workflow-test/src/server/collections/posts.ts
index 7e8e98db5..4982e7529 100644
--- a/packages/plugins/@tachybase/plugin-workflow-test/src/server/collections/posts.ts
+++ b/packages/plugins/@tachybase/plugin-workflow-test/src/server/collections/posts.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
export default {
name: 'posts',
diff --git a/packages/plugins/@tachybase/plugin-workflow-test/src/server/collections/tags.ts b/packages/plugins/@tachybase/plugin-workflow-test/src/server/collections/tags.ts
index 433688e1b..7b41d4f33 100644
--- a/packages/plugins/@tachybase/plugin-workflow-test/src/server/collections/tags.ts
+++ b/packages/plugins/@tachybase/plugin-workflow-test/src/server/collections/tags.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
export default {
name: 'tags',
diff --git a/packages/plugins/@tachybase/plugin-workflow-test/src/server/index.ts b/packages/plugins/@tachybase/plugin-workflow-test/src/server/index.ts
index 85116ef5b..435e2e5ed 100644
--- a/packages/plugins/@tachybase/plugin-workflow-test/src/server/index.ts
+++ b/packages/plugins/@tachybase/plugin-workflow-test/src/server/index.ts
@@ -1,14 +1,14 @@
import path from 'path';
-import { ApplicationOptions, Plugin } from '@nocobase/server';
-import { MockServer, createMockServer, mockDatabase } from '@nocobase/test';
+import { ApplicationOptions, Plugin } from '@tachybase/server';
+import { MockServer, createMockServer, mockDatabase } from '@tachybase/test';
import functions from './functions';
import triggers from './triggers';
import instructions from './instructions';
-import { Resourcer } from '@nocobase/resourcer';
-import { SequelizeDataSource } from '@nocobase/data-source-manager';
-import { uid } from '@nocobase/utils';
+import { Resourcer } from '@tachybase/resourcer';
+import { SequelizeDataSource } from '@tachybase/data-source-manager';
+import { uid } from '@tachybase/utils';
export interface MockServerOptions extends ApplicationOptions {
collectionsPath?: string;
diff --git a/packages/plugins/@tachybase/plugin-workflow-test/src/server/instructions.ts b/packages/plugins/@tachybase/plugin-workflow-test/src/server/instructions.ts
index f92f07796..fd9057357 100644
--- a/packages/plugins/@tachybase/plugin-workflow-test/src/server/instructions.ts
+++ b/packages/plugins/@tachybase/plugin-workflow-test/src/server/instructions.ts
@@ -1,4 +1,4 @@
-import { lodash } from '@nocobase/utils';
+import { lodash } from '@tachybase/utils';
export default {
echo: {
diff --git a/packages/plugins/@tachybase/plugin-workflow/package.json b/packages/plugins/@tachybase/plugin-workflow/package.json
index 2f7a04950..fdda9960c 100644
--- a/packages/plugins/@tachybase/plugin-workflow/package.json
+++ b/packages/plugins/@tachybase/plugin-workflow/package.json
@@ -31,20 +31,20 @@
"sequelize": "^6.26.0"
},
"peerDependencies": {
- "@nocobase/actions": "workspace:*",
- "@nocobase/client": "workspace:*",
- "@nocobase/data-source-manager": "workspace:*",
- "@nocobase/database": "workspace:*",
- "@nocobase/evaluators": "workspace:*",
- "@nocobase/logger": "workspace:*",
"@nocobase/plugin-collection-manager": "workspace:*",
"@nocobase/plugin-error-handler": "workspace:*",
"@nocobase/plugin-users": "workspace:*",
- "@nocobase/resourcer": "workspace:*",
- "@nocobase/server": "workspace:*",
- "@nocobase/test": "workspace:*",
- "@nocobase/utils": "workspace:*",
- "@tachybase/schema": "workspace:*"
+ "@tachybase/actions": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/data-source-manager": "workspace:*",
+ "@tachybase/database": "workspace:*",
+ "@tachybase/evaluators": "workspace:*",
+ "@tachybase/logger": "workspace:*",
+ "@tachybase/resourcer": "workspace:*",
+ "@tachybase/schema": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "@tachybase/test": "workspace:*",
+ "@tachybase/utils": "workspace:*"
},
"description.zh-CN": "一个强大的 BPM 工具，为业务自动化提供基础支持，并且可任意扩展更多的触发器和节点。",
"displayName.zh-CN": "工作流",
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/AddButton.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/AddButton.tsx
index 410565939..516392ef7 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/AddButton.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/AddButton.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useMemo } from 'react';
import { Button, Dropdown, MenuProps } from 'antd';
import { PlusOutlined } from '@ant-design/icons';
-import { css, useAPIClient, useCompile, usePlugin } from '@nocobase/client';
+import { css, useAPIClient, useCompile, usePlugin } from '@tachybase/client';
import WorkflowPlugin from '.';
import { useFlowContext } from './FlowContext';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/Branch.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/Branch.tsx
index 4b1b488c2..bc79630ed 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/Branch.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/Branch.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { CloseOutlined } from '@ant-design/icons';
-import { css, cx } from '@nocobase/client';
+import { css, cx } from '@tachybase/client';
import { AddButton } from './AddButton';
import { useGetAriaLabelOfAddButton } from './hooks/useGetAriaLabelOfAddButton';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/CanvasContent.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/CanvasContent.tsx
index 40974e384..b80834b42 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/CanvasContent.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/CanvasContent.tsx
@@ -1,7 +1,7 @@
import { Alert, Slider } from 'antd';
import React from 'react';
-import { cx, css } from '@nocobase/client';
+import { cx, css } from '@tachybase/client';
import { Branch } from './Branch';
import { useFlowContext } from './FlowContext';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/ExecutionCanvas.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/ExecutionCanvas.tsx
index 32941dee4..33370f7aa 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/ExecutionCanvas.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/ExecutionCanvas.tsx
@@ -12,8 +12,8 @@ import {
useDocumentTitle,
usePlugin,
useResourceActionContext,
-} from '@nocobase/client';
-import { str2moment } from '@nocobase/utils/client';
+} from '@tachybase/client';
+import { str2moment } from '@tachybase/utils/client';
import WorkflowPlugin from '.';
import { CanvasContent } from './CanvasContent';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/ExecutionContextProvider.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/ExecutionContextProvider.tsx
index c89274893..932acbe99 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/ExecutionContextProvider.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/ExecutionContextProvider.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { SchemaComponentOptions, usePlugin } from '@nocobase/client';
+import { SchemaComponentOptions, usePlugin } from '@tachybase/client';
import PluginWorkflowClient, { FlowContext } from '.';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/ExecutionLink.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/ExecutionLink.tsx
index 922d804a5..a75c16fb0 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/ExecutionLink.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/ExecutionLink.tsx
@@ -2,7 +2,7 @@ import React from 'react';
import { useTranslation } from 'react-i18next';
import { Link } from 'react-router-dom';
-import { useActionContext, useRecord } from '@nocobase/client';
+import { useActionContext, useRecord } from '@tachybase/client';
import { getWorkflowExecutionsPath } from './utils';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/ExecutionPage.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/ExecutionPage.tsx
index e49ee00ad..db361f2ac 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/ExecutionPage.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/ExecutionPage.tsx
@@ -1,4 +1,4 @@
-import { cx, SchemaComponent } from '@nocobase/client';
+import { cx, SchemaComponent } from '@tachybase/client';
import React from 'react';
import { useParams } from 'react-router-dom';
import { ExecutionCanvas } from './ExecutionCanvas';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/ExecutionResourceProvider.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/ExecutionResourceProvider.tsx
index 5bf24ad5b..232eae322 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/ExecutionResourceProvider.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/ExecutionResourceProvider.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { ResourceActionProvider, useRecord } from '@nocobase/client';
+import { ResourceActionProvider, useRecord } from '@tachybase/client';
export const ExecutionResourceProvider = ({ request, filter = {}, ...others }) => {
const workflow = useRecord();
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/WorkflowCanvas.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/WorkflowCanvas.tsx
index 2e826a5f3..f166bbe04 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/WorkflowCanvas.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/WorkflowCanvas.tsx
@@ -8,8 +8,8 @@ import {
useDocumentTitle,
useResourceActionContext,
useResourceContext,
-} from '@nocobase/client';
-import { str2moment } from '@nocobase/utils/client';
+} from '@tachybase/client';
+import { str2moment } from '@tachybase/utils/client';
import { App, Breadcrumb, Button, Dropdown, Result, Spin, Switch, message } from 'antd';
import React, { useEffect, useState } from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/WorkflowLink.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/WorkflowLink.tsx
index 16cb9e888..088aa1ce5 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/WorkflowLink.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/WorkflowLink.tsx
@@ -2,7 +2,7 @@ import React from 'react';
import { useTranslation } from 'react-i18next';
import { Link } from 'react-router-dom';
-import { useActionContext, useGetAriaLabelOfAction, useRecord } from '@nocobase/client';
+import { useActionContext, useGetAriaLabelOfAction, useRecord } from '@tachybase/client';
import { getWorkflowDetailPath } from './utils';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/WorkflowPage.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/WorkflowPage.tsx
index 8def8f441..42ece7d44 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/WorkflowPage.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/WorkflowPage.tsx
@@ -1,4 +1,4 @@
-import { cx, SchemaComponent } from '@nocobase/client';
+import { cx, SchemaComponent } from '@tachybase/client';
import React from 'react';
import { useParams } from 'react-router-dom';
import useStyles from './style';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/WorkflowPane.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/WorkflowPane.tsx
index 7a13aef6d..0c10424f8 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/WorkflowPane.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/WorkflowPane.tsx
@@ -1,4 +1,4 @@
-import { SchemaComponent, SchemaComponentContext, usePlugin, useRecord } from '@nocobase/client';
+import { SchemaComponent, SchemaComponentContext, usePlugin, useRecord } from '@tachybase/client';
import { Card } from 'antd';
import React, { useContext, useEffect } from 'react';
import { ExecutionLink } from './ExecutionLink';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/ScheduleEventTrigger/configuration.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/ScheduleEventTrigger/configuration.test.ts
index ae21c08a0..85e98702d 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/ScheduleEventTrigger/configuration.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/ScheduleEventTrigger/configuration.test.ts
@@ -9,8 +9,8 @@ import {
appendJsonCollectionName,
generalWithNoRelationalFields,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test.describe('Configuration page to configure the Trigger node', () => {
test('Triggered one minute after the current time of the customized time', async ({
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/ScheduleEventTrigger/workflowCRUD.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/ScheduleEventTrigger/workflowCRUD.test.ts
index d624065cd..8dc6f736f 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/ScheduleEventTrigger/workflowCRUD.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/ScheduleEventTrigger/workflowCRUD.test.ts
@@ -5,7 +5,7 @@ import {
apiCreateWorkflow,
apiDeleteWorkflow,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
+import { expect, test } from '@tachybase/test/e2e';
test.describe('Filter', () => {
test('filter workflow name', async ({ page }) => {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/calculationNode/formulaEngine.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/calculationNode/formulaEngine.test.ts
index 0afb05ccf..7c2318502 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/calculationNode/formulaEngine.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/calculationNode/formulaEngine.test.ts
@@ -16,8 +16,8 @@ import {
appendJsonCollectionName,
generalWithNoRelationalFields,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test('Collection event add data trigger, get trigger node single line text variable', async ({
page,
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/calculationNode/mathEngine.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/calculationNode/mathEngine.test.ts
index 3a7c384f3..5bb8645f6 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/calculationNode/mathEngine.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/calculationNode/mathEngine.test.ts
@@ -16,8 +16,8 @@ import {
appendJsonCollectionName,
generalWithNoRelationalFields,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test('Collection event add data trigger, get trigger node single line text variable', async ({
page,
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/collectionEventTrigger/configuration.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/collectionEventTrigger/configuration.test.ts
index 25482c5ce..3ef05aec7 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/collectionEventTrigger/configuration.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/collectionEventTrigger/configuration.test.ts
@@ -12,7 +12,7 @@ import {
appendJsonCollectionName,
generalWithNoRelationalFields,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
+import { expect, test } from '@tachybase/test/e2e';
test.describe('Configuration page to configure the Trigger node', () => {
test('Add Data Trigger with No Filter', async ({ page, mockCollections, mockRecords }) => {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/collectionEventTrigger/workflowCRUD.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/collectionEventTrigger/workflowCRUD.test.ts
index f68e13837..f4800d645 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/collectionEventTrigger/workflowCRUD.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/collectionEventTrigger/workflowCRUD.test.ts
@@ -12,7 +12,7 @@ import {
appendJsonCollectionName,
generalWithNoRelationalFields,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
+import { expect, test } from '@tachybase/test/e2e';
test.describe('Filter', () => {
test('filter workflow name', async ({ page }) => {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/BranchIntoYesAndNoBasicType.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/BranchIntoYesAndNoBasicType.test.ts
index cd3062c37..5e20c83a9 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/BranchIntoYesAndNoBasicType.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/BranchIntoYesAndNoBasicType.test.ts
@@ -14,8 +14,8 @@ import {
appendJsonCollectionName,
generalWithNoRelationalFields,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test('Collection event add data trigger, determines that the trigger node single line text field variable is equal to an equal constant, passes.', async ({
page,
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/BranchIntoYesAndNoFormulaEngine.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/BranchIntoYesAndNoFormulaEngine.test.ts
index 1980788f4..0bfd71c96 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/BranchIntoYesAndNoFormulaEngine.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/BranchIntoYesAndNoFormulaEngine.test.ts
@@ -14,8 +14,8 @@ import {
appendJsonCollectionName,
generalWithNoRelationalFields,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test('Collection event Add Data Trigger, determines that the trigger node single line text field variable is equal to an equal constant, passes.', async ({
page,
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/BranchIntoYesAndNoMathEngine.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/BranchIntoYesAndNoMathEngine.test.ts
index 702cc97bc..e70b69e7e 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/BranchIntoYesAndNoMathEngine.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/BranchIntoYesAndNoMathEngine.test.ts
@@ -15,8 +15,8 @@ import {
appendJsonCollectionName,
generalWithNoRelationalFields,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test('Collection event add data trigger, determine trigger node integer field variable is equal to an equal constant, pass.', async ({
page,
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/continueWhenYesBasicType.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/continueWhenYesBasicType.test.ts
index f92760617..2463b2d61 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/continueWhenYesBasicType.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/continueWhenYesBasicType.test.ts
@@ -15,8 +15,8 @@ import {
appendJsonCollectionName,
generalWithNoRelationalFields,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test('Collection event add data trigger, determines that the trigger node single line text field variable is equal to an equal constant, passes.', async ({
page,
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/continueWhenYesFormulaEngine.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/continueWhenYesFormulaEngine.test.ts
index 0ca29b858..8a9f5bde7 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/continueWhenYesFormulaEngine.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/continueWhenYesFormulaEngine.test.ts
@@ -15,8 +15,8 @@ import {
appendJsonCollectionName,
generalWithNoRelationalFields,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test('Collection event Add Data Trigger, Formula engine, determines that the trigger node single line text field variable is equal to an equal constant, passes.', async ({
page,
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/continueWhenYesMathEngine.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/continueWhenYesMathEngine.test.ts
index 9f79f952e..8ff05323a 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/continueWhenYesMathEngine.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/conditionNode/continueWhenYesMathEngine.test.ts
@@ -15,8 +15,8 @@ import {
appendJsonCollectionName,
generalWithNoRelationalFields,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test('Collection event add data trigger, Math engine, determine trigger node integer field variable is equal to an equal constant, pass.', async ({
page,
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/createRecordNode/CreateRecord.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/createRecordNode/CreateRecord.test.ts
index 822459c9f..cfedb958d 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/createRecordNode/CreateRecord.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/createRecordNode/CreateRecord.test.ts
@@ -11,8 +11,8 @@ import {
appendJsonCollectionName,
generalWithNoRelationalFields,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test('Collection event add data trigger, single row text fields for common tables, set constant data', async ({
page,
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/deleteRecordNode/DeleteRecord.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/deleteRecordNode/DeleteRecord.test.ts
index 0f4a43df9..f3559adc3 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/deleteRecordNode/DeleteRecord.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/deleteRecordNode/DeleteRecord.test.ts
@@ -9,8 +9,8 @@ import {
appendJsonCollectionName,
generalWithNoRelationalFields,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test('Collection event add data trigger, filter single line text field not null, delete common table data', async ({
page,
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/queryRecordNode/QueryRecord.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/queryRecordNode/QueryRecord.test.ts
index bf5f38237..cd1c69bee 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/queryRecordNode/QueryRecord.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/queryRecordNode/QueryRecord.test.ts
@@ -10,8 +10,8 @@ import {
appendJsonCollectionName,
generalWithNoRelationalFields,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test('Collection event add data trigger, no filter no sort query common table 1 record', async ({
page,
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/updateRecordNode/updateInABatch.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/updateRecordNode/updateInABatch.test.ts
index 4a9556839..4fe264072 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/updateRecordNode/updateInABatch.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/updateRecordNode/updateInABatch.test.ts
@@ -11,8 +11,8 @@ import {
appendJsonCollectionName,
generalWithNoRelationalFields,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test('Collection event add data trigger, filter single line text field not empty, common table single line text field data, set single line text field constant data', async ({
page,
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/updateRecordNode/updateOneByOne.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/updateRecordNode/updateOneByOne.test.ts
index 949eaa9b0..ad7a1b4a4 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/updateRecordNode/updateOneByOne.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/__e2e__/updateRecordNode/updateOneByOne.test.ts
@@ -11,8 +11,8 @@ import {
appendJsonCollectionName,
generalWithNoRelationalFields,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test('Collection event add data trigger, filter single line text field not empty, common table single line text field data, set single line text field constant data', async ({
page,
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/components/CheckboxGroupWithTooltip.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/components/CheckboxGroupWithTooltip.tsx
index 32af5ee7f..58e768313 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/components/CheckboxGroupWithTooltip.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/components/CheckboxGroupWithTooltip.tsx
@@ -1,5 +1,5 @@
import { QuestionCircleOutlined } from '@ant-design/icons';
-import { css, useCompile } from '@nocobase/client';
+import { css, useCompile } from '@tachybase/client';
import { Checkbox, Space, Tooltip } from 'antd';
import React from 'react';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/components/CollectionBlockInitializer.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/components/CollectionBlockInitializer.tsx
index 835d45783..428ec12fc 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/components/CollectionBlockInitializer.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/components/CollectionBlockInitializer.tsx
@@ -11,7 +11,7 @@ import {
useSchemaInitializer,
useSchemaInitializerItem,
useSchemaTemplateManager,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { traverseSchema } from '../utils';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/components/CollectionFieldset.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/components/CollectionFieldset.tsx
index 29925b803..8a62be3bf 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/components/CollectionFieldset.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/components/CollectionFieldset.tsx
@@ -10,7 +10,7 @@ import {
useCollectionManager_deprecated,
useCompile,
useToken,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { Button, Dropdown, Form, Input, MenuProps } from 'antd';
import React, { useMemo } from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/components/DetailsBlockProvider.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/components/DetailsBlockProvider.tsx
index ab4dd3718..a02f993a7 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/components/DetailsBlockProvider.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/components/DetailsBlockProvider.tsx
@@ -11,7 +11,7 @@ import {
useAPIClient,
useAssociationNames,
useBlockRequestContext,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { useFlowContext } from '../FlowContext';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/components/DrawerDescription.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/components/DrawerDescription.tsx
index 23aa425f6..736a1dcdd 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/components/DrawerDescription.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/components/DrawerDescription.tsx
@@ -1,4 +1,4 @@
-import { createStyles, cx } from '@nocobase/client';
+import { createStyles, cx } from '@tachybase/client';
import { Tag } from 'antd';
import React from 'react';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/components/DrawerForm.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/components/DrawerForm.tsx
index 6215921c8..4cf4065e1 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/components/DrawerForm.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/components/DrawerForm.tsx
@@ -3,7 +3,7 @@ import { cloneDeep } from 'lodash';
import { createForm } from '@tachybase/schema';
import { useForm } from '@tachybase/schema';
-import { ActionContextProvider, FormProvider } from '@nocobase/client';
+import { ActionContextProvider, FormProvider } from '@tachybase/client';
export function useFormProviderProps() {
return { form: useForm() };
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/components/ExecutionStatus.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/components/ExecutionStatus.tsx
index 148e10ffc..e3bc8cf58 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/components/ExecutionStatus.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/components/ExecutionStatus.tsx
@@ -3,7 +3,7 @@ import { Button, Modal, Select, Tag, Tooltip, message } from 'antd';
import { ExclamationCircleFilled, StopOutlined } from '@ant-design/icons';
import { useTranslation } from 'react-i18next';
-import { Action, css, useCompile, useRecord, useResourceActionContext, useResourceContext } from '@nocobase/client';
+import { Action, css, useCompile, useRecord, useResourceActionContext, useResourceContext } from '@tachybase/client';
import { EXECUTION_STATUS, ExecutionStatusOptions, ExecutionStatusOptionsMap } from '../constants';
import { lang } from '../locale';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/components/FieldsSelect.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/components/FieldsSelect.tsx
index ee62ca82b..57a75f1bb 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/components/FieldsSelect.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/components/FieldsSelect.tsx
@@ -2,7 +2,7 @@ import { observer, useForm } from '@tachybase/schema';
import { Select } from 'antd';
import React from 'react';
-import { parseCollectionName, useCollectionManager_deprecated, useCompile } from '@nocobase/client';
+import { parseCollectionName, useCollectionManager_deprecated, useCompile } from '@tachybase/client';
function defaultFilter() {
return true;
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/components/FilterDynamicComponent.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/components/FilterDynamicComponent.tsx
index 5706f27d4..7d13d0ffa 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/components/FilterDynamicComponent.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/components/FilterDynamicComponent.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { Variable } from '@nocobase/client';
+import { Variable } from '@tachybase/client';
import { useWorkflowVariableOptions } from '../variable';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/components/OpenDrawer.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/components/OpenDrawer.tsx
index 553b05e5e..cdf954b7c 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/components/OpenDrawer.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/components/OpenDrawer.tsx
@@ -1,7 +1,7 @@
import React, { useState } from 'react';
import { useFieldSchema } from '@tachybase/schema';
-import { ActionContextProvider, SchemaComponent } from '@nocobase/client';
+import { ActionContextProvider, SchemaComponent } from '@tachybase/client';
export default function ({ component = 'div', children, ...props }) {
const [visible, setVisible] = useState(false);
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/components/RadioWithTooltip.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/components/RadioWithTooltip.tsx
index 9663d1328..c04c18342 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/components/RadioWithTooltip.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/components/RadioWithTooltip.tsx
@@ -1,5 +1,5 @@
import { QuestionCircleOutlined } from '@ant-design/icons';
-import { css, useCompile } from '@nocobase/client';
+import { css, useCompile } from '@tachybase/client';
import { Radio, Space, Tooltip } from 'antd';
import React from 'react';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/components/SimpleDesigner.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/components/SimpleDesigner.tsx
index 0cf6a417d..219fca06c 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/components/SimpleDesigner.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/components/SimpleDesigner.tsx
@@ -7,7 +7,7 @@ import {
SchemaSettingsDivider,
SchemaSettingsRemove,
useCompile,
-} from '@nocobase/client';
+} from '@tachybase/client';
export function SimpleDesigner() {
const schema = useFieldSchema();
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/components/StatusButton.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/components/StatusButton.tsx
index 1651f367f..3aa29826a 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/components/StatusButton.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/components/StatusButton.tsx
@@ -2,7 +2,7 @@ import React from 'react';
import { Button, Tag } from 'antd';
import classnames from 'classnames';
-import { createStyles } from '@nocobase/client';
+import { createStyles } from '@tachybase/client';
const useStyles = createStyles(({ css, token }) => ({
statusButtonClass: css`
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/components/ValueBlock.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/components/ValueBlock.tsx
index e18ae86d0..958663da0 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/components/ValueBlock.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/components/ValueBlock.tsx
@@ -1,6 +1,6 @@
import { useFieldSchema } from '@tachybase/schema';
-import { css, SchemaInitializerItem, useSchemaInitializer, useSchemaInitializerItem } from '@nocobase/client';
-import { parse } from '@nocobase/utils/client';
+import { css, SchemaInitializerItem, useSchemaInitializer, useSchemaInitializerItem } from '@tachybase/client';
+import { parse } from '@tachybase/utils/client';
import React from 'react';
import { useFlowContext } from '../FlowContext';
import { SimpleDesigner } from './SimpleDesigner';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/components/renderEngineReference.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/components/renderEngineReference.tsx
index 351a8e3cd..3d0c61d82 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/components/renderEngineReference.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/components/renderEngineReference.tsx
@@ -1,5 +1,5 @@
-import { css, i18n } from '@nocobase/client';
-import { evaluators } from '@nocobase/evaluators/client';
+import { css, i18n } from '@tachybase/client';
+import { evaluators } from '@tachybase/evaluators/client';
import React from 'react';
export const renderEngineReference = (key: string) => {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/action-trigger/ActionTrigger.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/features/action-trigger/ActionTrigger.tsx
index 91f17973e..5cd0f8c71 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/action-trigger/ActionTrigger.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/action-trigger/ActionTrigger.tsx
@@ -5,7 +5,7 @@ import {
useCollectionDataSource,
useCollectionManager_deprecated,
useCompile,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { NAMESPACE, lang } from '../../locale';
import { Trigger } from '../../triggers';
import { CollectionBlockInitializer } from '../../components';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/action-trigger/__e2e__/configuration.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/features/action-trigger/__e2e__/configuration.test.ts
index 90d31521f..c50cfe60c 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/action-trigger/__e2e__/configuration.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/action-trigger/__e2e__/configuration.test.ts
@@ -11,8 +11,8 @@ import {
generalWithNoRelationalFields,
apiGetDataSourceCount,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test.describe('Configuration page to configure the Trigger node', () => {
test('Form Submit Button Binding Workflow Add Data Trigger', async ({
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/action-trigger/__e2e__/workflowCRUD.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/features/action-trigger/__e2e__/workflowCRUD.test.ts
index 4ec5a7442..5a1d49aed 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/action-trigger/__e2e__/workflowCRUD.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/action-trigger/__e2e__/workflowCRUD.test.ts
@@ -12,8 +12,8 @@ import {
appendJsonCollectionName,
generalWithNoRelationalFields,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test.describe('Filter', () => {
test('filter workflow name', async ({ page }) => {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/action-trigger/index.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/features/action-trigger/index.ts
index 18047b209..cf74bd1d2 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/action-trigger/index.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/action-trigger/index.ts
@@ -1,4 +1,4 @@
-import { Plugin, SchemaInitializerItemType } from '@nocobase/client';
+import { Plugin, SchemaInitializerItemType } from '@tachybase/client';
import WorkflowPlugin, { useRecordTriggerWorkflowsActionProps, useTriggerWorkflowsActionProps } from '../..';
import { ActionTrigger } from './ActionTrigger';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/aggregate/AggregateInstruction.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/features/aggregate/AggregateInstruction.tsx
index 2ac1a53d9..cd3698394 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/aggregate/AggregateInstruction.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/aggregate/AggregateInstruction.tsx
@@ -12,7 +12,7 @@ import {
useCollectionFilterOptions,
useCollectionManager_deprecated,
useCompile,
-} from '@nocobase/client';
+} from '@tachybase/client';
import {
FieldsSelect,
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/aggregate/__e2e__/DataOfCollection.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/features/aggregate/__e2e__/DataOfCollection.test.ts
index c1d3ee916..647628912 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/aggregate/__e2e__/DataOfCollection.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/aggregate/__e2e__/DataOfCollection.test.ts
@@ -10,8 +10,8 @@ import {
appendJsonCollectionName,
generalWithNoRelationalFields,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test.describe('no filter', () => {
test('Collection event add data trigger, normal table integer fields not de-emphasised COUNT', async ({
page,
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/aggregate/index.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/features/aggregate/index.ts
index 86f7aaee0..57394fe5d 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/aggregate/index.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/aggregate/index.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import WorkflowPlugin from '../..';
import AggregateInstruction from './AggregateInstruction';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/delay/DelayInstruction.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/features/delay/DelayInstruction.tsx
index 32ab00e3f..e4142807d 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/delay/DelayInstruction.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/delay/DelayInstruction.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { InputNumber, Select } from 'antd';
-import { css, useCompile, usePlugin } from '@nocobase/client';
+import { css, useCompile, usePlugin } from '@tachybase/client';
import WorkflowPlugin, { Instruction, JOB_STATUS } from '../..';
import { NAMESPACE } from '../../locale';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/delay/index.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/features/delay/index.ts
index 5453de5c8..a208883fd 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/delay/index.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/delay/index.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import WorkflowPlugin from '../..';
import DelayInstruction from './DelayInstruction';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/dynamic-calculation/DynamicCalculation.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/features/dynamic-calculation/DynamicCalculation.tsx
index f21e744dd..d24701427 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/dynamic-calculation/DynamicCalculation.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/dynamic-calculation/DynamicCalculation.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { SchemaInitializerItemType, Variable, useCollectionManager_deprecated } from '@nocobase/client';
+import { SchemaInitializerItemType, Variable, useCollectionManager_deprecated } from '@tachybase/client';
import {
BaseTypeSets,
Instruction,
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/dynamic-calculation/DynamicExpression.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/features/dynamic-calculation/DynamicExpression.tsx
index 8ed375bb0..02066d036 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/dynamic-calculation/DynamicExpression.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/dynamic-calculation/DynamicExpression.tsx
@@ -4,7 +4,7 @@ import { Tag } from 'antd';
import React, { useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next';
-import { useCollectionManager_deprecated, useCompile, useRecord, Variable } from '@nocobase/client';
+import { useCollectionManager_deprecated, useCompile, useRecord, Variable } from '@tachybase/client';
import { getCollectionFieldOptions } from '../..';
import { NAMESPACE } from '../../locale';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/dynamic-calculation/expression.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/features/dynamic-calculation/expression.tsx
index 841ba5861..87d1c38a3 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/dynamic-calculation/expression.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/dynamic-calculation/expression.tsx
@@ -1,4 +1,4 @@
-import { CollectionFieldInterface, interfacesProperties } from '@nocobase/client';
+import { CollectionFieldInterface, interfacesProperties } from '@tachybase/client';
import { NAMESPACE } from '../../locale';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/dynamic-calculation/index.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/features/dynamic-calculation/index.ts
index 710fcfc8a..153a351d5 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/dynamic-calculation/index.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/dynamic-calculation/index.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import WorkflowPlugin from '../..';
import DynamicCalculation from './DynamicCalculation';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/loop/LoopInstruction.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/features/loop/LoopInstruction.tsx
index ec7e644fc..8fe860ca0 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/loop/LoopInstruction.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/loop/LoopInstruction.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { ArrowUpOutlined } from '@ant-design/icons';
-import { css, cx, useCompile } from '@nocobase/client';
+import { css, cx, useCompile } from '@tachybase/client';
import {
NodeDefaultView,
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/loop/index.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/features/loop/index.ts
index a0d5bc769..c97cd7c27 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/loop/index.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/loop/index.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import WorkflowPlugin from '../..';
import LoopInstruction from './LoopInstruction';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/WorkflowTodo.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/WorkflowTodo.tsx
index d847c3620..a1ccb5927 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/WorkflowTodo.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/WorkflowTodo.tsx
@@ -1,9 +1,9 @@
import { observer, useField, useFieldSchema, useForm } from '@tachybase/schema';
import { Space, Spin, Tag } from 'antd';
-import { dayjs } from '@nocobase/utils/client';
+import { dayjs } from '@tachybase/utils/client';
import React, { createContext, useContext, useEffect, useState } from 'react';
-import { css, useCompile, usePlugin } from '@nocobase/client';
+import { css, useCompile, usePlugin } from '@tachybase/client';
import {
SchemaComponent,
@@ -16,7 +16,7 @@ import {
useRecord,
useTableBlockContext,
ExtendCollectionsProvider,
-} from '@nocobase/client';
+} from '@tachybase/client';
import WorkflowPlugin, {
FlowContext,
linkNodes,
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/WorkflowTodoBlockInitializer.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/WorkflowTodoBlockInitializer.tsx
index 18f3bcc95..60fe9f562 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/WorkflowTodoBlockInitializer.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/WorkflowTodoBlockInitializer.tsx
@@ -1,7 +1,7 @@
import { TableOutlined } from '@ant-design/icons';
import React, { FC } from 'react';
-import { SchemaInitializerItem, useSchemaInitializer, useSchemaInitializerItem } from '@nocobase/client';
+import { SchemaInitializerItem, useSchemaInitializer, useSchemaInitializerItem } from '@tachybase/client';
export const WorkflowTodoBlockInitializer: FC = () => {
const itemConfig = useSchemaInitializerItem();
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/__e2e__/createRecordForm.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/__e2e__/createRecordForm.test.ts
index b01b72917..0e153faa4 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/__e2e__/createRecordForm.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/__e2e__/createRecordForm.test.ts
@@ -12,8 +12,8 @@ import {
generalWithNoRelationalFields,
apiGetDataSourceCount,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test.describe('block configuration', () => {});
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/__e2e__/customFormBlocks.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/__e2e__/customFormBlocks.test.ts
index b620f3d7f..962ac9bf2 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/__e2e__/customFormBlocks.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/__e2e__/customFormBlocks.test.ts
@@ -10,8 +10,8 @@ import {
appendJsonCollectionName,
generalWithNoRelationalFields,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test.describe('block configuration', () => {});
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/__e2e__/datablocks.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/__e2e__/datablocks.test.ts
index 91188962a..5b45007d8 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/__e2e__/datablocks.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/__e2e__/datablocks.test.ts
@@ -17,8 +17,8 @@ import {
appendJsonCollectionName,
generalWithNoRelationalFields,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test.describe('field data', () => {
test('Collection event to add a data trigger, get a single line of text data for the trigger node', async ({
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/__e2e__/updateRecordForm.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/__e2e__/updateRecordForm.test.ts
index 887be96fb..3a3731326 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/__e2e__/updateRecordForm.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/__e2e__/updateRecordForm.test.ts
@@ -12,8 +12,8 @@ import {
generalWithNoRelationalFields,
apiGetDataSourceCount,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test.describe('block configuration', () => {});
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/__e2e__/workflowTodo.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/__e2e__/workflowTodo.test.ts
index 5ede9a39a..3983e5f7f 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/__e2e__/workflowTodo.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/__e2e__/workflowTodo.test.ts
@@ -10,8 +10,8 @@ import {
generalWithNoRelationalFields,
apiGetDataSourceCount,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test('filter task node', async ({ page, mockPage, mockCollections, mockRecords }) => {
//数据表后缀标识
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/index.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/index.ts
index 30c89a5c7..d9be73d87 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/index.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/index.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import WorkflowPlugin from '../..';
import Manual from './instruction';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/AssigneesSelect.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/AssigneesSelect.tsx
index 4436f06d9..b67825d84 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/AssigneesSelect.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/AssigneesSelect.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { RemoteSelect, Variable } from '@nocobase/client';
+import { RemoteSelect, Variable } from '@tachybase/client';
import { useWorkflowVariableOptions } from '../../..';
function isUserKeyField(field) {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/FormBlockInitializer.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/FormBlockInitializer.tsx
index cf8466d5e..b42054f24 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/FormBlockInitializer.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/FormBlockInitializer.tsx
@@ -8,7 +8,7 @@ import {
useSchemaInitializer,
useSchemaInitializerItem,
useSchemaTemplateManager,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { JOB_STATUS, traverseSchema } from '../../..';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/FormBlockProvider.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/FormBlockProvider.tsx
index 542c10358..c67952f2f 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/FormBlockProvider.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/FormBlockProvider.tsx
@@ -15,7 +15,7 @@ import {
useDataSourceHeaders,
useDesignable,
useRecord,
-} from '@nocobase/client';
+} from '@tachybase/client';
import React, { useMemo, useRef } from 'react';
export function FormBlockProvider(props) {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/ModeConfig.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/ModeConfig.tsx
index e823b0f56..d7a708f0b 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/ModeConfig.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/ModeConfig.tsx
@@ -3,7 +3,7 @@ import { FormLayout } from '@tachybase/components';
import { Form, Radio, Tooltip } from 'antd';
import React from 'react';
-import { css, FormItem } from '@nocobase/client';
+import { css, FormItem } from '@tachybase/client';
import { lang } from '../../../locale';
function parseMode(v) {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/SchemaConfig.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/SchemaConfig.tsx
index 986ab6408..40ffe2772 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/SchemaConfig.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/SchemaConfig.tsx
@@ -33,7 +33,7 @@ import {
useSchemaInitializer,
useSchemaInitializerItem,
useSchemaOptionsContext,
-} from '@nocobase/client';
+} from '@tachybase/client';
import WorkflowPlugin, {
SimpleDesigner,
useAvailableUpstreams,
@@ -44,7 +44,7 @@ import WorkflowPlugin, {
} from '../../..';
import { JOB_STATUS } from '../../../constants';
-import { Registry, lodash } from '@nocobase/utils/client';
+import { Registry, lodash } from '@tachybase/utils/client';
import { NAMESPACE, lang } from '../../../locale';
import { FormBlockProvider } from './FormBlockProvider';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/createManualFormBlockUISchema.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/createManualFormBlockUISchema.ts
index 98841991f..af3f1b284 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/createManualFormBlockUISchema.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/createManualFormBlockUISchema.ts
@@ -1,4 +1,4 @@
-import { createFormBlockSchema } from '@nocobase/client';
+import { createFormBlockSchema } from '@tachybase/client';
export function createManualFormBlockUISchema(options) {
return createFormBlockSchema(options);
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/forms/create.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/forms/create.tsx
index ba0c930e8..c9fec4b10 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/forms/create.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/forms/create.tsx
@@ -10,7 +10,7 @@ import {
useCollection_deprecated,
useGetSchemaInitializerMenuItems,
useMenuSearch,
-} from '@nocobase/client';
+} from '@tachybase/client';
import _ from 'lodash';
import { NAMESPACE } from '../../../../locale';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/forms/custom.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/forms/custom.tsx
index cb64ba723..5775a9711 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/forms/custom.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/forms/custom.tsx
@@ -21,9 +21,9 @@ import {
useRecord,
useSchemaInitializer,
useSchemaInitializerItem,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { JOB_STATUS } from '../../../..';
-import { merge, uid } from '@nocobase/utils/client';
+import { merge, uid } from '@tachybase/utils/client';
import { NAMESPACE, lang } from '../../../../locale';
import { ManualFormType } from '../SchemaConfig';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/forms/update.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/forms/update.tsx
index b4eea1b70..31369e438 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/forms/update.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/forms/update.tsx
@@ -14,7 +14,7 @@ import {
useCollectionFilterOptions,
useDesignable,
useMenuSearch,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { NAMESPACE } from '../../../../locale';
import { FormBlockInitializer } from '../FormBlockInitializer';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/index.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/index.tsx
index c7890717d..2534347db 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/index.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/manual/instruction/index.tsx
@@ -1,4 +1,4 @@
-import { SchemaInitializerItemType, useCollectionManager_deprecated, useCompile, usePlugin } from '@nocobase/client';
+import { SchemaInitializerItemType, useCollectionManager_deprecated, useCompile, usePlugin } from '@tachybase/client';
import WorkflowPlugin, {
defaultFieldNames,
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/parallel/ParallelInstruction.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/features/parallel/ParallelInstruction.tsx
index eb2f6250d..9340fa7c0 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/parallel/ParallelInstruction.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/parallel/ParallelInstruction.tsx
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
import { Button, Tooltip } from 'antd';
import { PlusOutlined } from '@ant-design/icons';
-import { css } from '@nocobase/client';
+import { css } from '@tachybase/client';
import {
NodeDefaultView,
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/parallel/__e2e__/parallelBranch.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/features/parallel/__e2e__/parallelBranch.test.ts
index 8de79fbd7..455404ce4 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/parallel/__e2e__/parallelBranch.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/parallel/__e2e__/parallelBranch.test.ts
@@ -12,8 +12,8 @@ import {
ClculationNode,
apiGetWorkflowNodeExecutions,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test.describe('All succeeded', () => {
test('All 3 branches were successful', async ({ page, mockCollections, mockRecords }) => {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/parallel/index.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/features/parallel/index.ts
index d719db8eb..ab89c0d28 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/parallel/index.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/parallel/index.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import WorkflowPlugin from '../..';
import ParallelInstruction from './ParallelInstruction';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/request/index.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/features/request/index.ts
index f4da44202..16bd33be5 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/request/index.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/request/index.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import WorkflowPlugin from '../..';
import RequestInstruction from './RequestInstruction';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/sql/SQLInstruction.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/features/sql/SQLInstruction.tsx
index 97b769a04..3f174a2f9 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/sql/SQLInstruction.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/sql/SQLInstruction.tsx
@@ -1,4 +1,4 @@
-import { css } from '@nocobase/client';
+import { css } from '@tachybase/client';
import { Instruction, WorkflowVariableRawTextArea, defaultFieldNames } from '../..';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/sql/__e2e__/dataCURD.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/features/sql/__e2e__/dataCURD.test.ts
index 879374aa8..984883436 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/sql/__e2e__/dataCURD.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/sql/__e2e__/dataCURD.test.ts
@@ -16,8 +16,8 @@ import {
SQLNode,
apiGetRecord,
} from '@tachybase/plugin-workflow-test/e2e';
-import { expect, test } from '@nocobase/test/e2e';
-import { dayjs } from '@nocobase/utils';
+import { expect, test } from '@tachybase/test/e2e';
+import { dayjs } from '@tachybase/utils';
test.describe('select data', () => {
test('No variable SQL, select 1 record', async ({ page, mockCollections, mockRecords }) => {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/features/sql/index.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/features/sql/index.ts
index ddc7a4ab1..329cfb53d 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/features/sql/index.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/features/sql/index.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/client';
+import { Plugin } from '@tachybase/client';
import WorkflowPlugin from '../..';
import SQLInstruction from './SQLInstruction';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/hooks/useTriggerWorkflowActionProps.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/hooks/useTriggerWorkflowActionProps.ts
index be98fd166..111c62fca 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/hooks/useTriggerWorkflowActionProps.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/hooks/useTriggerWorkflowActionProps.ts
@@ -9,8 +9,8 @@ import {
useCollectValuesToSubmit,
useCompile,
useRecord,
-} from '@nocobase/client';
-import { isURL } from '@nocobase/utils/client';
+} from '@tachybase/client';
+import { isURL } from '@tachybase/utils/client';
export function useTriggerWorkflowsActionProps() {
const api = useAPIClient();
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/index.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/index.tsx
index 58b63062c..90ddd6fd4 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/index.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/index.tsx
@@ -1,7 +1,7 @@
import React from 'react';
-import { Plugin } from '@nocobase/client';
-import { Registry } from '@nocobase/utils/client';
+import { Plugin } from '@tachybase/client';
+import { Registry } from '@tachybase/utils/client';
import { ExecutionPage } from './ExecutionPage';
import { WorkflowPage } from './WorkflowPage';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/locale/index.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/locale/index.ts
index 5e513037d..e7dd9888c 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/locale/index.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/locale/index.ts
@@ -1,4 +1,4 @@
-import { i18n } from '@nocobase/client';
+import { i18n } from '@tachybase/client';
import { useTranslation } from 'react-i18next';
export const NAMESPACE = 'workflow';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/calculation.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/calculation.tsx
index 745832a52..1e1ea84fc 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/calculation.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/calculation.tsx
@@ -1,5 +1,5 @@
-import { SchemaInitializerItemType } from '@nocobase/client';
-import { Evaluator, evaluators, getOptions } from '@nocobase/evaluators/client';
+import { SchemaInitializerItemType } from '@tachybase/client';
+import { Evaluator, evaluators, getOptions } from '@tachybase/evaluators/client';
import { RadioWithTooltip } from '../components/RadioWithTooltip';
import { ValueBlock } from '../components/ValueBlock';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/condition.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/condition.tsx
index 97616a026..e29e18918 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/condition.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/condition.tsx
@@ -1,7 +1,7 @@
import { CloseCircleOutlined } from '@ant-design/icons';
-import { css, cx, useCompile, Variable } from '@nocobase/client';
-import { evaluators } from '@nocobase/evaluators/client';
-import { Registry } from '@nocobase/utils/client';
+import { css, cx, useCompile, Variable } from '@tachybase/client';
+import { evaluators } from '@tachybase/evaluators/client';
+import { Registry } from '@tachybase/utils/client';
import { Button, Select } from 'antd';
import React from 'react';
import { Trans, useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/create.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/create.tsx
index d3a0c0e28..46781f159 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/create.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/create.tsx
@@ -3,7 +3,7 @@ import {
useCollectionDataSource,
useCollectionManager_deprecated,
useCompile,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { CollectionBlockInitializer } from '../components/CollectionBlockInitializer';
import CollectionFieldset from '../components/CollectionFieldset';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/destroy.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/destroy.tsx
index 62c1c4dab..53b365a85 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/destroy.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/destroy.tsx
@@ -1,4 +1,4 @@
-import { useCollectionDataSource } from '@nocobase/client';
+import { useCollectionDataSource } from '@tachybase/client';
import { FilterDynamicComponent } from '../components/FilterDynamicComponent';
import { collection, filter } from '../schemas/collection';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/index.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/index.tsx
index 4ddbdc3d3..090f6be4d 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/index.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/index.tsx
@@ -18,8 +18,8 @@ import {
useCompile,
usePlugin,
useResourceActionContext,
-} from '@nocobase/client';
-import { parse, str2moment } from '@nocobase/utils/client';
+} from '@tachybase/client';
+import { parse, str2moment } from '@tachybase/utils/client';
import WorkflowPlugin from '..';
import { AddButton } from '../AddButton';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/query.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/query.tsx
index ebea3cc45..bd42d6212 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/query.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/query.tsx
@@ -6,7 +6,7 @@ import {
useCollectionDataSource,
useCollectionManager_deprecated,
useCompile,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { useForm } from '@tachybase/schema';
import { CollectionBlockInitializer } from '../components/CollectionBlockInitializer';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/update.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/update.tsx
index b00034443..b99c64511 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/update.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/nodes/update.tsx
@@ -1,7 +1,7 @@
import { useField, useForm } from '@tachybase/schema';
import React from 'react';
-import { useCollectionDataSource, useCollectionManager_deprecated } from '@nocobase/client';
+import { useCollectionDataSource, useCollectionManager_deprecated } from '@tachybase/client';
import CollectionFieldset from '../components/CollectionFieldset';
import { FilterDynamicComponent } from '../components/FilterDynamicComponent';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/schemas/collection.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/schemas/collection.ts
index effedfcc2..a98864ba7 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/schemas/collection.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/schemas/collection.ts
@@ -1,5 +1,5 @@
import { useForm } from '@tachybase/schema';
-import { css, parseCollectionName, useCollectionFilterOptions } from '@nocobase/client';
+import { css, parseCollectionName, useCollectionFilterOptions } from '@tachybase/client';
import { NAMESPACE } from '../locale';
export const collection = {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/schemas/executions.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/schemas/executions.tsx
index 903848a37..34ddf61f3 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/schemas/executions.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/schemas/executions.tsx
@@ -4,7 +4,7 @@ import { Link } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
import { message } from 'antd';
-import { useActionContext, useRecord, useResourceActionContext, useResourceContext } from '@nocobase/client';
+import { useActionContext, useRecord, useResourceActionContext, useResourceContext } from '@tachybase/client';
import { ExecutionStatusOptions } from '../constants';
import { NAMESPACE } from '../locale';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/schemas/workflows.ts b/packages/plugins/@tachybase/plugin-workflow/src/client/schemas/workflows.ts
index 7dc414fd3..3efce74b3 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/schemas/workflows.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/schemas/workflows.ts
@@ -1,5 +1,5 @@
import { ISchema, useForm } from '@tachybase/schema';
-import { useActionContext, useRecord, useResourceActionContext, useResourceContext } from '@nocobase/client';
+import { useActionContext, useRecord, useResourceActionContext, useResourceContext } from '@tachybase/client';
import { message } from 'antd';
import { useTranslation } from 'react-i18next';
import { NAMESPACE } from '../locale';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/settings/customizeSubmitToWorkflowActionSettings.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/settings/customizeSubmitToWorkflowActionSettings.tsx
index ad60ef6c3..607d2fe1f 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/settings/customizeSubmitToWorkflowActionSettings.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/settings/customizeSubmitToWorkflowActionSettings.tsx
@@ -10,7 +10,7 @@ import {
SkipValidation,
WorkflowConfig,
useSchemaToolbar,
-} from '@nocobase/client';
+} from '@tachybase/client';
export const customizeSubmitToWorkflowActionSettings = new SchemaSettings({
name: 'actionSettings:submitToWorkflow',
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/style.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/style.tsx
index c2ed96e9d..5717c0df4 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/style.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/style.tsx
@@ -1,4 +1,4 @@
-import { createStyles } from '@nocobase/client';
+import { createStyles } from '@tachybase/client';
const useStyles = createStyles(({ css, token }) => {
return {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/collection.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/collection.tsx
index 2658eb2d4..0eb313737 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/collection.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/collection.tsx
@@ -3,7 +3,7 @@ import {
useCollectionDataSource,
useCollectionManager_deprecated,
useCompile,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { CollectionBlockInitializer } from '../components/CollectionBlockInitializer';
import { FieldsSelect } from '../components/FieldsSelect';
import { NAMESPACE, lang } from '../locale';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/index.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/index.tsx
index 10df762e7..5947de656 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/index.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/index.tsx
@@ -18,7 +18,7 @@ import {
useCompile,
usePlugin,
useResourceActionContext,
-} from '@nocobase/client';
+} from '@tachybase/client';
import WorkflowPlugin from '..';
import { useFlowContext } from '../FlowContext';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/schedule/EndsByField.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/schedule/EndsByField.tsx
index c9d78c289..af5c4bf0e 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/schedule/EndsByField.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/schedule/EndsByField.tsx
@@ -1,6 +1,6 @@
-import { css } from '@nocobase/client';
+import { css } from '@tachybase/client';
import { DatePicker, Select } from 'antd';
-import { dayjs } from '@nocobase/utils/client';
+import { dayjs } from '@tachybase/utils/client';
import React from 'react';
import { useWorkflowTranslation } from '../../locale';
import { OnField } from './OnField';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/schedule/OnField.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/schedule/OnField.tsx
index 7ed5197c1..5406c364f 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/schedule/OnField.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/schedule/OnField.tsx
@@ -1,4 +1,4 @@
-import { css } from '@nocobase/client';
+import { css } from '@tachybase/client';
import { InputNumber, Select } from 'antd';
import React, { useState } from 'react';
import { useTranslation } from 'react-i18next';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/schedule/RepeatField.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/schedule/RepeatField.tsx
index fabcbee5b..084796aa9 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/schedule/RepeatField.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/schedule/RepeatField.tsx
@@ -1,4 +1,4 @@
-import { css } from '@nocobase/client';
+import { css } from '@tachybase/client';
import { InputNumber, Select } from 'antd';
import React from 'react';
import { Cron } from 'react-js-cron';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/schedule/ScheduleConfig.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/schedule/ScheduleConfig.tsx
index 76e0acd43..86b5eb135 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/schedule/ScheduleConfig.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/schedule/ScheduleConfig.tsx
@@ -1,6 +1,6 @@
import { onFieldValueChange } from '@tachybase/schema';
import { useForm, useFormEffects, ISchema } from '@tachybase/schema';
-import { css, SchemaComponent } from '@nocobase/client';
+import { css, SchemaComponent } from '@tachybase/client';
import React, { useState } from 'react';
import { NAMESPACE } from '../../locale';
import { appends, collection } from '../../schemas/collection';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/schedule/index.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/schedule/index.tsx
index 32b34be00..451a00a40 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/schedule/index.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/triggers/schedule/index.tsx
@@ -3,7 +3,7 @@ import {
useCollectionDataSource,
useCollectionManager_deprecated,
useCompile,
-} from '@nocobase/client';
+} from '@tachybase/client';
import { CollectionBlockInitializer } from '../../components/CollectionBlockInitializer';
import { NAMESPACE, lang } from '../../locale';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/client/variable.tsx b/packages/plugins/@tachybase/plugin-workflow/src/client/variable.tsx
index db1abeeba..4098e9793 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/client/variable.tsx
+++ b/packages/plugins/@tachybase/plugin-workflow/src/client/variable.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { Variable, parseCollectionName, useCompile, usePlugin } from '@nocobase/client';
+import { Variable, parseCollectionName, useCompile, usePlugin } from '@tachybase/client';
import { useFlowContext } from './FlowContext';
import { NAMESPACE, lang } from './locale';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/Plugin.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/Plugin.ts
index 2b48d5c54..8c8d1505f 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/Plugin.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/Plugin.ts
@@ -2,11 +2,11 @@ import path from 'path';
import LRUCache from 'lru-cache';
-import { Op, Transactionable } from '@nocobase/database';
-import Application, { Plugin, PluginOptions } from '@nocobase/server';
-import { Registry } from '@nocobase/utils';
+import { Op, Transactionable } from '@tachybase/database';
+import Application, { Plugin, PluginOptions } from '@tachybase/server';
+import { Registry } from '@tachybase/utils';
-import { Logger, LoggerOptions } from '@nocobase/logger';
+import { Logger, LoggerOptions } from '@tachybase/logger';
import Processor from './Processor';
import initActions from './actions';
import { EXECUTION_STATUS } from './constants';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/Processor.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/Processor.ts
index 798dce40c..898e9eaf3 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/Processor.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/Processor.ts
@@ -1,7 +1,7 @@
-import { Model, Transaction, Transactionable } from '@nocobase/database';
-import { appendArrayColumn } from '@nocobase/evaluators';
-import { Logger } from '@nocobase/logger';
-import { parse } from '@nocobase/utils';
+import { Model, Transaction, Transactionable } from '@tachybase/database';
+import { appendArrayColumn } from '@tachybase/evaluators';
+import { Logger } from '@tachybase/logger';
+import { parse } from '@tachybase/utils';
import type Plugin from './Plugin';
import { EXECUTION_STATUS, JOB_STATUS } from './constants';
import { Runner } from './instructions';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/Plugin.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/Plugin.test.ts
index f1f7f214e..eecb0aed9 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/Plugin.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/Plugin.test.ts
@@ -1,5 +1,5 @@
-import { MockServer } from '@nocobase/test';
-import Database from '@nocobase/database';
+import { MockServer } from '@tachybase/test';
+import Database from '@tachybase/database';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
import Plugin from '..';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/Processor.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/Processor.test.ts
index e0b109ab0..ce8cbbf70 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/Processor.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/Processor.test.ts
@@ -1,5 +1,5 @@
-import { MockDatabase } from '@nocobase/database';
-import { MockServer } from '@nocobase/test';
+import { MockDatabase } from '@tachybase/database';
+import { MockServer } from '@tachybase/test';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
import { EXECUTION_STATUS, JOB_STATUS } from '../constants';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/actions/executions.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/actions/executions.test.ts
index a8733a488..d9b902f58 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/actions/executions.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/actions/executions.test.ts
@@ -1,5 +1,5 @@
-import { MockServer } from '@nocobase/test';
-import Database from '@nocobase/database';
+import { MockServer } from '@tachybase/test';
+import Database from '@tachybase/database';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
import { EXECUTION_STATUS } from '../../constants';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/actions/nodes.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/actions/nodes.test.ts
index 397b95b83..f16746b7a 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/actions/nodes.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/actions/nodes.test.ts
@@ -1,5 +1,5 @@
-import { MockServer } from '@nocobase/test';
-import Database from '@nocobase/database';
+import { MockServer } from '@tachybase/test';
+import Database from '@tachybase/database';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
describe('workflow > actions > workflows', () => {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/actions/workflows.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/actions/workflows.test.ts
index 5511959fe..ce2b38f91 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/actions/workflows.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/actions/workflows.test.ts
@@ -1,5 +1,5 @@
-import { MockServer } from '@nocobase/test';
-import Database from '@nocobase/database';
+import { MockServer } from '@tachybase/test';
+import Database from '@tachybase/database';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
describe('workflow > actions > workflows', () => {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/calculation.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/calculation.test.ts
index dc9e67a0f..543b507cb 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/calculation.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/calculation.test.ts
@@ -1,5 +1,5 @@
-import { Application } from '@nocobase/server';
-import Database from '@nocobase/database';
+import { Application } from '@tachybase/server';
+import Database from '@tachybase/database';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
import { JOB_STATUS } from '../../constants';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/condition.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/condition.test.ts
index 1865e697d..3183f5a4d 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/condition.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/condition.test.ts
@@ -1,5 +1,5 @@
-import Database from '@nocobase/database';
-import { Application } from '@nocobase/server';
+import Database from '@tachybase/database';
+import { Application } from '@tachybase/server';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
import { EXECUTION_STATUS, JOB_STATUS } from '../../constants';
import { BRANCH_INDEX } from '../../instructions/ConditionInstruction';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/create.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/create.test.ts
index 46e0c94ec..48eec188e 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/create.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/create.test.ts
@@ -1,5 +1,5 @@
-import { Application } from '@nocobase/server';
-import Database from '@nocobase/database';
+import { Application } from '@tachybase/server';
+import Database from '@tachybase/database';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
describe('workflow > instructions > create', () => {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/destroy.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/destroy.test.ts
index a21e672af..571080b72 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/destroy.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/destroy.test.ts
@@ -1,5 +1,5 @@
-import { Application } from '@nocobase/server';
-import Database from '@nocobase/database';
+import { Application } from '@tachybase/server';
+import Database from '@tachybase/database';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
describe('workflow > instructions > destroy', () => {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/end.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/end.test.ts
index 89d66e45d..8b6523ae2 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/end.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/end.test.ts
@@ -1,5 +1,5 @@
-import { Application } from '@nocobase/server';
-import Database from '@nocobase/database';
+import { Application } from '@tachybase/server';
+import Database from '@tachybase/database';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
import WorkflowPlugin from '../..';
import { EXECUTION_STATUS, JOB_STATUS } from '../../constants';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/query.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/query.test.ts
index be35c0e04..3042d7048 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/query.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/query.test.ts
@@ -1,5 +1,5 @@
-import { Application } from '@nocobase/server';
-import Database from '@nocobase/database';
+import { Application } from '@tachybase/server';
+import Database from '@tachybase/database';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
import { EXECUTION_STATUS, JOB_STATUS } from '../../constants';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/update.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/update.test.ts
index 07a6bea06..e0d953d9f 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/update.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/instructions/update.test.ts
@@ -1,6 +1,6 @@
-import { MockDatabase } from '@nocobase/database';
+import { MockDatabase } from '@tachybase/database';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import type { WorkflowModel as WorkflowModelType } from '../../types';
import { EXECUTION_STATUS } from '../../constants';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/triggers/collection.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/triggers/collection.test.ts
index 0a54f95b0..8256493a8 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/triggers/collection.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/triggers/collection.test.ts
@@ -1,5 +1,5 @@
-import { MockDatabase } from '@nocobase/database';
-import { MockServer } from '@nocobase/test';
+import { MockDatabase } from '@tachybase/database';
+import { MockServer } from '@tachybase/test';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
import { EXECUTION_STATUS } from '../../constants';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/triggers/schedule/mode-date-field.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/triggers/schedule/mode-date-field.test.ts
index e79e8240c..ed9890e56 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/triggers/schedule/mode-date-field.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/triggers/schedule/mode-date-field.test.ts
@@ -1,5 +1,5 @@
-import { MockServer } from '@nocobase/test';
-import Database from '@nocobase/database';
+import { MockServer } from '@tachybase/test';
+import Database from '@tachybase/database';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
async function sleepToEvenSecond() {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/triggers/schedule/mode-static.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/triggers/schedule/mode-static.test.ts
index a57028ad2..9b9800dae 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/triggers/schedule/mode-static.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/__tests__/triggers/schedule/mode-static.test.ts
@@ -1,6 +1,6 @@
import { scryptSync } from 'crypto';
-import { MockServer } from '@nocobase/test';
-import Database from '@nocobase/database';
+import { MockServer } from '@tachybase/test';
+import Database from '@tachybase/database';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
async function sleepToEvenSecond() {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/actions/executions.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/actions/executions.ts
index 9ed81cb20..68a899bc7 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/actions/executions.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/actions/executions.ts
@@ -1,5 +1,5 @@
-import actions, { Context } from '@nocobase/actions';
-import { Op } from '@nocobase/database';
+import actions, { Context } from '@tachybase/actions';
+import { Op } from '@tachybase/database';
import { EXECUTION_STATUS, JOB_STATUS } from '../constants';
export async function destroy(context: Context, next) {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/actions/nodes.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/actions/nodes.ts
index 82bb32122..1e153545f 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/actions/nodes.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/actions/nodes.ts
@@ -1,5 +1,5 @@
-import { Context, utils } from '@nocobase/actions';
-import { MultipleRelationRepository, Op, Repository } from '@nocobase/database';
+import { Context, utils } from '@tachybase/actions';
+import { MultipleRelationRepository, Op, Repository } from '@tachybase/database';
import type { WorkflowModel } from '../types';
export async function create(context: Context, next) {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/actions/workflows.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/actions/workflows.ts
index dc7404d45..32ef25a97 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/actions/workflows.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/actions/workflows.ts
@@ -1,5 +1,5 @@
-import actions, { Context, utils } from '@nocobase/actions';
-import { Op, Repository } from '@nocobase/database';
+import actions, { Context, utils } from '@tachybase/actions';
+import { Op, Repository } from '@tachybase/database';
import Plugin from '../Plugin';
import { WorkflowModel } from '../types';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/collections/1-users_jobs.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/collections/1-users_jobs.ts
index be6fbee6c..a41c77c6f 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/collections/1-users_jobs.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/collections/1-users_jobs.ts
@@ -1,4 +1,4 @@
-import { defineCollection } from '@nocobase/database';
+import { defineCollection } from '@tachybase/database';
export default defineCollection({
name: 'users_jobs',
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/collections/2-jobs.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/collections/2-jobs.ts
index 4f8679316..59a5db15e 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/collections/2-jobs.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/collections/2-jobs.ts
@@ -1,4 +1,4 @@
-import { extendCollection } from '@nocobase/database';
+import { extendCollection } from '@tachybase/database';
export default extendCollection({
name: 'jobs',
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/collections/3-users.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/collections/3-users.ts
index 6e8c0362a..855bae8c1 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/collections/3-users.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/collections/3-users.ts
@@ -1,4 +1,4 @@
-import { extendCollection } from '@nocobase/database';
+import { extendCollection } from '@tachybase/database';
export default extendCollection({
name: 'users',
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/collections/executions.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/collections/executions.ts
index c46d0bfe2..caa28e946 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/collections/executions.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/collections/executions.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
export default {
dumpRules: {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/collections/flow_nodes.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/collections/flow_nodes.ts
index ffb70cf1d..0efd84d51 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/collections/flow_nodes.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/collections/flow_nodes.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
export default {
dumpRules: 'required',
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/collections/jobs.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/collections/jobs.ts
index bb2deeb5e..6067233d2 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/collections/jobs.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/collections/jobs.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
export default {
dumpRules: {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/collections/workflows.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/collections/workflows.ts
index 64465ad95..8f0613f7d 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/collections/workflows.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/collections/workflows.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
export default function () {
return {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/action-trigger/ActionTrigger.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/action-trigger/ActionTrigger.ts
index 271f1c258..dbea9a9fb 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/action-trigger/ActionTrigger.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/action-trigger/ActionTrigger.ts
@@ -1,11 +1,11 @@
import { get } from 'lodash';
import { BelongsTo, HasOne } from 'sequelize';
-import { Model, modelAssociationByKey } from '@nocobase/database';
-import Application, { DefaultContext } from '@nocobase/server';
-import { Context as ActionContext, Next } from '@nocobase/actions';
+import { Model, modelAssociationByKey } from '@tachybase/database';
+import Application, { DefaultContext } from '@tachybase/server';
+import { Context as ActionContext, Next } from '@tachybase/actions';
import WorkflowPlugin, { Trigger, WorkflowModel, toJSON } from '../..';
-import { parseCollectionName } from '@nocobase/data-source-manager';
+import { parseCollectionName } from '@tachybase/data-source-manager';
interface Context extends ActionContext, DefaultContext {}
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/action-trigger/Plugin.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/action-trigger/Plugin.ts
index 50196c20d..b2809a5e7 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/action-trigger/Plugin.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/action-trigger/Plugin.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/server';
+import { Plugin } from '@tachybase/server';
import WorkflowPlugin from '../..';
import ActionTrigger from './ActionTrigger';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/action-trigger/__tests__/trigger.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/action-trigger/__tests__/trigger.test.ts
index 1b99a3742..ac62788a3 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/action-trigger/__tests__/trigger.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/action-trigger/__tests__/trigger.test.ts
@@ -1,7 +1,7 @@
-import Database from '@nocobase/database';
+import Database from '@tachybase/database';
import { EXECUTION_STATUS } from '@tachybase/plugin-workflow';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import Plugin from '..';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/aggregate/AggregateInstruction.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/aggregate/AggregateInstruction.ts
index 294433959..9025c993f 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/aggregate/AggregateInstruction.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/aggregate/AggregateInstruction.ts
@@ -1,5 +1,5 @@
-import { parseCollectionName } from '@nocobase/data-source-manager';
-import { DataTypes } from '@nocobase/database';
+import { parseCollectionName } from '@tachybase/data-source-manager';
+import { DataTypes } from '@tachybase/database';
import { Processor, Instruction, JOB_STATUS, FlowNodeModel } from '../..';
const aggregators = {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/aggregate/Plugin.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/aggregate/Plugin.ts
index 99f381445..b52b8f11a 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/aggregate/Plugin.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/aggregate/Plugin.ts
@@ -1,5 +1,5 @@
import WorkflowPlugin from '../..';
-import { Plugin } from '@nocobase/server';
+import { Plugin } from '@tachybase/server';
import AggregateInstruction from './AggregateInstruction';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/aggregate/__tests__/instruction.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/aggregate/__tests__/instruction.test.ts
index ae876e669..730f3789f 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/aggregate/__tests__/instruction.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/aggregate/__tests__/instruction.test.ts
@@ -1,5 +1,5 @@
-import Database from '@nocobase/database';
-import { Application } from '@nocobase/server';
+import Database from '@tachybase/database';
+import { Application } from '@tachybase/server';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
import Plugin from '..';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/delay/Plugin.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/delay/Plugin.ts
index d9b3c49f5..bdae3d924 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/delay/Plugin.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/delay/Plugin.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/server';
+import { Plugin } from '@tachybase/server';
import WorkflowPlugin from '../..';
import DelayInstruction from './DelayInstruction';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/delay/__tests__/instruction.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/delay/__tests__/instruction.test.ts
index 896e38381..3f3548b5d 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/delay/__tests__/instruction.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/delay/__tests__/instruction.test.ts
@@ -1,7 +1,7 @@
-import Database from '@nocobase/database';
+import Database from '@tachybase/database';
import { EXECUTION_STATUS, JOB_STATUS } from '@tachybase/plugin-workflow';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
-import { Application } from '@nocobase/server';
+import { Application } from '@tachybase/server';
describe('workflow > instructions > delay', () => {
let app: Application;
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/dynamic-calculation/DynamicCalculation.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/dynamic-calculation/DynamicCalculation.ts
index 5597f0327..455af7b70 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/dynamic-calculation/DynamicCalculation.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/dynamic-calculation/DynamicCalculation.ts
@@ -1,6 +1,6 @@
-import { parse } from '@nocobase/utils';
+import { parse } from '@tachybase/utils';
import { FlowNodeModel, Instruction, JOB_STATUS, Processor } from '../..';
-import evaluators, { Evaluator } from '@nocobase/evaluators';
+import evaluators, { Evaluator } from '@tachybase/evaluators';
export class DynamicCalculation extends Instruction {
async run(node: FlowNodeModel, prevJob, processor: Processor) {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/dynamic-calculation/Plugin.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/dynamic-calculation/Plugin.ts
index 6424921e8..22a869d8f 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/dynamic-calculation/Plugin.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/dynamic-calculation/Plugin.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/server';
+import { Plugin } from '@tachybase/server';
import WorkflowPlugin from '../..';
import { ExpressionField } from './expression-field';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/dynamic-calculation/__tests__/collections/categories.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/dynamic-calculation/__tests__/collections/categories.ts
index 5368f7af2..45ffc22b3 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/dynamic-calculation/__tests__/collections/categories.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/dynamic-calculation/__tests__/collections/categories.ts
@@ -1,4 +1,4 @@
-import { extendCollection } from '@nocobase/database';
+import { extendCollection } from '@tachybase/database';
export default extendCollection({
name: 'categories',
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/dynamic-calculation/__tests__/instruction.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/dynamic-calculation/__tests__/instruction.test.ts
index 7e9a3f09b..36d7bdb3c 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/dynamic-calculation/__tests__/instruction.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/dynamic-calculation/__tests__/instruction.test.ts
@@ -1,8 +1,8 @@
import path from 'path';
-import { MockDatabase } from '@nocobase/database';
+import { MockDatabase } from '@tachybase/database';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
import Plugin from '..';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/dynamic-calculation/expression-field.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/dynamic-calculation/expression-field.ts
index 427dcbaeb..77dcaa143 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/dynamic-calculation/expression-field.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/dynamic-calculation/expression-field.ts
@@ -1,4 +1,4 @@
-import { BaseFieldOptions, DataTypes, Field } from '@nocobase/database';
+import { BaseFieldOptions, DataTypes, Field } from '@tachybase/database';
export interface ExpressionFieldOptions extends BaseFieldOptions {
type: 'expression';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/loop/Plugin.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/loop/Plugin.ts
index 416dc8b6c..a5a91cd5a 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/loop/Plugin.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/loop/Plugin.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/server';
+import { Plugin } from '@tachybase/server';
import { default as WorkflowPlugin } from '../..';
import LoopInstruction from './LoopInstruction';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/loop/__tests__/instruction.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/loop/__tests__/instruction.test.ts
index 90ac55457..7b2a438fb 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/loop/__tests__/instruction.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/loop/__tests__/instruction.test.ts
@@ -1,5 +1,5 @@
-import Database from '@nocobase/database';
-import { Application } from '@nocobase/server';
+import Database from '@tachybase/database';
+import { Application } from '@tachybase/server';
import { EXECUTION_STATUS, JOB_STATUS } from '@tachybase/plugin-workflow';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/ManualInstruction.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/ManualInstruction.ts
index f23775852..773ba622f 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/ManualInstruction.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/ManualInstruction.ts
@@ -1,4 +1,4 @@
-import { Registry } from '@nocobase/utils';
+import { Registry } from '@tachybase/utils';
import WorkflowPlugin, { Processor, JOB_STATUS, Instruction } from '../..';
import initFormTypes, { FormHandler } from './forms';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/Plugin.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/Plugin.ts
index bda0a0e83..690201d40 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/Plugin.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/Plugin.ts
@@ -1,6 +1,6 @@
-import { Plugin } from '@nocobase/server';
-import actions from '@nocobase/actions';
-import { HandlerType } from '@nocobase/resourcer';
+import { Plugin } from '@tachybase/server';
+import actions from '@tachybase/actions';
+import { HandlerType } from '@tachybase/resourcer';
import WorkflowPlugin, { JOB_STATUS } from '../..';
import { submit } from './actions';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/collections/categories.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/collections/categories.ts
index 1c73e2e43..d2977193f 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/collections/categories.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/collections/categories.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
export default {
name: 'categories',
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/collections/comments.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/collections/comments.ts
index 30494fae0..b5d172b97 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/collections/comments.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/collections/comments.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
export default {
name: 'comments',
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/collections/posts.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/collections/posts.ts
index 7e8e98db5..4982e7529 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/collections/posts.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/collections/posts.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
export default {
name: 'posts',
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/collections/tags.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/collections/tags.ts
index 433688e1b..7b41d4f33 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/collections/tags.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/collections/tags.ts
@@ -1,4 +1,4 @@
-import { CollectionOptions } from '@nocobase/database';
+import { CollectionOptions } from '@tachybase/database';
export default {
name: 'tags',
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/data-source.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/data-source.test.ts
index 20235a644..2248b2513 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/data-source.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/data-source.test.ts
@@ -1,7 +1,7 @@
-import Database from '@nocobase/database';
+import Database from '@tachybase/database';
import { EXECUTION_STATUS, JOB_STATUS } from '@tachybase/plugin-workflow';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
// NOTE: skipped because time is not stable on github ci, but should work in local
describe('workflow > instructions > manual', () => {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/form.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/form.test.ts
index 97fd63401..6e1bf8e8a 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/form.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/form.test.ts
@@ -1,7 +1,7 @@
-import Database from '@nocobase/database';
+import Database from '@tachybase/database';
import { EXECUTION_STATUS, JOB_STATUS } from '@tachybase/plugin-workflow';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
// NOTE: skipped because time is not stable on github ci, but should work in local
describe('workflow > instructions > manual', () => {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/mode.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/mode.test.ts
index 44d0069c9..bb425ef39 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/mode.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/__tests__/mode.test.ts
@@ -1,7 +1,7 @@
-import Database from '@nocobase/database';
+import Database from '@tachybase/database';
import { EXECUTION_STATUS, JOB_STATUS } from '@tachybase/plugin-workflow';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
-import { MockServer } from '@nocobase/test';
+import { MockServer } from '@tachybase/test';
// NOTE: skipped because time is not stable on github ci, but should work in local
describe('workflow > instructions > manual', () => {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/actions.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/actions.ts
index 0f863d1b3..60ae333b8 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/actions.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/manual/actions.ts
@@ -1,4 +1,4 @@
-import { Context, utils } from '@nocobase/actions';
+import { Context, utils } from '@tachybase/actions';
import WorkflowPlugin, { EXECUTION_STATUS, JOB_STATUS } from '../..';
import ManualInstruction from './ManualInstruction';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/parallel/Plugin.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/parallel/Plugin.ts
index b4610cd18..ad3b2ac28 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/parallel/Plugin.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/parallel/Plugin.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/server';
+import { Plugin } from '@tachybase/server';
import WorkflowPlugin from '../..';
import ParallelInstruction from './ParallelInstruction';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/parallel/__tests__/instruction.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/parallel/__tests__/instruction.test.ts
index 8c84457f4..d2a32e8d7 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/parallel/__tests__/instruction.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/parallel/__tests__/instruction.test.ts
@@ -1,5 +1,5 @@
-import Database from '@nocobase/database';
-import { Application } from '@nocobase/server';
+import Database from '@tachybase/database';
+import { Application } from '@tachybase/server';
import { EXECUTION_STATUS, JOB_STATUS } from '@tachybase/plugin-workflow';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/request/Plugin.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/request/Plugin.ts
index d1d545855..8f18ba14f 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/request/Plugin.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/request/Plugin.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/server';
+import { Plugin } from '@tachybase/server';
import WorkflowPlugin from '../..';
import RequestInstruction from './RequestInstruction';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/request/__tests__/instruction.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/request/__tests__/instruction.test.ts
index 03f07aeb6..3f6fd2c10 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/request/__tests__/instruction.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/request/__tests__/instruction.test.ts
@@ -3,8 +3,8 @@ import jwt from 'jsonwebtoken';
import Koa from 'koa';
import bodyParser from 'koa-bodyparser';
-import Database from '@nocobase/database';
-import { MockServer } from '@nocobase/test';
+import Database from '@tachybase/database';
+import { MockServer } from '@tachybase/test';
import PluginWorkflow, { Processor, EXECUTION_STATUS, JOB_STATUS } from '@tachybase/plugin-workflow';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/sql/Plugin.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/sql/Plugin.ts
index 2cb700c27..d7a879c07 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/sql/Plugin.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/sql/Plugin.ts
@@ -1,4 +1,4 @@
-import { Plugin } from '@nocobase/server';
+import { Plugin } from '@tachybase/server';
import WorkflowPlugin from '../..';
import SQLInstruction from './SQLInstruction';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/features/sql/__tests__/instruction.test.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/features/sql/__tests__/instruction.test.ts
index 057b8b53d..07c17f4e7 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/features/sql/__tests__/instruction.test.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/features/sql/__tests__/instruction.test.ts
@@ -1,5 +1,5 @@
-import Database, { fn } from '@nocobase/database';
-import { Application } from '@nocobase/server';
+import Database, { fn } from '@tachybase/database';
+import { Application } from '@tachybase/server';
import { EXECUTION_STATUS, JOB_STATUS } from '@tachybase/plugin-workflow';
import { getApp, sleep } from '@tachybase/plugin-workflow-test';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/CalculationInstruction.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/CalculationInstruction.ts
index ee875a890..363cc0962 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/CalculationInstruction.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/CalculationInstruction.ts
@@ -1,5 +1,5 @@
-import { Evaluator, evaluators } from '@nocobase/evaluators';
-import { parse } from '@nocobase/utils';
+import { Evaluator, evaluators } from '@tachybase/evaluators';
+import { parse } from '@tachybase/utils';
import { Instruction } from '.';
import type Processor from '../Processor';
import { JOB_STATUS } from '../constants';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/ConditionInstruction.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/ConditionInstruction.ts
index fb84f92e0..1de6c457c 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/ConditionInstruction.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/ConditionInstruction.ts
@@ -1,5 +1,5 @@
-import { evaluators } from '@nocobase/evaluators';
-import { Registry } from '@nocobase/utils';
+import { evaluators } from '@tachybase/evaluators';
+import { Registry } from '@tachybase/utils';
import { Instruction } from '.';
import type Processor from '../Processor';
import { JOB_STATUS } from '../constants';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/CreateInstruction.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/CreateInstruction.ts
index 6173bb393..6e7b03cf4 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/CreateInstruction.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/CreateInstruction.ts
@@ -1,4 +1,4 @@
-import { parseCollectionName } from '@nocobase/data-source-manager';
+import { parseCollectionName } from '@tachybase/data-source-manager';
import { JOB_STATUS } from '../constants';
import { toJSON } from '../utils';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/DestroyInstruction.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/DestroyInstruction.ts
index a93e48617..dd85be8a5 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/DestroyInstruction.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/DestroyInstruction.ts
@@ -1,4 +1,4 @@
-import { parseCollectionName } from '@nocobase/data-source-manager';
+import { parseCollectionName } from '@tachybase/data-source-manager';
import { Instruction } from '.';
import type Processor from '../Processor';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/QueryInstruction.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/QueryInstruction.ts
index 332aceb1e..43e797221 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/QueryInstruction.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/QueryInstruction.ts
@@ -1,5 +1,5 @@
-import { DEFAULT_PAGE, DEFAULT_PER_PAGE, utils } from '@nocobase/actions';
-import { parseCollectionName } from '@nocobase/data-source-manager';
+import { DEFAULT_PAGE, DEFAULT_PER_PAGE, utils } from '@tachybase/actions';
+import { parseCollectionName } from '@tachybase/data-source-manager';
import type Processor from '../Processor';
import { JOB_STATUS } from '../constants';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/UpdateInstruction.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/UpdateInstruction.ts
index 95e352d3d..e4988916a 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/UpdateInstruction.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/UpdateInstruction.ts
@@ -1,4 +1,4 @@
-import { parseCollectionName } from '@nocobase/data-source-manager';
+import { parseCollectionName } from '@tachybase/data-source-manager';
import type Processor from '../Processor';
import { JOB_STATUS } from '../constants';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/index.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/index.ts
index b8a08c97d..4a45ca695 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/index.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/instructions/index.ts
@@ -1,4 +1,4 @@
-import { Transactionable } from '@nocobase/database';
+import { Transactionable } from '@tachybase/database';
import type Plugin from '../Plugin';
import type Processor from '../Processor';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/triggers/CollectionTrigger.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/triggers/CollectionTrigger.ts
index 1bec73ee8..ce12c7a7b 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/triggers/CollectionTrigger.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/triggers/CollectionTrigger.ts
@@ -1,8 +1,8 @@
-import { Model, Transactionable } from '@nocobase/database';
+import { Model, Transactionable } from '@tachybase/database';
import Trigger from '.';
import { toJSON } from '../utils';
import type { WorkflowModel } from '../types';
-import { parseCollectionName, ICollection } from '@nocobase/data-source-manager';
+import { parseCollectionName, ICollection } from '@tachybase/data-source-manager';
export interface CollectionChangeTriggerConfig {
collection: string;
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/triggers/ScheduleTrigger/DateFieldScheduleTrigger.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/triggers/ScheduleTrigger/DateFieldScheduleTrigger.ts
index 1340ce269..9d9aff2fd 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/triggers/ScheduleTrigger/DateFieldScheduleTrigger.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/triggers/ScheduleTrigger/DateFieldScheduleTrigger.ts
@@ -1,9 +1,9 @@
-import { fn, literal, Op, Transactionable, where } from '@nocobase/database';
+import { fn, literal, Op, Transactionable, where } from '@tachybase/database';
import parser from 'cron-parser';
import type Plugin from '../../Plugin';
import type { WorkflowModel } from '../../types';
import { parseDateWithoutMs, SCHEDULE_MODE } from './utils';
-import { parseCollectionName } from '@nocobase/data-source-manager';
+import { parseCollectionName } from '@tachybase/data-source-manager';
export type ScheduleOnField = {
field: string;
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/triggers/index.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/triggers/index.ts
index 1737c3c90..eaee27700 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/triggers/index.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/triggers/index.ts
@@ -1,4 +1,4 @@
-import { Transactionable } from '@nocobase/database';
+import { Transactionable } from '@tachybase/database';
import type Plugin from '../Plugin';
import type { WorkflowModel } from '../types';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/types/Execution.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/types/Execution.ts
index 52db181e0..45926fa54 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/types/Execution.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/types/Execution.ts
@@ -1,4 +1,4 @@
-import { BelongsToGetAssociationMixin, Database, HasManyGetAssociationsMixin, Model } from '@nocobase/database';
+import { BelongsToGetAssociationMixin, Database, HasManyGetAssociationsMixin, Model } from '@tachybase/database';
import JobModel from './Job';
import WorkflowModel from './Workflow';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/types/FlowNode.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/types/FlowNode.ts
index dc080baf4..df99ed9e4 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/types/FlowNode.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/types/FlowNode.ts
@@ -1,4 +1,4 @@
-import { BelongsToGetAssociationMixin, Database, Model } from '@nocobase/database';
+import { BelongsToGetAssociationMixin, Database, Model } from '@tachybase/database';
import WorkflowModel from './Workflow';
export default class FlowNodeModel extends Model {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/types/Job.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/types/Job.ts
index f97380a73..e1d941ce1 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/types/Job.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/types/Job.ts
@@ -1,4 +1,4 @@
-import { BelongsToGetAssociationMixin, Model } from '@nocobase/database';
+import { BelongsToGetAssociationMixin, Model } from '@tachybase/database';
import FlowNodeModel from './FlowNode';
export default class JobModel extends Model {
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/types/Workflow.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/types/Workflow.ts
index 2171779e4..d2abe68d7 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/types/Workflow.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/types/Workflow.ts
@@ -4,7 +4,7 @@ import {
HasManyCreateAssociationMixin,
HasManyGetAssociationsMixin,
Model,
-} from '@nocobase/database';
+} from '@tachybase/database';
import ExecutionModel from './Execution';
import FlowNodeModel from './FlowNode';
diff --git a/packages/plugins/@tachybase/plugin-workflow/src/server/utils.ts b/packages/plugins/@tachybase/plugin-workflow/src/server/utils.ts
index aa41be557..3dcf1a2b1 100644
--- a/packages/plugins/@tachybase/plugin-workflow/src/server/utils.ts
+++ b/packages/plugins/@tachybase/plugin-workflow/src/server/utils.ts
@@ -1,4 +1,4 @@
-import { Model } from '@nocobase/database';
+import { Model } from '@tachybase/database';
export function toJSON(data: any): any {
if (Array.isArray(data)) {
diff --git a/packages/presets/tachybase/.npmignore b/packages/presets/base/.npmignore
similarity index 100%
rename from packages/presets/tachybase/.npmignore
rename to packages/presets/base/.npmignore
diff --git a/packages/presets/tachybase/client.d.ts b/packages/presets/base/client.d.ts
similarity index 100%
rename from packages/presets/tachybase/client.d.ts
rename to packages/presets/base/client.d.ts
diff --git a/packages/presets/tachybase/client.js b/packages/presets/base/client.js
similarity index 100%
rename from packages/presets/tachybase/client.js
rename to packages/presets/base/client.js
diff --git a/packages/presets/tachybase/package.json b/packages/presets/base/package.json
similarity index 97%
rename from packages/presets/tachybase/package.json
rename to packages/presets/base/package.json
index c17a7d6cc..9b88ab224 100644
--- a/packages/presets/tachybase/package.json
+++ b/packages/presets/base/package.json
@@ -6,7 +6,6 @@
"dependencies": {
"@hera/plugin-approval": "workspace:*",
"@hera/plugin-audit-logs": "workspace:*",
- "@nocobase/client": "workspace:*",
"@nocobase/plugin-acl": "workspace:*",
"@nocobase/plugin-action-bulk-edit": "workspace:*",
"@nocobase/plugin-action-bulk-update": "workspace:*",
@@ -49,10 +48,11 @@
"@nocobase/plugin-ui-schema-storage": "workspace:*",
"@nocobase/plugin-users": "workspace:*",
"@nocobase/plugin-verification": "workspace:*",
- "@nocobase/server": "workspace:*",
+ "@tachybase/client": "workspace:*",
"@tachybase/plugin-mobile-client": "workspace:*",
"@tachybase/plugin-workflow": "workspace:*",
"@tachybase/schema": "workspace:*",
+ "@tachybase/server": "workspace:*",
"cronstrue": "^2.11.0",
"lodash": "4.17.21"
},
diff --git a/packages/presets/tachybase/server.d.ts b/packages/presets/base/server.d.ts
similarity index 100%
rename from packages/presets/tachybase/server.d.ts
rename to packages/presets/base/server.d.ts
diff --git a/packages/presets/tachybase/server.js b/packages/presets/base/server.js
similarity index 100%
rename from packages/presets/tachybase/server.js
rename to packages/presets/base/server.js
diff --git a/packages/presets/tachybase/src/client/index.ts b/packages/presets/base/src/client/index.ts
similarity index 87%
rename from packages/presets/tachybase/src/client/index.ts
rename to packages/presets/base/src/client/index.ts
index ef84a4673..93aa40cf6 100644
--- a/packages/presets/tachybase/src/client/index.ts
+++ b/packages/presets/base/src/client/index.ts
@@ -1,4 +1,4 @@
-import { Application, NocoBaseBuildInPlugin, Plugin } from '@nocobase/client';
+import { Application, NocoBaseBuildInPlugin, Plugin } from '@tachybase/client';
const getCurrentTimezone = () => {
const timezoneOffset = new Date().getTimezoneOffset() / -60;
@@ -25,3 +25,5 @@ export class TachyBaseClientPresetPlugin extends Plugin {
await this.app.pm.add(NocoBaseBuildInPlugin);
}
}
+
+export default TachyBaseClientPresetPlugin;
diff --git a/packages/presets/tachybase/src/index.ts b/packages/presets/base/src/index.ts
similarity index 100%
rename from packages/presets/tachybase/src/index.ts
rename to packages/presets/base/src/index.ts
diff --git a/packages/presets/tachybase/src/server/index.ts b/packages/presets/base/src/server/index.ts
similarity index 95%
rename from packages/presets/tachybase/src/server/index.ts
rename to packages/presets/base/src/server/index.ts
index cc08120de..5a235d7f6 100644
--- a/packages/presets/tachybase/src/server/index.ts
+++ b/packages/presets/base/src/server/index.ts
@@ -1,8 +1,8 @@
-import { Plugin, PluginManager } from '@nocobase/server';
+import { Plugin, PluginManager } from '@tachybase/server';
import _ from 'lodash';
export class PresetTachyBase extends Plugin {
- builtInPlugins = [
+ #builtInPlugins = [
// required plugins
'data-source-manager',
'error-handler',
@@ -40,7 +40,11 @@ export class PresetTachyBase extends Plugin {
'approval',
];
- localPlugins = [
+ get builtInPlugins() {
+ return this.#builtInPlugins;
+ }
+
+ #localPlugins = [
// optional plugins, default disabled
'api-doc>=0.13.0-alpha.1',
'api-keys>=0.10.1-alpha.1',
@@ -58,6 +62,10 @@ export class PresetTachyBase extends Plugin {
'theme-editor>=0.11.1-alpha.1',
];
+ get localPlugins() {
+ return this.#localPlugins;
+ }
+
splitNames(name: string) {
return (name || '').split(',').filter(Boolean);
}
diff --git a/packages/presets/tachybase/src/server/migrations/.gitkeep b/packages/presets/base/src/server/migrations/.gitkeep
similarity index 100%
rename from packages/presets/tachybase/src/server/migrations/.gitkeep
rename to packages/presets/base/src/server/migrations/.gitkeep
diff --git a/packages/presets/tachybase/src/server/migrations/20240414160015-remove-audit-local.ts b/packages/presets/base/src/server/migrations/20240414160015-remove-audit-local.ts
similarity index 84%
rename from packages/presets/tachybase/src/server/migrations/20240414160015-remove-audit-local.ts
rename to packages/presets/base/src/server/migrations/20240414160015-remove-audit-local.ts
index 53e728975..8ef6d2b33 100644
--- a/packages/presets/tachybase/src/server/migrations/20240414160015-remove-audit-local.ts
+++ b/packages/presets/base/src/server/migrations/20240414160015-remove-audit-local.ts
@@ -1,4 +1,4 @@
-import { Migration } from '@nocobase/server';
+import { Migration } from '@tachybase/server';
export default class RemoveBuitInAuditLogsMigration extends Migration {
on = 'beforeLoad';
diff --git a/packages/presets/hera-rental/.npmignore b/packages/presets/hera-rental/.npmignore
new file mode 100644
index 000000000..c593fe9df
--- /dev/null
+++ b/packages/presets/hera-rental/.npmignore
@@ -0,0 +1,2 @@
+/node_modules
+/src
\ No newline at end of file
diff --git a/packages/presets/hera-rental/client.d.ts b/packages/presets/hera-rental/client.d.ts
new file mode 100644
index 000000000..d515d1feb
--- /dev/null
+++ b/packages/presets/hera-rental/client.d.ts
@@ -0,0 +1,3 @@
+export * from './src/client';
+export { default } from './src/client';
+
diff --git a/packages/presets/hera-rental/client.js b/packages/presets/hera-rental/client.js
new file mode 100644
index 000000000..3c39956ca
--- /dev/null
+++ b/packages/presets/hera-rental/client.js
@@ -0,0 +1 @@
+module.exports = require('./lib/client/index.js');
diff --git a/packages/presets/hera-rental/package.json b/packages/presets/hera-rental/package.json
new file mode 100644
index 000000000..37646d452
--- /dev/null
+++ b/packages/presets/hera-rental/package.json
@@ -0,0 +1,65 @@
+{
+ "name": "@tachybase/preset-hera-rental",
+ "version": "0.21.18",
+ "license": "Apache-2.0",
+ "main": "./lib/server/index.js",
+ "dependencies": {
+ "@hera/plugin-approval": "workspace:*",
+ "@hera/plugin-audit-logs": "workspace:*",
+ "@hera/plugin-core": "workspace:*",
+ "@hera/plugin-rental": "workspace:*",
+ "@nocobase/plugin-acl": "workspace:*",
+ "@nocobase/plugin-action-bulk-edit": "workspace:*",
+ "@nocobase/plugin-action-bulk-update": "workspace:*",
+ "@nocobase/plugin-action-duplicate": "workspace:*",
+ "@nocobase/plugin-action-print": "workspace:*",
+ "@nocobase/plugin-api-doc": "workspace:*",
+ "@nocobase/plugin-api-keys": "workspace:*",
+ "@nocobase/plugin-auth": "workspace:*",
+ "@nocobase/plugin-backup-restore": "workspace:*",
+ "@nocobase/plugin-calendar": "workspace:*",
+ "@nocobase/plugin-cas": "workspace:*",
+ "@nocobase/plugin-china-region": "workspace:*",
+ "@nocobase/plugin-client": "workspace:*",
+ "@nocobase/plugin-collection-manager": "workspace:*",
+ "@nocobase/plugin-custom-request": "workspace:*",
+ "@nocobase/plugin-data-source-manager": "workspace:*",
+ "@nocobase/plugin-data-visualization": "workspace:*",
+ "@nocobase/plugin-error-handler": "workspace:*",
+ "@nocobase/plugin-export": "workspace:*",
+ "@nocobase/plugin-file-manager": "workspace:*",
+ "@nocobase/plugin-formula-field": "workspace:*",
+ "@nocobase/plugin-gantt": "workspace:*",
+ "@nocobase/plugin-graph-collection-manager": "workspace:*",
+ "@nocobase/plugin-iframe-block": "workspace:*",
+ "@nocobase/plugin-import": "workspace:*",
+ "@nocobase/plugin-kanban": "workspace:*",
+ "@nocobase/plugin-localization-management": "workspace:*",
+ "@nocobase/plugin-logger": "workspace:*",
+ "@nocobase/plugin-map": "workspace:*",
+ "@nocobase/plugin-mock-collections": "workspace:*",
+ "@nocobase/plugin-multi-app-manager": "workspace:*",
+ "@nocobase/plugin-multi-app-share-collection": "workspace:*",
+ "@nocobase/plugin-oidc": "workspace:*",
+ "@nocobase/plugin-saml": "workspace:*",
+ "@nocobase/plugin-sequence-field": "workspace:*",
+ "@nocobase/plugin-sms-auth": "workspace:*",
+ "@nocobase/plugin-snapshot-field": "workspace:*",
+ "@nocobase/plugin-system-settings": "workspace:*",
+ "@nocobase/plugin-theme-editor": "workspace:*",
+ "@nocobase/plugin-ui-schema-storage": "workspace:*",
+ "@nocobase/plugin-users": "workspace:*",
+ "@nocobase/plugin-verification": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/plugin-mobile-client": "workspace:*",
+ "@tachybase/plugin-workflow": "workspace:*",
+ "@tachybase/preset-tachybase": "workspace:*",
+ "@tachybase/schema": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "cronstrue": "^2.11.0",
+ "lodash": "4.17.21"
+ },
+ "devDependencies": {
+ "@types/lodash": "^4.17.0"
+ }
+}
diff --git a/packages/presets/hera-rental/server.d.ts b/packages/presets/hera-rental/server.d.ts
new file mode 100644
index 000000000..b55e6f70d
--- /dev/null
+++ b/packages/presets/hera-rental/server.d.ts
@@ -0,0 +1,3 @@
+export * from './src/server';
+export { default } from './src/server';
+
diff --git a/packages/presets/hera-rental/server.js b/packages/presets/hera-rental/server.js
new file mode 100644
index 000000000..adcc9d90d
--- /dev/null
+++ b/packages/presets/hera-rental/server.js
@@ -0,0 +1 @@
+module.exports = require('./lib/server/index.js');
diff --git a/packages/presets/hera-rental/src/client/index.ts b/packages/presets/hera-rental/src/client/index.ts
new file mode 100644
index 000000000..182ea60d6
--- /dev/null
+++ b/packages/presets/hera-rental/src/client/index.ts
@@ -0,0 +1,3 @@
+import { TachyBaseClientPresetPlugin } from 'packages/presets/base/src/client';
+
+export class PluginRental extends TachyBaseClientPresetPlugin {}
diff --git a/packages/presets/hera-rental/src/index.ts b/packages/presets/hera-rental/src/index.ts
new file mode 100644
index 000000000..7ddad5814
--- /dev/null
+++ b/packages/presets/hera-rental/src/index.ts
@@ -0,0 +1 @@
+export { default } from './server';
diff --git a/packages/presets/hera-rental/src/server/index.ts b/packages/presets/hera-rental/src/server/index.ts
new file mode 100644
index 000000000..3c3743045
--- /dev/null
+++ b/packages/presets/hera-rental/src/server/index.ts
@@ -0,0 +1,12 @@
+import PresetTachyBase from 'packages/presets/base/src';
+import _ from 'lodash';
+
+export class PluginRental extends PresetTachyBase {
+ #builtInPlugins = ['approval-mobile', 'core', 'rental', 'mobile-client'];
+
+ get builtInPlugins() {
+ return super.builtInPlugins.concat(this.#builtInPlugins);
+ }
+}
+
+export default PresetTachyBase;
diff --git a/packages/presets/sancongtou/.npmignore b/packages/presets/sancongtou/.npmignore
new file mode 100644
index 000000000..c593fe9df
--- /dev/null
+++ b/packages/presets/sancongtou/.npmignore
@@ -0,0 +1,2 @@
+/node_modules
+/src
\ No newline at end of file
diff --git a/packages/presets/sancongtou/client.d.ts b/packages/presets/sancongtou/client.d.ts
new file mode 100644
index 000000000..d515d1feb
--- /dev/null
+++ b/packages/presets/sancongtou/client.d.ts
@@ -0,0 +1,3 @@
+export * from './src/client';
+export { default } from './src/client';
+
diff --git a/packages/presets/sancongtou/client.js b/packages/presets/sancongtou/client.js
new file mode 100644
index 000000000..3c39956ca
--- /dev/null
+++ b/packages/presets/sancongtou/client.js
@@ -0,0 +1 @@
+module.exports = require('./lib/client/index.js');
diff --git a/packages/presets/sancongtou/package.json b/packages/presets/sancongtou/package.json
new file mode 100644
index 000000000..35afd582d
--- /dev/null
+++ b/packages/presets/sancongtou/package.json
@@ -0,0 +1,67 @@
+{
+ "name": "@tachybase/preset-sancongtou",
+ "version": "0.21.18",
+ "license": "Apache-2.0",
+ "main": "./lib/server/index.js",
+ "dependencies": {
+ "@hera/plugin-approval": "workspace:*",
+ "@hera/plugin-approval-mobile": "workspace:*",
+ "@hera/plugin-audit-logs": "workspace:*",
+ "@hera/plugin-core": "workspace:*",
+ "@hera/plugin-rental": "workspace:*",
+ "@hera/plugin-sancongtou": "workspace:*",
+ "@nocobase/plugin-acl": "workspace:*",
+ "@nocobase/plugin-action-bulk-edit": "workspace:*",
+ "@nocobase/plugin-action-bulk-update": "workspace:*",
+ "@nocobase/plugin-action-duplicate": "workspace:*",
+ "@nocobase/plugin-action-print": "workspace:*",
+ "@nocobase/plugin-api-doc": "workspace:*",
+ "@nocobase/plugin-api-keys": "workspace:*",
+ "@nocobase/plugin-auth": "workspace:*",
+ "@nocobase/plugin-backup-restore": "workspace:*",
+ "@nocobase/plugin-calendar": "workspace:*",
+ "@nocobase/plugin-cas": "workspace:*",
+ "@nocobase/plugin-china-region": "workspace:*",
+ "@nocobase/plugin-client": "workspace:*",
+ "@nocobase/plugin-collection-manager": "workspace:*",
+ "@nocobase/plugin-custom-request": "workspace:*",
+ "@nocobase/plugin-data-source-manager": "workspace:*",
+ "@nocobase/plugin-data-visualization": "workspace:*",
+ "@nocobase/plugin-error-handler": "workspace:*",
+ "@nocobase/plugin-export": "workspace:*",
+ "@nocobase/plugin-file-manager": "workspace:*",
+ "@nocobase/plugin-formula-field": "workspace:*",
+ "@nocobase/plugin-gantt": "workspace:*",
+ "@nocobase/plugin-graph-collection-manager": "workspace:*",
+ "@nocobase/plugin-iframe-block": "workspace:*",
+ "@nocobase/plugin-import": "workspace:*",
+ "@nocobase/plugin-kanban": "workspace:*",
+ "@nocobase/plugin-localization-management": "workspace:*",
+ "@nocobase/plugin-logger": "workspace:*",
+ "@nocobase/plugin-map": "workspace:*",
+ "@nocobase/plugin-mock-collections": "workspace:*",
+ "@nocobase/plugin-multi-app-manager": "workspace:*",
+ "@nocobase/plugin-multi-app-share-collection": "workspace:*",
+ "@nocobase/plugin-oidc": "workspace:*",
+ "@nocobase/plugin-saml": "workspace:*",
+ "@nocobase/plugin-sequence-field": "workspace:*",
+ "@nocobase/plugin-sms-auth": "workspace:*",
+ "@nocobase/plugin-snapshot-field": "workspace:*",
+ "@nocobase/plugin-system-settings": "workspace:*",
+ "@nocobase/plugin-theme-editor": "workspace:*",
+ "@nocobase/plugin-ui-schema-storage": "workspace:*",
+ "@nocobase/plugin-users": "workspace:*",
+ "@nocobase/plugin-verification": "workspace:*",
+ "@tachybase/client": "workspace:*",
+ "@tachybase/plugin-mobile-client": "workspace:*",
+ "@tachybase/plugin-workflow": "workspace:*",
+ "@tachybase/preset-tachybase": "workspace:*",
+ "@tachybase/schema": "workspace:*",
+ "@tachybase/server": "workspace:*",
+ "cronstrue": "^2.11.0",
+ "lodash": "4.17.21"
+ },
+ "devDependencies": {
+ "@types/lodash": "^4.17.0"
+ }
+}
diff --git a/packages/presets/sancongtou/server.d.ts b/packages/presets/sancongtou/server.d.ts
new file mode 100644
index 000000000..b55e6f70d
--- /dev/null
+++ b/packages/presets/sancongtou/server.d.ts
@@ -0,0 +1,3 @@
+export * from './src/server';
+export { default } from './src/server';
+
diff --git a/packages/presets/sancongtou/server.js b/packages/presets/sancongtou/server.js
new file mode 100644
index 000000000..adcc9d90d
--- /dev/null
+++ b/packages/presets/sancongtou/server.js
@@ -0,0 +1 @@
+module.exports = require('./lib/server/index.js');
diff --git a/packages/presets/sancongtou/src/client/index.ts b/packages/presets/sancongtou/src/client/index.ts
new file mode 100644
index 000000000..182ea60d6
--- /dev/null
+++ b/packages/presets/sancongtou/src/client/index.ts
@@ -0,0 +1,3 @@
+import { TachyBaseClientPresetPlugin } from 'packages/presets/base/src/client';
+
+export class PluginRental extends TachyBaseClientPresetPlugin {}
diff --git a/packages/presets/sancongtou/src/index.ts b/packages/presets/sancongtou/src/index.ts
new file mode 100644
index 000000000..7ddad5814
--- /dev/null
+++ b/packages/presets/sancongtou/src/index.ts
@@ -0,0 +1 @@
+export { default } from './server';
diff --git a/packages/presets/sancongtou/src/server/index.ts b/packages/presets/sancongtou/src/server/index.ts
new file mode 100644
index 000000000..ee6a59247
--- /dev/null
+++ b/packages/presets/sancongtou/src/server/index.ts
@@ -0,0 +1,12 @@
+import PresetTachyBase from 'packages/presets/base/src';
+import _ from 'lodash';
+
+export class PluginRental extends PresetTachyBase {
+ #builtInPlugins = ['approval-mobile', 'core', 'rental', 'mobile-client', 'sancongtou'];
+
+ get builtInPlugins() {
+ return super.builtInPlugins.concat(this.#builtInPlugins);
+ }
+}
+
+export default PresetTachyBase;
diff --git a/packages/presets/tachybase/LICENSE b/packages/presets/tachybase/LICENSE
deleted file mode 100644
index 0ad25db4b..000000000
--- a/packages/presets/tachybase/LICENSE
+++ /dev/null
@@ -1,661 +0,0 @@
- GNU AFFERO GENERAL PUBLIC LICENSE
- Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc.
- Copyright (C)
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU Affero General Public License as published
- by the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU Affero General Public License for more details.
-
- You should have received a copy of the GNU Affero General Public License
- along with this program. If not, see