@tachybase/client 1.3.17 → 1.3.18

package/lib/schema-component/antd/action/Action.js

@@ -50,8 +50,11 @@ const external_react_router_dom_namespaceObject = require("react-router-dom");
 const external_index_js_namespaceObject = require("../../index.js");
 const index_js_namespaceObject = require("../../../application/index.js");
 const withDynamicSchemaProps_js_namespaceObject = require("../../../application/hoc/withDynamicSchemaProps.js");
+const external_block_provider_index_js_namespaceObject = require("../../../block-provider/index.js");
 const acl_index_js_namespaceObject = require("../../../built-in/acl/index.js");
 const utils_js_namespaceObject = require("../../../built-in/dynamic-page/utils.js");
+const PageStyle_provider_js_namespaceObject = require("../../../built-in/page-style/PageStyle.provider.js");
+const usePageStyle_js_namespaceObject = require("../../../built-in/page-style/usePageStyle.js");
 const external_data_source_index_js_namespaceObject = require("../../../data-source/index.js");
 const external_icon_index_js_namespaceObject = require("../../../icon/index.js");
 const external_record_provider_index_js_namespaceObject = require("../../../record-provider/index.js");
@@ -96,7 +99,9 @@ const Action = (0, withDynamicSchemaProps_js_namespaceObject.withDynamicSchemaPr
     const openMode = null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops['openMode'];
     const openSize = null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops1 = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops1['openSize'];
     const disabled = form.disabled || field.disabled || (null == (_field_data = field.data) ? void 0 : _field_data.disabled) || propsDisabled;
-    const linkageRules = (null == fieldSchema ? void 0 : fieldSchema['x-linkage-rules']) || [];
+    const linkageRules = (0, external_react_namespaceObject.useMemo)(()=>(null == fieldSchema ? void 0 : fieldSchema['x-linkage-rules']) || [], [
+        fieldSchema
+    ]);
     const { designable } = (0, external_index_js_namespaceObject.useDesignable)();
     const tarComponent = (0, external_hooks_index_js_namespaceObject.useComponent)(component) || component;
     const { modal } = external_antd_namespaceObject.App.useApp();
@@ -109,6 +114,23 @@ const Action = (0, withDynamicSchemaProps_js_namespaceObject.withDynamicSchemaPr
     const { getAriaLabel } = (0, useGetAriaLabelOfAction_js_namespaceObject.useGetAriaLabelOfAction)(title);
     let actionTitle = title || compile(fieldSchema.title);
     actionTitle = external_lodash_default().isString(actionTitle) ? t(actionTitle) : actionTitle;
+    const collectionKey = null == collection ? void 0 : collection.getPrimaryKey();
+    const pageStyle = (0, usePageStyle_js_namespaceObject.usePageStyle)();
+    const isMobile = (0, external_block_provider_index_js_namespaceObject.useIsMobile)();
+    const isPageMode = (0, external_react_namespaceObject.useMemo)(()=>{
+        if (null == pageMode ? void 0 : pageMode.enable) return true;
+        if (openMode === external_context_js_namespaceObject.OpenMode.PAGE) return true;
+        if (!openMode || [
+            external_context_js_namespaceObject.OpenMode.DEFAULT,
+            external_context_js_namespaceObject.OpenMode.DRAWER
+        ].includes(openMode)) return isMobile || pageStyle === PageStyle_provider_js_namespaceObject.PageStyle.TAB_STYLE;
+        return false;
+    }, [
+        null == pageMode ? void 0 : pageMode.enable,
+        openMode,
+        isMobile,
+        pageStyle
+    ]);
     (0, external_react_namespaceObject.useEffect)(()=>{
         field.stateOfLinkageRules = {};
         linkageRules.filter((k)=>!k.disabled).forEach((v)=>{
@@ -130,6 +152,30 @@ const Action = (0, withDynamicSchemaProps_js_namespaceObject.withDynamicSchemaPr
         record,
         variables
     ]);
+    const openModal = (0, external_react_namespaceObject.useCallback)(()=>{
+        setVisible(true);
+    }, []);
+    const openPage = (0, external_react_namespaceObject.useCallback)(()=>{
+        const containerSchema = fieldSchema.reduceProperties((buf, s)=>'Action.Container' === s['x-component'] ? s : buf);
+        const target = utils_js_namespaceObject.PathHandler.getInstance().toWildcardPath({
+            collection: collection.name,
+            filterByTk: record[collectionKey]
+        });
+        const findMPageSchema = (schema)=>{
+            if (!schema) return;
+            if ('MPage' === schema['x-component']) return schema['x-uid'];
+            return findMPageSchema(null == schema ? void 0 : schema.parent);
+        };
+        const MPageUID = findMPageSchema(fieldSchema);
+        const finalPath = isMobile ? "./".concat(MPageUID, "/sub/").concat(containerSchema['x-uid'], "/").concat(target) : "./sub/".concat(containerSchema['x-uid'], "/").concat(target);
+        navigate(finalPath);
+    }, [
+        fieldSchema,
+        record,
+        collectionKey,
+        null == collection ? void 0 : collection.name,
+        navigate
+    ]);
     const handleButtonClick = (0, external_react_namespaceObject.useCallback)((e)=>{
         if ((0, client_namespaceObject.isPortalInBody)(e.target)) return;
         e.preventDefault();
@@ -137,14 +183,8 @@ const Action = (0, withDynamicSchemaProps_js_namespaceObject.withDynamicSchemaPr
         if (!disabled && aclCtx) {
             const onOk = ()=>{
                 null == onClick || onClick(e);
-                const containerSchema = fieldSchema.reduceProperties((buf, s)=>'Action.Container' === s['x-component'] ? s : buf);
-                if ((null == pageMode ? void 0 : pageMode.enable) && containerSchema) {
-                    const target = utils_js_namespaceObject.PathHandler.getInstance().toWildcardPath({
-                        collection: collection.name,
-                        filterByTk: record[collection.getPrimaryKey()]
-                    });
-                    navigate('../' + containerSchema['x-uid'] + '/' + target);
-                } else setVisible(true);
+                if (isPageMode) openPage();
+                else openModal();
                 run();
             };
             if (null == confirm ? void 0 : confirm.content) modal.confirm({
@@ -163,7 +203,12 @@ const Action = (0, withDynamicSchemaProps_js_namespaceObject.withDynamicSchemaPr
         disabled,
         modal,
         onClick,
-        run
+        run,
+        isPageMode,
+        openPage,
+        openModal,
+        actionTitle,
+        t
     ]);
     const buttonStyle = (0, external_react_namespaceObject.useMemo)(()=>{
         var _field_data;

package/lib/schema-component/antd/action/context.js

@@ -25,6 +25,7 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     ActionContextProvider: ()=>ActionContextProvider,
+    OpenMode: ()=>context_OpenMode,
     ActionContext: ()=>ActionContext
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
@@ -43,11 +44,22 @@ const ActionContextProvider = (props)=>{
         children: props.children
     });
 };
+var context_OpenMode = /*#__PURE__*/ function(OpenMode) {
+    OpenMode["DEFAULT"] = "default";
+    OpenMode["DRAWER"] = "drawer";
+    OpenMode["MODAL"] = "modal";
+    OpenMode["PAGE"] = "page";
+    OpenMode["SHEET"] = "sheet";
+    OpenMode["DRAWER_MODE"] = "drawer-mode";
+    return OpenMode;
+}({});
 exports.ActionContext = __webpack_exports__.ActionContext;
 exports.ActionContextProvider = __webpack_exports__.ActionContextProvider;
+exports.OpenMode = __webpack_exports__.OpenMode;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "ActionContext",
-    "ActionContextProvider"
+    "ActionContextProvider",
+    "OpenMode"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/lib/schema-component/antd/action/hooks.js

@@ -46,7 +46,7 @@ const useActionContext = ()=>{
         ...ctx,
         setVisible (visible) {
             let confirm = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : false;
-            if ((null == ctx ? void 0 : ctx.openMode) !== 'page') if (visible) {
+            if ((null == ctx ? void 0 : ctx.openMode) !== external_context_js_namespaceObject.OpenMode.PAGE) if (visible) {
                 var _ctx_setVisible1;
                 null == ctx || null == (_ctx_setVisible1 = ctx.setVisible) || _ctx_setVisible1.call(ctx, visible);
             } else if (confirm && ctx.formValueChanged) modal.confirm({

package/lib/schema-component/antd/association-field/FileManager.js

@@ -188,7 +188,7 @@ const InternalFileManager = (props)=>{
             }),
             /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_action_index_js_namespaceObject.ActionContextProvider, {
                 value: {
-                    openMode: 'drawer',
+                    openMode: external_action_index_js_namespaceObject.OpenMode.DEFAULT,
                     visible: visibleSelector,
                     setVisible: setVisibleSelector,
                     modalProps: {

package/lib/schema-component/antd/association-field/InternalDrawerSubTable.js

@@ -87,7 +87,7 @@ const InternaDrawerSubTable = (0, schema_namespaceObject.observer)((props)=>{
                     ...ctx,
                     visible,
                     setVisible,
-                    openMode: 'drawer'
+                    openMode: context_js_namespaceObject.OpenMode.DEFAULT
                 },
                 children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_antd_namespaceObject.Drawer, {
                     title: t(null == options ? void 0 : null == (_options_uiSchema = options.uiSchema) ? void 0 : _options_uiSchema.rawTitle),

package/lib/schema-component/antd/association-field/InternalPicker.js

@@ -229,7 +229,7 @@ const InternalPicker = (0, schema_namespaceObject.observer)((props)=>{
             /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_action_index_js_namespaceObject.ActionContextProvider, {
                 value: {
                     openSize: (null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops['openSize']) || openSize,
-                    openMode: 'drawer',
+                    openMode: external_action_index_js_namespaceObject.OpenMode.DEFAULT,
                     visible: visibleSelector,
                     setVisible: setVisibleSelector
                 },

package/lib/schema-component/antd/association-field/InternalTag.js

@@ -145,7 +145,7 @@ const ReadPrettyInternalTag = (0, schema_namespaceObject.observer)((props)=>{
                         value: {
                             visible,
                             setVisible,
-                            openMode: 'drawer',
+                            openMode: external_action_index_js_namespaceObject.OpenMode.DEFAULT,
                             snapshot: (null == collectionField ? void 0 : collectionField.interface) === 'snapshot'
                         },
                         children: renderRecordProvider()

package/lib/schema-component/antd/association-field/InternalViewer.js

@@ -160,7 +160,7 @@ const ReadPrettyInternalViewer = (0, schema_namespaceObject.observer)((props)=>{
                         value: {
                             visible,
                             setVisible,
-                            openMode: 'drawer',
+                            openMode: external_action_index_js_namespaceObject.OpenMode.DEFAULT,
                             snapshot: (null == collectionField ? void 0 : collectionField.interface) === 'snapshot',
                             fieldSchema: fieldSchema
                         },

package/lib/schema-component/antd/association-field/SubTable.js

@@ -267,7 +267,7 @@ const SubTable = (0, schema_namespaceObject.observer)((props)=>{
             /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_action_index_js_namespaceObject.ActionContextProvider, {
                 value: {
                     openSize,
-                    openMode: 'drawer',
+                    openMode: external_action_index_js_namespaceObject.OpenMode.DEFAULT,
                     visible: visibleSelector,
                     setVisible: setVisibleSelector
                 },

package/lib/schema-component/antd/form-item/FormItem.Settings.js

@@ -72,6 +72,7 @@ const SchemaSettingsSortingRule_js_namespaceObject = require("../../../schema-se
 const VariableInput_js_namespaceObject = require("../../../schema-settings/VariableInput/VariableInput.js");
 const external_variables_index_js_namespaceObject = require("../../../variables/index.js");
 const external_hooks_index_js_namespaceObject = require("../../hooks/index.js");
+const external_action_index_js_namespaceObject = require("../action/index.js");
 const util_js_namespaceObject = require("../association-field/util.js");
 const external_filter_index_js_namespaceObject = require("../filter/index.js");
 const utils_js_namespaceObject = require("../form-v2/utils.js");
@@ -781,7 +782,7 @@ const formItemSettings = new index_js_namespaceObject.SchemaSettings({
                                 'x-component': 'Action',
                                 'x-decorator': 'ACLActionProvider',
                                 'x-component-props': {
-                                    openMode: 'drawer',
+                                    openMode: external_action_index_js_namespaceObject.OpenMode.DRAWER_MODE,
                                     type: 'default',
                                     component: 'CreateRecordAction'
                                 }
@@ -852,7 +853,7 @@ const formItemSettings = new index_js_namespaceObject.SchemaSettings({
                                     'x-component': 'Action',
                                     'x-decorator': 'ACLActionProvider',
                                     'x-component-props': {
-                                        openMode: 'drawer',
+                                        openMode: external_action_index_js_namespaceObject.OpenMode.DRAWER_MODE,
                                         type: 'default',
                                         component: 'CreateRecordAction'
                                     }

package/lib/schema-component/antd/page/Page.js

@@ -72,7 +72,7 @@ const external_PageDesigner_js_namespaceObject = require("./PageDesigner.js");
 const external_PageTabDesigner_js_namespaceObject = require("./PageTabDesigner.js");
 const external_style_js_namespaceObject = require("./style.js");
 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 } = (0, external_react_i18next_namespaceObject.useTranslation)();
     const { title, setTitle } = (0, document_title_index_js_namespaceObject.useDocumentTitle)();
@@ -80,12 +80,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] = (0, external_react_router_dom_namespaceObject.useSearchParams)();
     const [loading, setLoading] = (0, external_react_namespaceObject.useState)(false);
-    const activeKey = (0, external_react_namespaceObject.useMemo)(()=>searchParams.get('tab') || Object.keys(fieldSchema.properties || {}).shift(), [
-        fieldSchema.properties,
-        searchParams
+    const navigate = (0, external_react_router_dom_namespaceObject.useNavigate)();
+    const location = (0, external_react_router_dom_namespaceObject.useLocation)();
+    const match = (0, external_react_router_dom_namespaceObject.useMatch)('/:entry/:entryId/page-tab/:pageTabId/*');
+    const pageTabActiveKey = (0, external_react_namespaceObject.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] = (0, external_react_namespaceObject.useState)(0);
     const aclStyles = (0, style_js_namespaceObject.useStyles)();
     const { wrapSSR, hashId, componentCls } = (0, external_style_js_namespaceObject.getStyles)();
@@ -105,21 +119,21 @@ const Page = (props)=>{
                 /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(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__*/ (0, jsx_runtime_namespaceObject.jsx)(PageContentComponent, {
                     loading: loading,
                     disablePageHeader: disablePageHeader,
                     enablePageTabs: enablePageTabs,
                     fieldSchema: fieldSchema,
-                    activeKey: activeKey,
+                    activeKey: pageTabActiveKey,
                     height: height,
                     children: children
                 })
@@ -129,7 +143,7 @@ const Page = (props)=>{
 };
 const 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 } = (0, theme_index_js_namespaceObject.useGlobalTheme)();
     const options = (0, external_react_namespaceObject.useContext)(schema_namespaceObject.SchemaOptionsContext);
     const compile = (0, external_hooks_index_js_namespaceObject.useCompile)();
@@ -172,7 +186,7 @@ const PageHeader = (props)=>{
                 footer: enablePageTabs && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(TabComponent, {
                     activeKey: activeKey,
                     setLoading: setLoading,
-                    setSearchParams: setSearchParams,
+                    setPageTabUrl: setPageTabUrl,
                     showScrollArea: showScrollArea,
                     options: options,
                     theme: theme,
@@ -258,7 +272,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 } = (0, external_Page_style_js_namespaceObject.useStyles)();
     const [hasMounted, setHasMounted] = (0, external_react_namespaceObject.useState)(false);
     const sensors = (0, core_namespaceObject.useSensors)((0, core_namespaceObject.useSensor)(core_namespaceObject.PointerSensor, {
@@ -267,16 +281,7 @@ const TabComponent = (props)=>{
         }
     }));
     const handleTabClick = (activeKey)=>{
-        setLoading(true);
-        setSearchParams([
-            [
-                'tab',
-                activeKey
-            ]
-        ]);
-        setTimeout(()=>{
-            setLoading(false);
-        }, 50);
+        setPageTabUrl(activeKey);
     };
     (0, external_react_namespaceObject.useEffect)(()=>{
         setTimeout(()=>{

package/lib/schema-component/antd/record-picker/InputRecordPicker.js

@@ -252,7 +252,7 @@ const Drawer = (param)=>{
             allowNull: true,
             name: null == collectionField ? void 0 : collectionField.target,
             children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_action_index_js_namespaceObject.ActionContextProvider, {
-                openMode: "drawer",
+                openMode: external_action_index_js_namespaceObject.OpenMode.DEFAULT,
                 visible: visible,
                 setVisible: setVisible,
                 children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_core_index_js_namespaceObject.FormProvider, {

package/lib/schema-component/antd/record-picker/ReadPrettyRecordPicker.js

@@ -133,7 +133,7 @@ const ReadPrettyRecordPicker = (0, schema_namespaceObject.observer)((props)=>{
                         value: {
                             visible,
                             setVisible,
-                            openMode: 'drawer',
+                            openMode: external_action_index_js_namespaceObject.OpenMode.DEFAULT,
                             snapshot: 'snapshot' === collectionField.interface
                         },
                         children: renderRecordProvider()

package/lib/schema-initializer/items/SelectActionInitializer.js

@@ -27,7 +27,7 @@ __webpack_require__.d(__webpack_exports__, {
     SelectActionInitializer: ()=>SelectActionInitializer
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
-require("react");
+const index_js_namespaceObject = require("../../schema-component/index.js");
 const external_ActionInitializer_js_namespaceObject = require("./ActionInitializer.js");
 const SelectActionInitializer = (props)=>{
     const schema = {
@@ -37,7 +37,7 @@ const SelectActionInitializer = (props)=>{
         'x-designer': 'Action.Designer',
         'x-component': 'Action',
         'x-component-props': {
-            openMode: 'drawer'
+            openMode: index_js_namespaceObject.OpenMode.DRAWER_MODE
         },
         properties: {
             drawer: {

package/lib/schema-items/OpenModeSchemaItems.js

@@ -28,11 +28,14 @@ __webpack_require__.d(__webpack_exports__, {
     SchemaSettingOpenModeSchemaItems: ()=>SchemaSettingOpenModeSchemaItems
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
-require("react");
+const external_react_namespaceObject = require("react");
 const schema_namespaceObject = require("@tachybase/schema");
 const external_antd_namespaceObject = require("antd");
 const external_react_i18next_namespaceObject = require("react-i18next");
 const index_js_namespaceObject = require("../application/index.js");
+const external_block_provider_index_js_namespaceObject = require("../block-provider/index.js");
+const PageStyle_provider_js_namespaceObject = require("../built-in/page-style/PageStyle.provider.js");
+const usePageStyle_js_namespaceObject = require("../built-in/page-style/usePageStyle.js");
 const external_schema_component_index_js_namespaceObject = require("../schema-component/index.js");
 const external_schema_settings_index_js_namespaceObject = require("../schema-settings/index.js");
 const SchemaInitializerOpenModeSchemaItems = (options)=>{
@@ -42,7 +45,16 @@ const SchemaInitializerOpenModeSchemaItems = (options)=>{
     const field = (0, schema_namespaceObject.useField)();
     const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
     const { dn } = (0, external_schema_component_index_js_namespaceObject.useDesignable)();
-    const openModeValue = (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops['openMode']) || 'drawer';
+    const isMobile = (0, external_block_provider_index_js_namespaceObject.useIsMobile)();
+    const pageStyle = (0, usePageStyle_js_namespaceObject.usePageStyle)();
+    const defaultOpenMode = (0, external_react_namespaceObject.useMemo)(()=>{
+        if (isMobile || pageStyle === PageStyle_provider_js_namespaceObject.PageStyle.TAB_STYLE) return external_schema_component_index_js_namespaceObject.OpenMode.PAGE;
+        return external_schema_component_index_js_namespaceObject.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__*/ (0, jsx_runtime_namespaceObject.jsxs)(jsx_runtime_namespaceObject.Fragment, {
         children: [
@@ -51,11 +63,11 @@ const SchemaInitializerOpenModeSchemaItems = (options)=>{
                 options: [
                     {
                         label: t('Drawer'),
-                        value: 'drawer'
+                        value: external_schema_component_index_js_namespaceObject.OpenMode.DRAWER_MODE
                     },
                     {
                         label: t('Dialog'),
-                        value: 'modal'
+                        value: external_schema_component_index_js_namespaceObject.OpenMode.MODAL
                     }
                 ],
                 value: openModeValue,
@@ -75,8 +87,8 @@ const SchemaInitializerOpenModeSchemaItems = (options)=>{
                 }
             }) : null,
             openSize && [
-                'modal',
-                'drawer'
+                external_schema_component_index_js_namespaceObject.OpenMode.MODAL,
+                external_schema_component_index_js_namespaceObject.OpenMode.DRAWER_MODE
             ].includes(openModeValue) ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(index_js_namespaceObject.SchemaInitializerItem, {
                 children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)("div", {
                     style: {
@@ -103,7 +115,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']) === external_schema_component_index_js_namespaceObject.OpenMode.MODAL ? 'large' : 'middle',
                             onChange: (value)=>{
                                 field.componentProps.openSize = value;
                                 const schema = {
@@ -135,7 +147,16 @@ const SchemaSettingOpenModeSchemaItems = (options)=>{
     const field = (0, schema_namespaceObject.useField)();
     const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
     const { dn } = (0, external_schema_component_index_js_namespaceObject.useDesignable)();
-    const openModeValue = (null == fieldSchema ? void 0 : null == (_fieldSchema_xcomponentprops = fieldSchema['x-component-props']) ? void 0 : _fieldSchema_xcomponentprops['openMode']) || 'drawer';
+    const pageStyle = (0, usePageStyle_js_namespaceObject.usePageStyle)();
+    const isMobile = (0, external_block_provider_index_js_namespaceObject.useIsMobile)();
+    const defaultOpenMode = (0, external_react_namespaceObject.useMemo)(()=>{
+        if (isMobile || pageStyle === PageStyle_provider_js_namespaceObject.PageStyle.TAB_STYLE) return external_schema_component_index_js_namespaceObject.OpenMode.PAGE;
+        return external_schema_component_index_js_namespaceObject.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__*/ (0, jsx_runtime_namespaceObject.jsxs)(jsx_runtime_namespaceObject.Fragment, {
         children: [
@@ -144,19 +165,19 @@ const SchemaSettingOpenModeSchemaItems = (options)=>{
                 options: [
                     {
                         label: t('Drawer'),
-                        value: 'drawer'
+                        value: external_schema_component_index_js_namespaceObject.OpenMode.DRAWER_MODE
                     },
                     {
                         label: t('Dialog'),
-                        value: 'modal'
+                        value: external_schema_component_index_js_namespaceObject.OpenMode.MODAL
                     },
                     {
                         label: t('Sheet'),
-                        value: 'sheet'
+                        value: external_schema_component_index_js_namespaceObject.OpenMode.SHEET
                     },
                     {
                         label: t('Page'),
-                        value: 'page'
+                        value: external_schema_component_index_js_namespaceObject.OpenMode.PAGE
                     }
                 ],
                 value: openModeValue,
@@ -176,8 +197,8 @@ const SchemaSettingOpenModeSchemaItems = (options)=>{
                 }
             }) : null,
             openSize && [
-                'modal',
-                'drawer'
+                external_schema_component_index_js_namespaceObject.OpenMode.MODAL,
+                external_schema_component_index_js_namespaceObject.OpenMode.DRAWER_MODE
             ].includes(openModeValue) ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_schema_settings_index_js_namespaceObject.SchemaSettingsSelectItem, {
                 title: t('Popup size'),
                 options: [
@@ -194,7 +215,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']) === external_schema_component_index_js_namespaceObject.OpenMode.MODAL ? 'large' : 'middle',
                 onChange: (value)=>{
                     field.componentProps.openSize = value;
                     const schema = {

package/lib/schema-templates/schemas/uiSchemaTemplates.js

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

package/lib/user/ChangePassword.js

@@ -45,15 +45,24 @@ const useCloseAction = ()=>{
     };
 };
 const useSaveCurrentUserValues = ()=>{
+    var _currentUser_data_data, _currentUser_data;
     const { setVisible } = (0, external_index_js_namespaceObject.useActionContext)();
     const form = (0, schema_namespaceObject.useForm)();
     const api = (0, index_js_namespaceObject.useAPIClient)();
+    const currentUser = (0, external_index_js_namespaceObject.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);
         }
@@ -73,7 +82,8 @@ const schema = {
                     title: '{{t("Old password")}}',
                     required: true,
                     'x-component': 'Password',
-                    'x-decorator': 'FormItem'
+                    'x-decorator': 'FormItem',
+                    'x-hidden': '{{ hideOldPassword }}'
                 },
                 newPassword: {
                     type: 'string',
@@ -147,9 +157,12 @@ const schema = {
     }
 };
 const useChangePassword = ()=>{
+    var _currentUser_data_data, _currentUser_data;
     const ctx = (0, external_react_namespaceObject.useContext)(external_index_js_namespaceObject.DropdownVisibleContext);
     const [visible, setVisible] = (0, external_react_namespaceObject.useState)(false);
     const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
+    const currentUser = (0, external_index_js_namespaceObject.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 (0, external_react_namespaceObject.useMemo)(()=>({
             key: 'password',
             eventKey: 'ChangePassword',
@@ -170,7 +183,8 @@ const useChangePassword = ()=>{
                             children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_index_js_namespaceObject.SchemaComponent, {
                                 scope: {
                                     useCloseAction,
-                                    useSaveCurrentUserValues
+                                    useSaveCurrentUserValues,
+                                    hideOldPassword
                                 },
                                 schema: schema
                             })
@@ -179,7 +193,8 @@ const useChangePassword = ()=>{
                 ]
             })
         }), [
-        visible
+        visible,
+        hideOldPassword
     ]);
 };
 exports.useChangePassword = __webpack_exports__.useChangePassword;