@tachybase/client 1.3.24 → 1.3.25

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/es/modules/blocks/data-blocks/table/hooks/useTableBlockProps.mjs +2 -1
  2. package/es/schema-component/antd/page/Page.mjs +1 -1
  3. package/es/schema-component/antd/page/Page.style.mjs +3 -3
  4. package/es/schema-component/common/sortable-item/DragHandlePageTab.mjs +11 -46
  5. package/es/schema-component/common/sortable-item/DragHandlePageTab.style.mjs +1 -1
  6. package/lib/block-provider/hooks/index.js +2 -2
  7. package/lib/modules/blocks/data-blocks/table/hooks/useTableBlockProps.js +2 -1
  8. package/lib/schema-component/antd/page/Page.js +1 -1
  9. package/lib/schema-component/antd/page/Page.style.js +3 -3
  10. package/lib/schema-component/common/sortable-item/DragHandlePageTab.js +10 -45
  11. package/lib/schema-component/common/sortable-item/DragHandlePageTab.style.js +1 -1
  12. package/package.json +4 -4
package/es/modules/blocks/data-blocks/table/hooks/useTableBlockProps.mjs CHANGED
@@ -133,7 +133,8 @@ const useTableBlockProps = ()=>{
133
133
  const prevFlatItems = flat(prevMergedFilter);
134
134
  Object.entries(prevFlatItems).forEach((param)=>{
135
135
  let [key, prevItem] = param;
136
- if (key.split('.').includes(target.field)) delete prevFlatItems[key];
136
+ if (key.split('.').includes(target.field) || key.includes(target.field)) delete prevFlatItems[key];
137
+ if (!prevFlatItems[key]) delete prevFlatItems[key];
137
138
  });
138
139
  prevMergedFilter = flat.unflatten(prevFlatItems);
139
140
  }
package/es/schema-component/antd/page/Page.mjs CHANGED
@@ -1,10 +1,10 @@
1
1
  import { Fragment, jsx, jsxs } from "react/jsx-runtime";
2
2
  import { useContext, useEffect, useMemo, useState } from "react";
3
3
  import { Schema, SchemaOptionsContext, useFieldSchema } from "@tachybase/schema";
4
+ import { FormLayout } from "@tego/client";
4
5
  import { PlusOutlined } from "@ant-design/icons";
5
6
  import { PageHeader } from "@ant-design/pro-layout";
6
7
  import { PointerSensor, useSensor, useSensors } from "@dnd-kit/core";
7
- import { FormLayout } from "@tego/client";
8
8
  import { Button, Tabs } from "antd";
9
9
  import { cx } from "antd-style";
10
10
  import classnames from "classnames";
package/es/schema-component/antd/page/Page.style.mjs CHANGED
@@ -9,7 +9,7 @@ function _tagged_template_literal(strings, raw) {
9
9
  }
10
10
  function _templateObject() {
11
11
  const data = _tagged_template_literal([
12
- "\n .ant-tabs-nav-wrap.ant-tabs-nav-wrap {\n flex: none;\n }\n .ant-tabs-tab.ant-tabs-tab {\n border: none;\n background-color: #ffffff;\n }\n\n .ant-tabs-tab-active.ant-tabs-tab-active.ant-tabs-tab-active.ant-tabs-tab-active {\n border-radius: 8px 8px 0 0;\n box-shadow: none;\n text-shadow: none;\n background-color: var(--tb-box-bg);\n }\n .ant-tabs-extra-content {\n flex: 1;\n }\n "
12
+ "\n .ant-tabs-nav-wrap.ant-tabs-nav-wrap {\n flex: none;\n }\n .ant-tabs-tab.ant-tabs-tab.ant-tabs-tab {\n padding: 0;\n border: none;\n background-color: #ffffff;\n }\n\n .ant-tabs-tab-active.ant-tabs-tab-active.ant-tabs-tab-active.ant-tabs-tab-active {\n border-radius: 8px 8px 0 0;\n box-shadow: none;\n text-shadow: none;\n background-color: var(--tb-box-bg);\n }\n .ant-tabs-extra-content {\n flex: 1;\n }\n "
13
13
  ]);
14
14
  _templateObject = function() {
15
15
  return data;
@@ -18,7 +18,7 @@ function _templateObject() {
18
18
  }
19
19
  function _templateObject1() {
20
20
  const data = _tagged_template_literal([
21
- "\n display: flex;\n flex-direction: row;\n justify-content: flex-end;\n\n &.designable {\n justify-content: space-between;\n }\n\n .scroll-area-extra-content {\n align-self: flex-end;\n }\n "
21
+ "\n display: flex;\n flex-direction: row;\n justify-content: flex-end;\n &.designable {\n justify-content: space-between;\n }\n .add-tab-btn {\n border-radius: 8px 8px 0 0;\n }\n\n .scroll-area-extra-content {\n align-self: flex-end;\n }\n "
22
22
  ]);
23
23
  _templateObject1 = function() {
24
24
  return data;
@@ -27,7 +27,7 @@ function _templateObject1() {
27
27
  }
28
28
  function _templateObject2() {
29
29
  const data = _tagged_template_literal([
30
- "\n position: relative;\n &:hover {\n .tab-designer-wrapper {\n display: block;\n }\n }\n .tab-designer-wrapper {\n display: none;\n position: absolute;\n top: 0;\n right: 0;\n padding: 0 2px;\n border-radius: 3px;\n color: #000000;\n background-color: #ffffff;\n\n &:hover {\n color: #ffffff;\n background-color: var(--colorSettings);\n }\n }\n "
30
+ "\n position: relative;\n border-radius: 8px 8px 0 0;\n &:hover {\n .tab-designer-wrapper {\n display: block;\n }\n }\n .tab-designer-wrapper {\n display: none;\n position: absolute;\n top: 0;\n right: 0;\n padding: 0 2px;\n border-radius: 3px;\n color: #000000;\n background-color: #ffffff;\n\n &:hover {\n color: #ffffff;\n background-color: var(--colorSettings);\n }\n }\n "
31
31
  ]);
32
32
  _templateObject2 = function() {
33
33
  return data;
package/es/schema-component/common/sortable-item/DragHandlePageTab.mjs CHANGED
@@ -1,5 +1,6 @@
1
1
  import { jsx } from "react/jsx-runtime";
2
- import { useContext, useRef, useState } from "react";
2
+ import { useContext } from "react";
3
+ import { CSS } from "@dnd-kit/utilities";
3
4
  import { cx } from "antd-style";
4
5
  import { useDesignable } from "../../hooks/index.mjs";
5
6
  import { useStyles } from "./DragHandlePageTab.style.mjs";
@@ -8,46 +9,16 @@ const DragHandlePageTab = (props)=>{
8
9
  const { isSubMenu, children, className: overStyle, isAdminMenu } = props;
9
10
  const { draggable } = useContext(SortableContext);
10
11
  const { designable } = useDesignable();
11
- const { attributes, listeners, setNodeRef, transform, isDragging } = draggable;
12
+ const { attributes, listeners, setNodeRef, isDragging, transform, transition } = draggable;
12
13
  const { styles } = useStyles();
13
- const ref = useRef(null);
14
- const [dimensions, setDimensions] = useState({
15
- width: 0,
16
- height: 0
17
- });
18
- const [initialPosition, setInitialPosition] = useState({
19
- x: 0,
20
- y: 0
21
- });
22
- const style = {
23
- position: isDragging ? 'fixed' : 'static',
24
- top: isDragging ? initialPosition.y - 5 * dimensions.height : 0,
25
- left: isDragging ? initialPosition.x - dimensions.width : 0,
26
- width: isDragging ? 'max-content' : '100%',
27
- height: isDragging ? 'max-content' : '100%',
28
- zIndex: isDragging ? 999 : 'auto',
29
- pointerEvents: isDragging ? 'none' : 'auto',
30
- transform: transform ? "translate3d(".concat(transform.x, "px, ").concat(transform.y, "px, 0) scale(").concat(isDragging ? 1.05 : 1, ")") : void 0,
31
- boxShadow: isDragging ? '0 8px 24px 4px rgba(0,0,0,0.18)' : 'none',
32
- WebkitTransform: transform ? "translate3d(".concat(transform.x, "px, ").concat(transform.y, "px, 0) scale(").concat(isDragging ? 1.05 : 1, ")") : void 0,
33
- WebkitPerspective: isDragging ? 1000 : void 0,
34
- isolation: isDragging ? 'isolate' : void 0
35
- };
36
- const handleMouseDown = (event)=>{
37
- if (ref.current) {
38
- const { width, height } = ref.current.getBoundingClientRect();
39
- const { clientX, clientY } = event;
40
- setDimensions({
41
- width,
42
- height
43
- });
44
- setInitialPosition({
45
- x: clientX,
46
- y: clientY
47
- });
48
- }
49
- };
50
14
  if (!designable) return children;
15
+ ({
16
+ ...props.style,
17
+ transform: CSS.Translate.toString(transform),
18
+ transition,
19
+ cursor: 'move',
20
+ zIndex: isDragging ? 999 : 'auto'
21
+ });
51
22
  return /*#__PURE__*/ jsx("div", {
52
23
  ref: setNodeRef,
53
24
  className: cx(styles.dragHandleMenu, {
@@ -55,16 +26,10 @@ const DragHandlePageTab = (props)=>{
55
26
  leftBorder: isSubMenu && isDragging,
56
27
  adminMenu: isAdminMenu && isDragging
57
28
  }, overStyle),
58
- style: style,
59
29
  ...listeners,
60
30
  ...attributes,
61
31
  role: "none",
62
- onMouseDown: handleMouseDown,
63
- children: /*#__PURE__*/ jsx("div", {
64
- ref: ref,
65
- className: 'wrapper',
66
- children: children
67
- })
32
+ children: children
68
33
  });
69
34
  };
70
35
  export { DragHandlePageTab };
package/es/schema-component/common/sortable-item/DragHandlePageTab.style.mjs CHANGED
@@ -9,7 +9,7 @@ function _tagged_template_literal(strings, raw) {
9
9
  }
10
10
  function _templateObject() {
11
11
  const data = _tagged_template_literal([
12
- "\n position: relative;\n width: 100%;\n height: 100%;\n\n &.draggable {\n cursor: move;\n padding: 0 10px;\n border-radius: 5px;\n background: #f0f0f0;\n }\n\n .wrapper {\n display: flex;\n flex-direction: row;\n justify-content: space-around;\n }\n "
12
+ "\n position: relative;\n width: 100%;\n height: 100%;\n padding: 6px 16px;\n border-radius: 8px 8px 0 0;\n &.draggable {\n cursor: move;\n padding: 0 10px;\n border-radius: 5px;\n background: #f0f0f0;\n }\n "
13
13
  ]);
14
14
  _templateObject = function() {
15
15
  return data;
package/lib/block-provider/hooks/index.js CHANGED
@@ -15,7 +15,7 @@ var __webpack_modules__ = {
15
15
  "../../filter-provider/utils": function(module) {
16
16
  module.exports = require("../../filter-provider/utils.js");
17
17
  },
18
- "../../": function(module) {
18
+ "../../../schema-component": function(module) {
19
19
  module.exports = require("../../index.js");
20
20
  },
21
21
  "../../record-provider": function(module) {
@@ -182,7 +182,7 @@ var __webpack_exports__ = {};
182
182
  var react_i18next__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("react-i18next");
183
183
  var react_router_dom__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__("react-router-dom");
184
184
  var react_to_print__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__("react-to-print");
185
- var ___WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__("../../");
185
+ var ___WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__("../../../schema-component");
186
186
  var _api_client__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__("../../api-client");
187
187
  var _built_in_dynamic_page_utils__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__("../../built-in/dynamic-page/utils");
188
188
  var _collection_manager__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__("../../collection-manager");
package/lib/modules/blocks/data-blocks/table/hooks/useTableBlockProps.js CHANGED
@@ -172,7 +172,8 @@ const useTableBlockProps = ()=>{
172
172
  const prevFlatItems = external_flat_default()(prevMergedFilter);
173
173
  Object.entries(prevFlatItems).forEach((param)=>{
174
174
  let [key, prevItem] = param;
175
- if (key.split('.').includes(target.field)) delete prevFlatItems[key];
175
+ if (key.split('.').includes(target.field) || key.includes(target.field)) delete prevFlatItems[key];
176
+ if (!prevFlatItems[key]) delete prevFlatItems[key];
176
177
  });
177
178
  prevMergedFilter = external_flat_default().unflatten(prevFlatItems);
178
179
  }
package/lib/schema-component/antd/page/Page.js CHANGED
@@ -38,10 +38,10 @@ __webpack_require__.d(__webpack_exports__, {
38
38
  const jsx_runtime_namespaceObject = require("react/jsx-runtime");
39
39
  const external_react_namespaceObject = require("react");
40
40
  const schema_namespaceObject = require("@tachybase/schema");
41
+ const client_namespaceObject = require("@tego/client");
41
42
  const icons_namespaceObject = require("@ant-design/icons");
42
43
  const pro_layout_namespaceObject = require("@ant-design/pro-layout");
43
44
  const core_namespaceObject = require("@dnd-kit/core");
44
- const client_namespaceObject = require("@tego/client");
45
45
  const external_antd_namespaceObject = require("antd");
46
46
  const external_antd_style_namespaceObject = require("antd-style");
47
47
  const external_classnames_namespaceObject = require("classnames");
package/lib/schema-component/antd/page/Page.style.js CHANGED
@@ -37,7 +37,7 @@ function _tagged_template_literal(strings, raw) {
37
37
  }
38
38
  function _templateObject() {
39
39
  const data = _tagged_template_literal([
40
- "\n .ant-tabs-nav-wrap.ant-tabs-nav-wrap {\n flex: none;\n }\n .ant-tabs-tab.ant-tabs-tab {\n border: none;\n background-color: #ffffff;\n }\n\n .ant-tabs-tab-active.ant-tabs-tab-active.ant-tabs-tab-active.ant-tabs-tab-active {\n border-radius: 8px 8px 0 0;\n box-shadow: none;\n text-shadow: none;\n background-color: var(--tb-box-bg);\n }\n .ant-tabs-extra-content {\n flex: 1;\n }\n "
40
+ "\n .ant-tabs-nav-wrap.ant-tabs-nav-wrap {\n flex: none;\n }\n .ant-tabs-tab.ant-tabs-tab.ant-tabs-tab {\n padding: 0;\n border: none;\n background-color: #ffffff;\n }\n\n .ant-tabs-tab-active.ant-tabs-tab-active.ant-tabs-tab-active.ant-tabs-tab-active {\n border-radius: 8px 8px 0 0;\n box-shadow: none;\n text-shadow: none;\n background-color: var(--tb-box-bg);\n }\n .ant-tabs-extra-content {\n flex: 1;\n }\n "
41
41
  ]);
42
42
  _templateObject = function() {
43
43
  return data;
@@ -46,7 +46,7 @@ function _templateObject() {
46
46
  }
47
47
  function _templateObject1() {
48
48
  const data = _tagged_template_literal([
49
- "\n display: flex;\n flex-direction: row;\n justify-content: flex-end;\n\n &.designable {\n justify-content: space-between;\n }\n\n .scroll-area-extra-content {\n align-self: flex-end;\n }\n "
49
+ "\n display: flex;\n flex-direction: row;\n justify-content: flex-end;\n &.designable {\n justify-content: space-between;\n }\n .add-tab-btn {\n border-radius: 8px 8px 0 0;\n }\n\n .scroll-area-extra-content {\n align-self: flex-end;\n }\n "
50
50
  ]);
51
51
  _templateObject1 = function() {
52
52
  return data;
@@ -55,7 +55,7 @@ function _templateObject1() {
55
55
  }
56
56
  function _templateObject2() {
57
57
  const data = _tagged_template_literal([
58
- "\n position: relative;\n &:hover {\n .tab-designer-wrapper {\n display: block;\n }\n }\n .tab-designer-wrapper {\n display: none;\n position: absolute;\n top: 0;\n right: 0;\n padding: 0 2px;\n border-radius: 3px;\n color: #000000;\n background-color: #ffffff;\n\n &:hover {\n color: #ffffff;\n background-color: var(--colorSettings);\n }\n }\n "
58
+ "\n position: relative;\n border-radius: 8px 8px 0 0;\n &:hover {\n .tab-designer-wrapper {\n display: block;\n }\n }\n .tab-designer-wrapper {\n display: none;\n position: absolute;\n top: 0;\n right: 0;\n padding: 0 2px;\n border-radius: 3px;\n color: #000000;\n background-color: #ffffff;\n\n &:hover {\n color: #ffffff;\n background-color: var(--colorSettings);\n }\n }\n "
59
59
  ]);
60
60
  _templateObject2 = function() {
61
61
  return data;
package/lib/schema-component/common/sortable-item/DragHandlePageTab.js CHANGED
@@ -28,6 +28,7 @@ __webpack_require__.d(__webpack_exports__, {
28
28
  });
29
29
  const jsx_runtime_namespaceObject = require("react/jsx-runtime");
30
30
  const external_react_namespaceObject = require("react");
31
+ const utilities_namespaceObject = require("@dnd-kit/utilities");
31
32
  const external_antd_style_namespaceObject = require("antd-style");
32
33
  const index_js_namespaceObject = require("../../hooks/index.js");
33
34
  const external_DragHandlePageTab_style_js_namespaceObject = require("./DragHandlePageTab.style.js");
@@ -36,46 +37,16 @@ const DragHandlePageTab = (props)=>{
36
37
  const { isSubMenu, children, className: overStyle, isAdminMenu } = props;
37
38
  const { draggable } = (0, external_react_namespaceObject.useContext)(external_SortableItem_js_namespaceObject.SortableContext);
38
39
  const { designable } = (0, index_js_namespaceObject.useDesignable)();
39
- const { attributes, listeners, setNodeRef, transform, isDragging } = draggable;
40
+ const { attributes, listeners, setNodeRef, isDragging, transform, transition } = draggable;
40
41
  const { styles } = (0, external_DragHandlePageTab_style_js_namespaceObject.useStyles)();
41
- const ref = (0, external_react_namespaceObject.useRef)(null);
42
- const [dimensions, setDimensions] = (0, external_react_namespaceObject.useState)({
43
- width: 0,
44
- height: 0
45
- });
46
- const [initialPosition, setInitialPosition] = (0, external_react_namespaceObject.useState)({
47
- x: 0,
48
- y: 0
49
- });
50
- const style = {
51
- position: isDragging ? 'fixed' : 'static',
52
- top: isDragging ? initialPosition.y - 5 * dimensions.height : 0,
53
- left: isDragging ? initialPosition.x - dimensions.width : 0,
54
- width: isDragging ? 'max-content' : '100%',
55
- height: isDragging ? 'max-content' : '100%',
56
- zIndex: isDragging ? 999 : 'auto',
57
- pointerEvents: isDragging ? 'none' : 'auto',
58
- transform: transform ? "translate3d(".concat(transform.x, "px, ").concat(transform.y, "px, 0) scale(").concat(isDragging ? 1.05 : 1, ")") : void 0,
59
- boxShadow: isDragging ? '0 8px 24px 4px rgba(0,0,0,0.18)' : 'none',
60
- WebkitTransform: transform ? "translate3d(".concat(transform.x, "px, ").concat(transform.y, "px, 0) scale(").concat(isDragging ? 1.05 : 1, ")") : void 0,
61
- WebkitPerspective: isDragging ? 1000 : void 0,
62
- isolation: isDragging ? 'isolate' : void 0
63
- };
64
- const handleMouseDown = (event)=>{
65
- if (ref.current) {
66
- const { width, height } = ref.current.getBoundingClientRect();
67
- const { clientX, clientY } = event;
68
- setDimensions({
69
- width,
70
- height
71
- });
72
- setInitialPosition({
73
- x: clientX,
74
- y: clientY
75
- });
76
- }
77
- };
78
42
  if (!designable) return children;
43
+ ({
44
+ ...props.style,
45
+ transform: utilities_namespaceObject.CSS.Translate.toString(transform),
46
+ transition,
47
+ cursor: 'move',
48
+ zIndex: isDragging ? 999 : 'auto'
49
+ });
79
50
  return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("div", {
80
51
  ref: setNodeRef,
81
52
  className: (0, external_antd_style_namespaceObject.cx)(styles.dragHandleMenu, {
@@ -83,16 +54,10 @@ const DragHandlePageTab = (props)=>{
83
54
  leftBorder: isSubMenu && isDragging,
84
55
  adminMenu: isAdminMenu && isDragging
85
56
  }, overStyle),
86
- style: style,
87
57
  ...listeners,
88
58
  ...attributes,
89
59
  role: "none",
90
- onMouseDown: handleMouseDown,
91
- children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("div", {
92
- ref: ref,
93
- className: 'wrapper',
94
- children: children
95
- })
60
+ children: children
96
61
  });
97
62
  };
98
63
  exports.DragHandlePageTab = __webpack_exports__.DragHandlePageTab;
package/lib/schema-component/common/sortable-item/DragHandlePageTab.style.js CHANGED
@@ -37,7 +37,7 @@ function _tagged_template_literal(strings, raw) {
37
37
  }
38
38
  function _templateObject() {
39
39
  const data = _tagged_template_literal([
40
- "\n position: relative;\n width: 100%;\n height: 100%;\n\n &.draggable {\n cursor: move;\n padding: 0 10px;\n border-radius: 5px;\n background: #f0f0f0;\n }\n\n .wrapper {\n display: flex;\n flex-direction: row;\n justify-content: space-around;\n }\n "
40
+ "\n position: relative;\n width: 100%;\n height: 100%;\n padding: 6px 16px;\n border-radius: 8px 8px 0 0;\n &.draggable {\n cursor: move;\n padding: 0 10px;\n border-radius: 5px;\n background: #f0f0f0;\n }\n "
41
41
  ]);
42
42
  _templateObject = function() {
43
43
  return data;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@tachybase/client",
3
- "version": "1.3.24",
3
+ "version": "1.3.25",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.mjs",
@@ -21,8 +21,8 @@
21
21
  "@floating-ui/react": "0.26.28",
22
22
  "@js-preview/excel": "^1.7.14",
23
23
  "@lottiefiles/dotlottie-react": "^0.9.3",
24
- "@tachybase/schema": "^1.3.49",
25
- "@tego/client": "^1.3.49",
24
+ "@tachybase/schema": "*",
25
+ "@tego/client": "*",
26
26
  "ahooks": "^3.9.0",
27
27
  "antd": "5.22.5",
28
28
  "antd-style": "3.7.1",
@@ -30,7 +30,7 @@
30
30
  "axios-mock-adapter": "^1.22.0",
31
31
  "classnames": "^2.5.1",
32
32
  "click-to-react-component": "1.1.2",
33
- "cronstrue": "^2.52.0",
33
+ "cronstrue": "^3.2.0",
34
34
  "d3-format": "^3.1.0",
35
35
  "dayjs": "1.11.13",
36
36
  "deepmerge": "^4.3.1",