@tachybase/client 1.3.17 → 1.3.18

package/es/schema-component/antd/page/Page.mjs

@@ -10,7 +10,7 @@ import { cx } from "antd-style";
 import classnames from "classnames";
 import { ErrorBoundary } from "react-error-boundary";
 import { useTranslation } from "react-i18next";
-import { useMatch, useSearchParams } from "react-router-dom";
+import { useLocation, useMatch, useNavigate } from "react-router-dom";
 import { FormDialog, ScrollArea } from "../index.mjs";
 import { useToken } from "../__builtins__/index.mjs";
 import { useStyles } from "../../../built-in/acl/style.mjs";
@@ -33,7 +33,7 @@ import { PageDesigner } from "./PageDesigner.mjs";
 import { PageTabDesigner } from "./PageTabDesigner.mjs";
 import { getStyles, useStyles as external_style_mjs_useStyles } from "./style.mjs";
 const Page = (props)=>{
-    var _fieldSchema_xcomponentprops, _fieldSchema_xcomponentprops1, _fieldSchema_xcomponentprops2;
+    var _fieldSchema_xcomponentprops, _fieldSchema_xcomponentprops1, _fieldSchema_xcomponentprops2, _match_params;
     const { children, ...others } = props;
     const { t } = useTranslation();
     const { title, setTitle } = useDocumentTitle();
@@ -41,12 +41,26 @@ const Page = (props)=>{
     const disablePageHeader = null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.disablePageHeader;
     const enablePageTabs = null == (_fieldSchema_xcomponentprops1 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops1.enablePageTabs;
     const enableSharePage = null == (_fieldSchema_xcomponentprops2 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops2.enableSharePage;
-    const [searchParams, setSearchParams] = useSearchParams();
     const [loading, setLoading] = useState(false);
-    const activeKey = useMemo(()=>searchParams.get('tab') || Object.keys(fieldSchema.properties || {}).shift(), [
-        fieldSchema.properties,
-        searchParams
+    const navigate = useNavigate();
+    const location = useLocation();
+    const match = useMatch('/:entry/:entryId/page-tab/:pageTabId/*');
+    const pageTabActiveKey = useMemo(()=>{
+        var _match_params;
+        return (null == match ? void 0 : null == (_match_params = match.params) ? void 0 : _match_params.pageTabId) || Object.keys(fieldSchema.properties || {}).shift();
+    }, [
+        null == match ? void 0 : null == (_match_params = match.params) ? void 0 : _match_params.pageTabId,
+        fieldSchema.properties
     ]);
+    const setPageTabUrl = (pageTabId)=>{
+        const currentPath = location.pathname;
+        const newPath = currentPath.replace(/\/page-tab\/[^/]*/, "/page-tab/".concat(pageTabId));
+        newPath.includes('/page-tab/') ? navigate(newPath, {
+            replace: true
+        }) : navigate("".concat(currentPath, "/page-tab/").concat(pageTabId), {
+            replace: true
+        });
+    };
     const [height, setHeight] = useState(0);
     const aclStyles = useStyles();
     const { wrapSSR, hashId, componentCls } = getStyles();
@@ -66,21 +80,21 @@ const Page = (props)=>{
                 /*#__PURE__*/ jsx(Page_PageHeader, {
                     disablePageHeader: disablePageHeader,
                     enablePageTabs: enablePageTabs,
-                    activeKey: activeKey,
+                    activeKey: pageTabActiveKey,
                     title: title,
                     fieldSchema: fieldSchema,
                     parentProps: others,
                     setHeight: setHeight,
                     setLoading: setLoading,
                     enableSharePage: enableSharePage,
-                    setSearchParams: setSearchParams
+                    setPageTabUrl: setPageTabUrl
                 }),
                 /*#__PURE__*/ jsx(PageContentComponent, {
                     loading: loading,
                     disablePageHeader: disablePageHeader,
                     enablePageTabs: enablePageTabs,
                     fieldSchema: fieldSchema,
-                    activeKey: activeKey,
+                    activeKey: pageTabActiveKey,
                     height: height,
                     children: children
                 })
@@ -90,7 +104,7 @@ const Page = (props)=>{
 };
 const Page_PageHeader = (props)=>{
     var _fieldSchema_xcomponentprops;
-    const { disablePageHeader, enablePageTabs, setHeight, activeKey, setLoading, setSearchParams, fieldSchema, title, parentProps, enableSharePage } = props;
+    const { disablePageHeader, enablePageTabs, setHeight, activeKey, setLoading, setPageTabUrl, fieldSchema, title, parentProps, enableSharePage } = props;
     const { theme } = useGlobalTheme();
     const options = useContext(SchemaOptionsContext);
     const compile = useCompile();
@@ -133,7 +147,7 @@ const Page_PageHeader = (props)=>{
                 footer: enablePageTabs && /*#__PURE__*/ jsx(TabComponent, {
                     activeKey: activeKey,
                     setLoading: setLoading,
-                    setSearchParams: setSearchParams,
+                    setPageTabUrl: setPageTabUrl,
                     showScrollArea: showScrollArea,
                     options: options,
                     theme: theme,
@@ -219,7 +233,7 @@ const HeaderExtra = (param)=>{
     });
 };
 const TabComponent = (props)=>{
-    const { activeKey, setLoading, setSearchParams, showScrollArea, options, theme, items } = props;
+    const { activeKey, setLoading, setPageTabUrl, showScrollArea, options, theme, items } = props;
     const { styles } = external_Page_style_mjs_useStyles();
     const [hasMounted, setHasMounted] = useState(false);
     const sensors = useSensors(useSensor(PointerSensor, {
@@ -228,16 +242,7 @@ const TabComponent = (props)=>{
         }
     }));
     const handleTabClick = (activeKey)=>{
-        setLoading(true);
-        setSearchParams([
-            [
-                'tab',
-                activeKey
-            ]
-        ]);
-        setTimeout(()=>{
-            setLoading(false);
-        }, 50);
+        setPageTabUrl(activeKey);
     };
     useEffect(()=>{
         setTimeout(()=>{

package/es/schema-component/antd/record-picker/InputRecordPicker.mjs

@@ -7,7 +7,7 @@ import { TableSelectorParamsProvider, useTableSelectorProps } from "../../../blo
 import { CollectionProvider_deprecated, useCollection_deprecated } from "../../../collection-manager/index.mjs";
 import { FormProvider, SchemaComponentOptions } from "../../core/index.mjs";
 import { useCompile } from "../../hooks/index.mjs";
-import { ActionContextProvider, useActionContext } from "../action/index.mjs";
+import { ActionContextProvider, OpenMode, useActionContext } from "../action/index.mjs";
 import { FileSelector } from "../preview/index.mjs";
 import { useFieldNames } from "./useFieldNames.mjs";
 import { getLabelFormatValue, useLabelUiSchema } from "./util.mjs";
@@ -221,7 +221,7 @@ const Drawer = (param)=>{
             allowNull: true,
             name: null == collectionField ? void 0 : collectionField.target,
             children: /*#__PURE__*/ jsx(ActionContextProvider, {
-                openMode: "drawer",
+                openMode: OpenMode.DEFAULT,
                 visible: visible,
                 setVisible: setVisible,
                 children: /*#__PURE__*/ jsx(FormProvider, {

package/es/schema-component/antd/record-picker/ReadPrettyRecordPicker.mjs

@@ -7,7 +7,7 @@ import { CollectionProvider_deprecated, useCollectionManager_deprecated, useColl
 import { RecordProvider, useRecord } from "../../../record-provider/index.mjs";
 import { FormProvider } from "../../core/index.mjs";
 import { useCompile } from "../../hooks/index.mjs";
-import { ActionContextProvider, useActionContext } from "../action/index.mjs";
+import { ActionContextProvider, OpenMode, useActionContext } from "../action/index.mjs";
 import { EllipsisWithTooltip } from "../input/EllipsisWithTooltip.mjs";
 import { Preview } from "../preview/index.mjs";
 import { isShowFilePicker } from "./InputRecordPicker.mjs";
@@ -105,7 +105,7 @@ const ReadPrettyRecordPicker = observer((props)=>{
                         value: {
                             visible,
                             setVisible,
-                            openMode: 'drawer',
+                            openMode: OpenMode.DEFAULT,
                             snapshot: 'snapshot' === collectionField.interface
                         },
                         children: renderRecordProvider()

package/es/schema-initializer/items/SelectActionInitializer.mjs

@@ -1,5 +1,5 @@
 import { jsx } from "react/jsx-runtime";
-import "react";
+import { OpenMode } from "../../schema-component/index.mjs";
 import { ActionInitializer } from "./ActionInitializer.mjs";
 const SelectActionInitializer = (props)=>{
     const schema = {
@@ -9,7 +9,7 @@ const SelectActionInitializer = (props)=>{
         'x-designer': 'Action.Designer',
         'x-component': 'Action',
         'x-component-props': {
-            openMode: 'drawer'
+            openMode: OpenMode.DRAWER_MODE
         },
         properties: {
             drawer: {

package/es/schema-items/OpenModeSchemaItems.mjs

@@ -1,10 +1,13 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
-import "react";
+import { useMemo } from "react";
 import { useField, useFieldSchema } from "@tachybase/schema";
 import { Select } from "antd";
 import { useTranslation } from "react-i18next";
 import { SchemaInitializerItem, SchemaInitializerSelect } from "../application/index.mjs";
-import { useDesignable } from "../schema-component/index.mjs";
+import { useIsMobile } from "../block-provider/index.mjs";
+import { PageStyle } from "../built-in/page-style/PageStyle.provider.mjs";
+import { usePageStyle } from "../built-in/page-style/usePageStyle.mjs";
+import { OpenMode, useDesignable } from "../schema-component/index.mjs";
 import { SchemaSettingsSelectItem } from "../schema-settings/index.mjs";
 const SchemaInitializerOpenModeSchemaItems = (options)=>{
     var _fieldSchema_xcomponentprops, _fieldSchema_xcomponentprops1, _fieldSchema_xcomponentprops2;
@@ -13,7 +16,16 @@ const SchemaInitializerOpenModeSchemaItems = (options)=>{
     const field = useField();
     const { t } = useTranslation();
     const { dn } = useDesignable();
-    const openModeValue = (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops['openMode']) || 'drawer';
+    const isMobile = useIsMobile();
+    const pageStyle = usePageStyle();
+    const defaultOpenMode = useMemo(()=>{
+        if (isMobile || pageStyle === PageStyle.TAB_STYLE) return OpenMode.PAGE;
+        return OpenMode.DRAWER_MODE;
+    }, [
+        isMobile,
+        pageStyle
+    ]);
+    const openModeValue = (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops['openMode']) || defaultOpenMode;
     var _fieldSchema_xcomponentprops_openSize;
     return /*#__PURE__*/ jsxs(Fragment, {
         children: [
@@ -22,11 +34,11 @@ const SchemaInitializerOpenModeSchemaItems = (options)=>{
                 options: [
                     {
                         label: t('Drawer'),
-                        value: 'drawer'
+                        value: OpenMode.DRAWER_MODE
                     },
                     {
                         label: t('Dialog'),
-                        value: 'modal'
+                        value: OpenMode.MODAL
                     }
                 ],
                 value: openModeValue,
@@ -46,8 +58,8 @@ const SchemaInitializerOpenModeSchemaItems = (options)=>{
                 }
             }) : null,
             openSize && [
-                'modal',
-                'drawer'
+                OpenMode.MODAL,
+                OpenMode.DRAWER_MODE
             ].includes(openModeValue) ? /*#__PURE__*/ jsx(SchemaInitializerItem, {
                 children: /*#__PURE__*/ jsxs("div", {
                     style: {
@@ -74,7 +86,7 @@ const SchemaInitializerOpenModeSchemaItems = (options)=>{
                                     value: 'large'
                                 }
                             ],
-                            value: null != (_fieldSchema_xcomponentprops_openSize = null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops1 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops1['openSize']) ? _fieldSchema_xcomponentprops_openSize : (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops2 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops2['openMode']) == 'modal' ? 'large' : 'middle',
+                            value: null != (_fieldSchema_xcomponentprops_openSize = null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops1 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops1['openSize']) ? _fieldSchema_xcomponentprops_openSize : (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops2 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops2['openMode']) === OpenMode.MODAL ? 'large' : 'middle',
                             onChange: (value)=>{
                                 field.componentProps.openSize = value;
                                 const schema = {
@@ -106,7 +118,16 @@ const SchemaSettingOpenModeSchemaItems = (options)=>{
     const field = useField();
     const { t } = useTranslation();
     const { dn } = useDesignable();
-    const openModeValue = (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops['openMode']) || 'drawer';
+    const pageStyle = usePageStyle();
+    const isMobile = useIsMobile();
+    const defaultOpenMode = useMemo(()=>{
+        if (isMobile || pageStyle === PageStyle.TAB_STYLE) return OpenMode.PAGE;
+        return OpenMode.DRAWER_MODE;
+    }, [
+        isMobile,
+        pageStyle
+    ]);
+    const openModeValue = (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops['openMode']) || defaultOpenMode;
     var _fieldSchema_xcomponentprops_openSize;
     return /*#__PURE__*/ jsxs(Fragment, {
         children: [
@@ -115,19 +136,19 @@ const SchemaSettingOpenModeSchemaItems = (options)=>{
                 options: [
                     {
                         label: t('Drawer'),
-                        value: 'drawer'
+                        value: OpenMode.DRAWER_MODE
                     },
                     {
                         label: t('Dialog'),
-                        value: 'modal'
+                        value: OpenMode.MODAL
                     },
                     {
                         label: t('Sheet'),
-                        value: 'sheet'
+                        value: OpenMode.SHEET
                     },
                     {
                         label: t('Page'),
-                        value: 'page'
+                        value: OpenMode.PAGE
                     }
                 ],
                 value: openModeValue,
@@ -147,8 +168,8 @@ const SchemaSettingOpenModeSchemaItems = (options)=>{
                 }
             }) : null,
             openSize && [
-                'modal',
-                'drawer'
+                OpenMode.MODAL,
+                OpenMode.DRAWER_MODE
             ].includes(openModeValue) ? /*#__PURE__*/ jsx(SchemaSettingsSelectItem, {
                 title: t('Popup size'),
                 options: [
@@ -165,7 +186,7 @@ const SchemaSettingOpenModeSchemaItems = (options)=>{
                         value: 'large'
                     }
                 ],
-                value: null != (_fieldSchema_xcomponentprops_openSize = null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops1 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops1['openSize']) ? _fieldSchema_xcomponentprops_openSize : (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops2 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops2['openMode']) == 'modal' ? 'large' : 'middle',
+                value: null != (_fieldSchema_xcomponentprops_openSize = null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops1 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops1['openSize']) ? _fieldSchema_xcomponentprops_openSize : (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops2 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops2['openMode']) === OpenMode.MODAL ? 'large' : 'middle',
                 onChange: (value)=>{
                     field.componentProps.openSize = value;
                     const schema = {

package/es/schema-templates/schemas/uiSchemaTemplates.mjs

@@ -108,7 +108,7 @@ const uiSchemaTemplatesSchema = {
                                             'x-action': 'update',
                                             'x-component': 'Action.Link',
                                             'x-component-props': {
-                                                openMode: 'drawer',
+                                                openMode: 'drawer-mode',
                                                 icon: 'EditOutlined'
                                             },
                                             properties: {

package/es/user/ChangePassword.mjs

@@ -2,7 +2,7 @@ import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { useContext, useMemo, useState } from "react";
 import { uid, useForm } from "@tachybase/schema";
 import { useTranslation } from "react-i18next";
-import { ActionContextProvider, DropdownVisibleContext, SchemaComponent, useActionContext } from "../index.mjs";
+import { ActionContextProvider, DropdownVisibleContext, SchemaComponent, useActionContext, useCurrentUserContext } from "../index.mjs";
 import { useAPIClient } from "../api-client/index.mjs";
 const useCloseAction = ()=>{
     const { setVisible } = useActionContext();
@@ -17,15 +17,24 @@ const useCloseAction = ()=>{
     };
 };
 const useSaveCurrentUserValues = ()=>{
+    var _currentUser_data_data, _currentUser_data;
     const { setVisible } = useActionContext();
     const form = useForm();
     const api = useAPIClient();
+    const currentUser = useCurrentUserContext();
+    const hideOldPassword = (null == currentUser ? void 0 : null == (_currentUser_data = currentUser.data) ? void 0 : null == (_currentUser_data_data = _currentUser_data.data) ? void 0 : _currentUser_data_data.password) === null;
     return {
         async run () {
             await form.submit();
             await api.resource('auth').changePassword({
                 values: form.values
             });
+            if (hideOldPassword) currentUser.mutate({
+                data: {
+                    ...currentUser.data.data,
+                    password: ''
+                }
+            });
             await form.reset();
             setVisible(false);
         }
@@ -45,7 +54,8 @@ const schema = {
                     title: '{{t("Old password")}}',
                     required: true,
                     'x-component': 'Password',
-                    'x-decorator': 'FormItem'
+                    'x-decorator': 'FormItem',
+                    'x-hidden': '{{ hideOldPassword }}'
                 },
                 newPassword: {
                     type: 'string',
@@ -119,9 +129,12 @@ const schema = {
     }
 };
 const useChangePassword = ()=>{
+    var _currentUser_data_data, _currentUser_data;
     const ctx = useContext(DropdownVisibleContext);
     const [visible, setVisible] = useState(false);
     const { t } = useTranslation();
+    const currentUser = useCurrentUserContext();
+    const hideOldPassword = (null == currentUser ? void 0 : null == (_currentUser_data = currentUser.data) ? void 0 : null == (_currentUser_data_data = _currentUser_data.data) ? void 0 : _currentUser_data_data.password) === null;
     return useMemo(()=>({
             key: 'password',
             eventKey: 'ChangePassword',
@@ -142,7 +155,8 @@ const useChangePassword = ()=>{
                             children: /*#__PURE__*/ jsx(SchemaComponent, {
                                 scope: {
                                     useCloseAction,
-                                    useSaveCurrentUserValues
+                                    useSaveCurrentUserValues,
+                                    hideOldPassword
                                 },
                                 schema: schema
                             })
@@ -151,7 +165,8 @@ const useChangePassword = ()=>{
                 ]
             })
         }), [
-        visible
+        visible,
+        hideOldPassword
     ]);
 };
 export { useChangePassword };

package/lib/application/CustomRouterContextProvider.js

@@ -59,6 +59,7 @@ var external_react_default = /*#__PURE__*/ __webpack_require__.n(external_react_
 const external_lodash_namespaceObject = require("lodash");
 var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
 const external_react_router_dom_namespaceObject = require("react-router-dom");
+const index_js_namespaceObject = require("../schema-component/index.js");
 const NavigateNoUpdateContext = /*#__PURE__*/ external_react_default().createContext(null);
 NavigateNoUpdateContext.displayName = 'NavigateNoUpdateContext';
 const LocationNoUpdateContext = /*#__PURE__*/ external_react_default().createContext(null);
@@ -94,7 +95,7 @@ const IsSubPageClosedByPageMenuProvider = (param)=>{
     const [fieldSchema, setFieldSchema] = (0, external_react_namespaceObject.useState)(null);
     const isSubPageClosedByPageMenu = (0, external_react_namespaceObject.useCallback)(()=>{
         var _fieldSchema_xcomponentprops, _prevParamsRef_current_;
-        const result = external_lodash_default().isEmpty(params['*']) && (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.openMode) === 'page' && !!(null == (_prevParamsRef_current_ = prevParamsRef.current['*']) ? void 0 : _prevParamsRef_current_.includes(fieldSchema['x-uid']));
+        const result = external_lodash_default().isEmpty(params['*']) && (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops.openMode) === index_js_namespaceObject.OpenMode.PAGE && !!(null == (_prevParamsRef_current_ = prevParamsRef.current['*']) ? void 0 : _prevParamsRef_current_.includes(fieldSchema['x-uid']));
         prevParamsRef.current = params;
         return result;
     }, [

package/lib/application/components/AppComponent.js

@@ -74,7 +74,9 @@ const AppComponent = (0, schema_namespaceObject.observer)((props)=>{
                     app.renderComponent('AppMain')
                 ]
             }),
-            /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_click_to_react_component_namespaceObject.ClickToComponent, {})
+            /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_click_to_react_component_namespaceObject.ClickToComponent, {
+                editor: process.env.REACT_APP_CLICK_TO_COMPONENT_EDITOR || 'vscode'
+            })
         ]
     });
 }, {