@doreamonjs/page-detail 1.12.16 → 1.12.19

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.12.19](https://github.com/doreamonjs/doreamon/compare/v1.12.18...v1.12.19) (2024-08-01)
+
+
+### Bug Fixes
+
+* page-detail if no id in values, use loading method ([118ec31](https://github.com/doreamonjs/doreamon/commit/118ec31a4d9d58d869582fbdf531a14f75044533))
+
+
+
+
+
+## [1.12.17](https://github.com/doreamonjs/doreamon/compare/v1.12.16...v1.12.17) (2024-07-23)
+
+**Note:** Version bump only for package @doreamonjs/page-detail
+
+
+
+
+
 ## [1.12.16](https://github.com/doreamonjs/doreamon/compare/v1.12.15...v1.12.16) (2024-07-22)
 
 **Note:** Version bump only for package @doreamonjs/page-detail

package/lib/index.d.ts

@@ -26,6 +26,7 @@ interface Attributes {
     subTitle?: string;
     actions: any[];
     detail: {
+        loading?: (id: string, values: any, context: any) => boolean;
         basis: DetailBasis;
         modules: DetailModules;
     };

package/lib/index.js

@@ -31,7 +31,7 @@ const icons_1 = require("@ant-design/icons");
 require("./index.less");
 const componentName = 'doreamonjs-design-page-detail';
 const DetailPage = (props) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
     const [isMobile] = react_1.useState((_b = (_a = window.matchMedia) === null || _a === void 0 ? void 0 : _a.call(window, "(max-width: 767px)")) === null || _b === void 0 ? void 0 : _b.matches);
     const values = (_d = (_c = props === null || props === void 0 ? void 0 : props.datasets) === null || _c === void 0 ? void 0 : _c.values) !== null && _d !== void 0 ? _d : {};
     const renderBasisBottom = (_f = (_e = props.attributes.detail) === null || _e === void 0 ? void 0 : _e.basis) === null || _f === void 0 ? void 0 : _f.renderBottom;
@@ -80,7 +80,24 @@ const DetailPage = (props) => {
             render,
         };
     });
-    if (+((_w = doreamon_1.default.dom.router.getQuery()) === null || _w === void 0 ? void 0 : _w.id) !== (values === null || values === void 0 ? void 0 : values.id)) {
+    const isLoading = () => {
+        var _a;
+        const id = (_a = doreamon_1.default.dom.router.getQuery()) === null || _a === void 0 ? void 0 : _a.id;
+        if (typeof props.attributes.detail.loading === 'function') {
+            return props.attributes.detail.loading(id, values, props);
+        }
+        if (Object.keys(values).length === 0) {
+            return true;
+        }
+        if (typeof (values === null || values === void 0 ? void 0 : values.id) === 'string') {
+            return id !== (values === null || values === void 0 ? void 0 : values.id);
+        }
+        else if (typeof (values === null || values === void 0 ? void 0 : values.id) === 'number') {
+            return +id !== (values === null || values === void 0 ? void 0 : values.id);
+        }
+        return false;
+    };
+    if (isLoading()) {
         return (react_1.default.createElement("div", { style: {
                 width: '100%',
                 height: '500px',
@@ -92,7 +109,7 @@ const DetailPage = (props) => {
     return (react_1.default.createElement("div", { className: doreamon_1.default.classnames('page', componentName, props.className) },
         react_1.default.createElement(components_1.Card.Information, { title: !isMobile ? title : (react_1.default.createElement("div", null,
                 react_1.default.createElement(icons_1.ArrowLeftOutlined, { style: { marginRight: 8 }, onClick: () => { var _a, _b, _c, _d, _e; return (_e = (_d = (_c = (_b = (_a = window) === null || _a === void 0 ? void 0 : _a.__DOREAMONJS_SDK) === null || _b === void 0 ? void 0 : _b.shared) === null || _c === void 0 ? void 0 : _c.router) === null || _d === void 0 ? void 0 : _d.goBack) === null || _e === void 0 ? void 0 : _e.call(_d); } }),
-                react_1.default.createElement("div", { style: { display: 'inline-block' } }, title))), subTitle: subTitle, actions: props.attributes.actions, allowActionTypes: ['custom'], column: (_z = (_y = (_x = props.attributes.detail) === null || _x === void 0 ? void 0 : _x.basis) === null || _y === void 0 ? void 0 : _y.column) !== null && _z !== void 0 ? _z : 2, items: details, data: values, onActionClick: (action, values) => {
+                react_1.default.createElement("div", { style: { display: 'inline-block' } }, title))), subTitle: subTitle, actions: props.attributes.actions, allowActionTypes: ['custom'], column: (_y = (_x = (_w = props.attributes.detail) === null || _w === void 0 ? void 0 : _w.basis) === null || _x === void 0 ? void 0 : _x.column) !== null && _y !== void 0 ? _y : 2, items: details, data: values, onActionClick: (action, values) => {
                 props.onActionTrigger(action, {
                     values,
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@doreamonjs/page-detail",
-  "version": "1.12.16",
+  "version": "1.12.19",
   "description": "detail page",
   "keywords": [
     "doreamonjs",
@@ -71,7 +71,7 @@
     "@znode/fs": "^1.0.2"
   },
   "dependencies": {
-    "@doreamonjs/components": "^1.12.16",
+    "@doreamonjs/components": "^1.12.17",
     "@zodash/doreamon": "^1.1.5",
     "antd": "4.18.9",
     "react-monaco-editor": "^0.50.1",
@@ -80,5 +80,5 @@
     "xterm-addon-attach": "^0.6.0",
     "xterm-addon-fit": "^0.5.0"
   },
-  "gitHead": "70e323bd599f62fc9a9407d2e2d71af3ee69bf86"
+  "gitHead": "c5aafbf95c3f8d213f2c9412a38fae9d0f6b1880"
 }