@tachybase/client 1.6.34 → 1.6.36

package/es/application/utils/globalDeps.mjs

@@ -8,10 +8,10 @@ import { getTachybaseClientExports } from "./clientModuleRegistry.mjs";
 import * as __WEBPACK_EXTERNAL_MODULE_react_i18next_05dede28__ from "react-i18next";
 import * as __WEBPACK_EXTERNAL_MODULE__tego_client_7f3175c1__ from "@tego/client";
 import * as __WEBPACK_EXTERNAL_MODULE_antd__ from "antd";
-import * as __WEBPACK_EXTERNAL_MODULE_ahooks__ from "ahooks";
 import * as __WEBPACK_EXTERNAL_MODULE__tachybase_schema_532e17e1__ from "@tachybase/schema";
-import * as __WEBPACK_EXTERNAL_MODULE_react_router_dom_5358f3fe__ from "react-router-dom";
 import * as __WEBPACK_EXTERNAL_MODULE_antd_style_1dcbd21e__ from "antd-style";
+import * as __WEBPACK_EXTERNAL_MODULE_react_router_dom_5358f3fe__ from "react-router-dom";
+import * as __WEBPACK_EXTERNAL_MODULE_ahooks__ from "ahooks";
 import * as __WEBPACK_EXTERNAL_MODULE__ant_design_icons_a8184985__ from "@ant-design/icons";
 import * as __WEBPACK_EXTERNAL_MODULE__emotion_css_bfcd1b5d__ from "@emotion/css";
 import * as __WEBPACK_EXTERNAL_MODULE_i18next__ from "i18next";

package/es/modules/actions/add-new/createFormBlockInitializers.mjs

@@ -1,6 +1,7 @@
 import { useTranslation } from "react-i18next";
 import { SchemaInitializer } from "../../../application/schema-initializer/SchemaInitializer.mjs";
 import { useCollection } from "../../../data-source/collection/CollectionProvider.mjs";
+import { useActionContext } from "../../../schema-component/index.mjs";
 import { gridRowColWrap } from "../../../schema-initializer/utils.mjs";
 const createFormBlockInitializers = new SchemaInitializer({
     name: 'popup:addNew:addBlock',
@@ -13,8 +14,10 @@ const createFormBlockInitializers = new SchemaInitializer({
             title: '{{t("Data blocks")}}',
             name: 'dataBlocks',
             useChildren () {
+                var _action_fieldSchema_xcomponentprops, _action_fieldSchema;
                 const currentCollection = useCollection();
                 const { t } = useTranslation();
+                const action = useActionContext();
                 return [
                     {
                         name: 'form',
@@ -28,6 +31,7 @@ const createFormBlockInitializers = new SchemaInitializer({
                                 if (associationField) return false;
                                 if (collection.name === currentCollection.name) return true;
                             },
+                            newRecord: null == (_action_fieldSchema = action.fieldSchema) ? void 0 : null == (_action_fieldSchema_xcomponentprops = _action_fieldSchema['x-component-props']) ? void 0 : _action_fieldSchema_xcomponentprops.newRecord,
                             showAssociationFields: true,
                             onlyCurrentDataSource: true,
                             hideSearch: true,

package/es/modules/blocks/data-blocks/form/FormBlockInitializer.d.ts

@@ -1,5 +1,5 @@
 import { Collection, CollectionFieldOptions } from '../../../../data-source/collection/Collection';
-export declare const FormBlockInitializer: ({ filterCollections, onlyCurrentDataSource, hideSearch, createBlockSchema, componentType, templateWrap: customizeTemplateWrap, showAssociationFields, hideChildrenIfSingleCollection, hideOtherRecordsInPopup, currentText, otherText, }: {
+export declare const FormBlockInitializer: ({ filterCollections, onlyCurrentDataSource, hideSearch, createBlockSchema, componentType, templateWrap: customizeTemplateWrap, showAssociationFields, hideChildrenIfSingleCollection, hideOtherRecordsInPopup, currentText, otherText, newRecord, }: {
     filterCollections: (options: {
         collection?: Collection;
         associationField?: CollectionFieldOptions;
@@ -24,8 +24,9 @@ export declare const FormBlockInitializer: ({ filterCollections, onlyCurrentData
     currentText?: string;
     /** 用于更改 Other records 的文案 */
     otherText?: string;
+    newRecord?: boolean;
 }) => import("react/jsx-runtime").JSX.Element;
-export declare const useCreateFormBlock: () => {
+export declare const useCreateFormBlock: (newRecord?: boolean) => {
     createFormBlock: ({ item, fromOthersInPopup }: {
         item: any;
         fromOthersInPopup: any;

package/es/modules/blocks/data-blocks/form/FormBlockInitializer.mjs

@@ -6,9 +6,9 @@ import { useAssociationName } from "../../../../data-source/collection/Associati
 import { DataBlockInitializer } from "../../../../schema-initializer/items/DataBlockInitializer.mjs";
 import { createCreateFormBlockUISchema } from "./createCreateFormBlockUISchema.mjs";
 const FormBlockInitializer = (param)=>{
-    let { filterCollections, onlyCurrentDataSource, hideSearch, createBlockSchema, componentType = 'FormItem', templateWrap: customizeTemplateWrap, showAssociationFields, hideChildrenIfSingleCollection, hideOtherRecordsInPopup, currentText, otherText } = param;
+    let { filterCollections, onlyCurrentDataSource, hideSearch, createBlockSchema, componentType = 'FormItem', templateWrap: customizeTemplateWrap, showAssociationFields, hideChildrenIfSingleCollection, hideOtherRecordsInPopup, currentText, otherText, newRecord } = param;
     const itemConfig = useSchemaInitializerItem();
-    const { createFormBlock, templateWrap } = useCreateFormBlock();
+    const { createFormBlock, templateWrap } = useCreateFormBlock(newRecord);
     const onCreateFormBlockSchema = useCallback((options)=>{
         if (createBlockSchema) return createBlockSchema(options);
         createFormBlock(options);
@@ -35,9 +35,9 @@ const FormBlockInitializer = (param)=>{
         otherText: otherText
     });
 };
-const useCreateFormBlock = ()=>{
+const useCreateFormBlock = (newRecord)=>{
     const { insert } = useSchemaInitializer();
-    const association = useAssociationName();
+    const association = newRecord ? void 0 : useAssociationName();
     const { isCusomeizeCreate: isCustomizeCreate } = useSchemaInitializerItem();
     const createFormBlock = useCallback((param)=>{
         let { item, fromOthersInPopup } = param;

package/es/modules/fields/component/Select/selectComponentFieldSettings.mjs

@@ -172,11 +172,15 @@ const quickCreate = {
                 {
                     label: t('Pop-up'),
                     value: 'modalAdd'
+                },
+                {
+                    label: t('Pop-up(without context)'),
+                    value: 'modalAdd(without context)'
                 }
             ],
             value: (null == (_field_componentProps = field.componentProps) ? void 0 : _field_componentProps.addMode) || 'none',
             onChange (mode) {
-                if ('modalAdd' === mode) {
+                if ('modalAdd' === mode || 'modalAdd(without context)' === mode) {
                     const hasAddNew = fieldSchema.reduceProperties((buf, schema)=>{
                         if ('Action' === schema['x-component']) return schema;
                         return buf;
@@ -193,7 +197,8 @@ const quickCreate = {
                             'x-component-props': {
                                 openMode: 'drawer',
                                 type: 'default',
-                                component: 'CreateRecordAction'
+                                component: 'CreateRecordAction',
+                                newRecord: 'modalAdd(without context)' === mode
                             }
                         };
                         insertAdjacent('afterBegin', addNewActionschema);
@@ -203,7 +208,8 @@ const quickCreate = {
                     ['x-uid']: fieldSchema['x-uid']
                 };
                 fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
-                fieldSchema['x-component-props']['addMode'] = mode;
+                fieldSchema['x-component-props']['addMode'] = 'modalAdd(without context)' === mode ? 'modalAdd' : mode;
+                fieldSchema['x-component-props']['newRecord'] = 'modalAdd(without context)' === mode;
                 schema['x-component-props'] = fieldSchema['x-component-props'];
                 field.componentProps = field.componentProps || {};
                 field.componentProps.addMode = mode;

package/lib/locale/en_US.js

@@ -617,6 +617,7 @@ module.exports = {
   "Plugin stopping...": "Plugin stopping...",
   "Plugin tab name": "Plugin tab name",
   "Plugin's version": "Plugin's version",
+  "Pop-up(without context)": "Pop-up(without context)",
   Popup: "Popup",
   "Popup close method": "Popup close method",
   "Popup form": "Popup form",

package/lib/locale/zh-CN.js

@@ -730,6 +730,7 @@ module.exports = {
   "Plugin tab name": "\u63D2\u4EF6\u6807\u7B7E\u9875",
   "Plugin's version": "\u63D2\u4EF6\u7684\u7248\u672C",
   "Pop-up": "\u5F39\u7A97",
+  "Pop-up(without context)": "\u5F39\u7A97\uFF08\u65E0\u4E0A\u4E0B\u6587\uFF09",
   Popup: "\u6253\u5F00\u5F39\u7A97",
   "Popup close method": "\u5F39\u7A97\u5173\u95ED\u65B9\u5F0F",
   "Popup form": "Popup form",

package/lib/modules/actions/add-new/createFormBlockInitializers.js

@@ -29,6 +29,7 @@ __webpack_require__.d(__webpack_exports__, {
 const external_react_i18next_namespaceObject = require("react-i18next");
 const SchemaInitializer_js_namespaceObject = require("../../../application/schema-initializer/SchemaInitializer.js");
 const CollectionProvider_js_namespaceObject = require("../../../data-source/collection/CollectionProvider.js");
+const index_js_namespaceObject = require("../../../schema-component/index.js");
 const utils_js_namespaceObject = require("../../../schema-initializer/utils.js");
 const createFormBlockInitializers = new SchemaInitializer_js_namespaceObject.SchemaInitializer({
     name: 'popup:addNew:addBlock',
@@ -41,8 +42,10 @@ const createFormBlockInitializers = new SchemaInitializer_js_namespaceObject.Sch
             title: '{{t("Data blocks")}}',
             name: 'dataBlocks',
             useChildren () {
+                var _action_fieldSchema_xcomponentprops, _action_fieldSchema;
                 const currentCollection = (0, CollectionProvider_js_namespaceObject.useCollection)();
                 const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
+                const action = (0, index_js_namespaceObject.useActionContext)();
                 return [
                     {
                         name: 'form',
@@ -56,6 +59,7 @@ const createFormBlockInitializers = new SchemaInitializer_js_namespaceObject.Sch
                                 if (associationField) return false;
                                 if (collection.name === currentCollection.name) return true;
                             },
+                            newRecord: null == (_action_fieldSchema = action.fieldSchema) ? void 0 : null == (_action_fieldSchema_xcomponentprops = _action_fieldSchema['x-component-props']) ? void 0 : _action_fieldSchema_xcomponentprops.newRecord,
                             showAssociationFields: true,
                             onlyCurrentDataSource: true,
                             hideSearch: true,

package/lib/modules/blocks/data-blocks/form/FormBlockInitializer.js

@@ -35,9 +35,9 @@ const AssociationProvider_js_namespaceObject = require("../../../../data-source/
 const DataBlockInitializer_js_namespaceObject = require("../../../../schema-initializer/items/DataBlockInitializer.js");
 const external_createCreateFormBlockUISchema_js_namespaceObject = require("./createCreateFormBlockUISchema.js");
 const FormBlockInitializer = (param)=>{
-    let { filterCollections, onlyCurrentDataSource, hideSearch, createBlockSchema, componentType = 'FormItem', templateWrap: customizeTemplateWrap, showAssociationFields, hideChildrenIfSingleCollection, hideOtherRecordsInPopup, currentText, otherText } = param;
+    let { filterCollections, onlyCurrentDataSource, hideSearch, createBlockSchema, componentType = 'FormItem', templateWrap: customizeTemplateWrap, showAssociationFields, hideChildrenIfSingleCollection, hideOtherRecordsInPopup, currentText, otherText, newRecord } = param;
     const itemConfig = (0, index_js_namespaceObject.useSchemaInitializerItem)();
-    const { createFormBlock, templateWrap } = useCreateFormBlock();
+    const { createFormBlock, templateWrap } = useCreateFormBlock(newRecord);
     const onCreateFormBlockSchema = (0, external_react_namespaceObject.useCallback)((options)=>{
         if (createBlockSchema) return createBlockSchema(options);
         createFormBlock(options);
@@ -64,9 +64,9 @@ const FormBlockInitializer = (param)=>{
         otherText: otherText
     });
 };
-const useCreateFormBlock = ()=>{
+const useCreateFormBlock = (newRecord)=>{
     const { insert } = (0, index_js_namespaceObject.useSchemaInitializer)();
-    const association = (0, AssociationProvider_js_namespaceObject.useAssociationName)();
+    const association = newRecord ? void 0 : (0, AssociationProvider_js_namespaceObject.useAssociationName)();
     const { isCusomeizeCreate: isCustomizeCreate } = (0, index_js_namespaceObject.useSchemaInitializerItem)();
     const createFormBlock = (0, external_react_namespaceObject.useCallback)((param)=>{
         let { item, fromOthersInPopup } = param;

package/lib/modules/fields/component/Select/selectComponentFieldSettings.js

@@ -218,11 +218,15 @@ const quickCreate = {
                 {
                     label: t('Pop-up'),
                     value: 'modalAdd'
+                },
+                {
+                    label: t('Pop-up(without context)'),
+                    value: 'modalAdd(without context)'
                 }
             ],
             value: (null == (_field_componentProps = field.componentProps) ? void 0 : _field_componentProps.addMode) || 'none',
             onChange (mode) {
-                if ('modalAdd' === mode) {
+                if ('modalAdd' === mode || 'modalAdd(without context)' === mode) {
                     const hasAddNew = fieldSchema.reduceProperties((buf, schema)=>{
                         if ('Action' === schema['x-component']) return schema;
                         return buf;
@@ -239,7 +243,8 @@ const quickCreate = {
                             'x-component-props': {
                                 openMode: 'drawer',
                                 type: 'default',
-                                component: 'CreateRecordAction'
+                                component: 'CreateRecordAction',
+                                newRecord: 'modalAdd(without context)' === mode
                             }
                         };
                         insertAdjacent('afterBegin', addNewActionschema);
@@ -249,7 +254,8 @@ const quickCreate = {
                     ['x-uid']: fieldSchema['x-uid']
                 };
                 fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
-                fieldSchema['x-component-props']['addMode'] = mode;
+                fieldSchema['x-component-props']['addMode'] = 'modalAdd(without context)' === mode ? 'modalAdd' : mode;
+                fieldSchema['x-component-props']['newRecord'] = 'modalAdd(without context)' === mode;
                 schema['x-component-props'] = fieldSchema['x-component-props'];
                 field.componentProps = field.componentProps || {};
                 field.componentProps.addMode = mode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/client",
-  "version": "1.6.34",
+  "version": "1.6.36",
   "homepage": "https://github.com/tegojs/tego-standard#readme",
   "bugs": {
     "url": "https://github.com/tegojs/tego-standard/issues"
@@ -30,9 +30,9 @@
     "@floating-ui/react": "0.26.28",
     "@js-preview/excel": "^1.7.14",
     "@lottiefiles/dotlottie-react": "^0.9.3",
-    "@tachybase/schema": "1.6.17",
-    "@tachybase/utils": "1.6.17",
-    "@tego/client": "1.6.17",
+    "@tachybase/schema": "1.6.18",
+    "@tachybase/utils": "1.6.18",
+    "@tego/client": "1.6.18",
     "ahooks": "^3.9.0",
     "antd": "5.22.5",
     "antd-style": "3.7.1",