@tachybase/client 1.6.6 → 1.6.8-alpha.1

package/es/block-provider/hooks/index.mjs

@@ -48,7 +48,7 @@ function filterByCleanedFields(mergeFilter) {
                 '$or'
             ].includes(p));
         const fieldPath = filteredParts.join('.');
-        const uniqueKey = "".concat(fieldPath, "|").concat(JSON.stringify(value));
+        const uniqueKey = "".concat(fieldPath);
         if (!seen.has(uniqueKey)) {
             seen.add(uniqueKey);
             result[key] = value;

package/es/built-in/page-style/TabHeader.mjs

@@ -1,5 +1,7 @@
 import { jsx, jsxs } from "react/jsx-runtime";
-import { useContext } from "react";
+import { useContext, useState } from "react";
+import { observer } from "@tachybase/schema";
+import { DndContext, DragOverlay, MouseSensor, useDraggable, useDroppable, useSensor, useSensors } from "@dnd-kit/core";
 import { css } from "@emotion/css";
 import { Button } from "antd";
 import classnames from "classnames";
@@ -57,17 +59,134 @@ const TabHeader = ()=>{
     const { styles } = useStyles();
     return /*#__PURE__*/ jsx("div", {
         className: styles.tabWrapper,
-        children: items.map((item)=>/*#__PURE__*/ jsx(Tag, {
-                active: item.key === targetKey,
-                onClick: ()=>{
-                    navigate(item.key);
-                },
-                onClose: (e)=>{
-                    e.stopPropagation();
-                    setItems((items)=>items.filter((i)=>i.key !== item.key));
-                },
-                children: item.label
-            }, item.key))
+        children: /*#__PURE__*/ jsx(DndProvider, {
+            targetKey: targetKey,
+            navigate: navigate,
+            setItems: setItems,
+            items: items,
+            children: items.map((item)=>/*#__PURE__*/ jsx(TabTitle, {
+                    item: item,
+                    targetKey: targetKey,
+                    navigate: navigate,
+                    setItems: setItems
+                }))
+        })
     });
 };
+const TabTag = (props)=>{
+    const { item, targetKey, navigate, setItems } = props;
+    return /*#__PURE__*/ jsx(Tag, {
+        active: item.key === targetKey,
+        onClick: ()=>{
+            navigate(item.key);
+        },
+        onClose: (e)=>{
+            e.stopPropagation();
+            setItems((items)=>items.filter((i)=>i.key !== item.key));
+        },
+        children: item.label
+    }, item.key);
+};
+const DndProvider = observer((props)=>{
+    const { targetKey, navigate, setItems, items } = props;
+    const [activeTab, setActiveId] = useState(null);
+    const onDragEnd = async (props)=>{
+        const { active, over } = props;
+        setTimeout(()=>{
+            setActiveId(null);
+        });
+        if (over && over.id !== active.id) {
+            const newItems = [
+                ...items
+            ];
+            const activeIndex = newItems.findIndex((item)=>item.key === active.id);
+            const overIndex = newItems.findIndex((item)=>item.key === over.id);
+            const item = newItems.splice(activeIndex, 1);
+            newItems.splice(overIndex, 0, ...item);
+            setItems(newItems);
+        }
+    };
+    function onDragStart(event) {
+        var _event_active;
+        setActiveId(null == (_event_active = event.active) ? void 0 : _event_active.data.current);
+    }
+    const mouseSensor = useSensor(MouseSensor, {
+        activationConstraint: {
+            distance: 10
+        }
+    });
+    const sensors = useSensors(mouseSensor);
+    return /*#__PURE__*/ jsxs(DndContext, {
+        sensors: sensors,
+        onDragEnd: onDragEnd,
+        onDragStart: onDragStart,
+        children: [
+            props.children,
+            /*#__PURE__*/ jsx(DragOverlay, {
+                children: activeTab ? /*#__PURE__*/ jsx("span", {
+                    style: {
+                        whiteSpace: 'nowrap'
+                    },
+                    children: /*#__PURE__*/ jsx(TabTag, {
+                        item: activeTab,
+                        targetKey: targetKey,
+                        navigate: navigate,
+                        setItems: setItems
+                    })
+                }) : null
+            })
+        ]
+    });
+}, {
+    displayName: 'DndProvider'
+});
+const Draggable = (props)=>{
+    const { attributes, listeners, setNodeRef } = useDraggable({
+        id: props.id,
+        data: props.data
+    });
+    return /*#__PURE__*/ jsx("div", {
+        ref: setNodeRef,
+        ...listeners,
+        ...attributes,
+        children: /*#__PURE__*/ jsx("div", {
+            children: props.children
+        })
+    });
+};
+function Droppable(props) {
+    const { isOver, setNodeRef } = useDroppable({
+        id: props.id,
+        data: props.data
+    });
+    const style = isOver ? {
+        color: 'green'
+    } : void 0;
+    return /*#__PURE__*/ jsx("div", {
+        ref: setNodeRef,
+        style: style,
+        children: props.children
+    });
+}
+const TabTitle = observer((props)=>{
+    const { item, targetKey, navigate, setItems } = props;
+    return /*#__PURE__*/ jsx(Droppable, {
+        id: item.key,
+        data: item,
+        children: /*#__PURE__*/ jsx("div", {
+            children: /*#__PURE__*/ jsx(Draggable, {
+                id: item.key,
+                data: item,
+                children: /*#__PURE__*/ jsx(TabTag, {
+                    item: item,
+                    targetKey: targetKey,
+                    navigate: navigate,
+                    setItems: setItems
+                })
+            })
+        })
+    });
+}, {
+    displayName: 'TabTitle'
+});
 export { TabHeader, Tag };

package/es/collection-manager/interfaces/number.mjs

@@ -129,6 +129,26 @@ class NumberFieldInterface extends CollectionFieldInterface {
                     {
                         value: '0.00001',
                         label: '1.00000'
+                    },
+                    {
+                        value: '0.000001',
+                        label: '1.000000'
+                    },
+                    {
+                        value: '0.0000001',
+                        label: '1.0000000'
+                    },
+                    {
+                        value: '0.00000001',
+                        label: '1.00000000'
+                    },
+                    {
+                        value: '0.000000001',
+                        label: '1.000000000'
+                    },
+                    {
+                        value: '0.0000000001',
+                        label: '1.0000000000'
                     }
                 ]
             },

package/es/collection-manager/interfaces/percent.mjs

@@ -96,6 +96,26 @@ class PercentFieldInterface extends CollectionFieldInterface {
                     {
                         value: '0.00001',
                         label: '1.00000%'
+                    },
+                    {
+                        value: '0.000001',
+                        label: '1.000000%'
+                    },
+                    {
+                        value: '0.0000001',
+                        label: '1.0000000%'
+                    },
+                    {
+                        value: '0.00000001',
+                        label: '1.00000000%'
+                    },
+                    {
+                        value: '0.000000001',
+                        label: '1.000000000%'
+                    },
+                    {
+                        value: '0.0000000001',
+                        label: '1.0000000000%'
                     }
                 ]
             },

package/es/schema-component/antd/input-number/ReadPretty.mjs

@@ -7,7 +7,10 @@ import { round } from "mathjs";
 function countDecimalPlaces(value) {
     const number = Number(value);
     if (!Number.isFinite(number)) return 0;
-    const decimalPart = String(number).split('.')[1];
+    const decimalPart = number.toLocaleString('en-US', {
+        useGrouping: false,
+        maximumSignificantDigits: 10
+    }).split('.')[1];
     return decimalPart ? decimalPart.length : 0;
 }
 const separators = {

package/es/schema-settings/SchemaSettingsNumberFormat.mjs

@@ -130,6 +130,26 @@ const SchemaSettingsNumberFormat = function(props) {
                         {
                             value: '0.00001',
                             label: '1.00000'
+                        },
+                        {
+                            value: '0.000001',
+                            label: '1.000000'
+                        },
+                        {
+                            value: '0.0000001',
+                            label: '1.0000000'
+                        },
+                        {
+                            value: '0.00000001',
+                            label: '1.00000000'
+                        },
+                        {
+                            value: '0.000000001',
+                            label: '1.000000000'
+                        },
+                        {
+                            value: '0.0000000001',
+                            label: '1.0000000000'
                         }
                     ]
                 },
@@ -155,7 +175,7 @@ const SchemaSettingsNumberFormat = function(props) {
             };
             schema['x-component-props'] = fieldSchema['x-component-props'] || {};
             fieldSchema['x-component-props'] = {
-                ...fieldSchema['x-component-props'] || {},
+                ...fieldSchema['x-component-props'],
                 ...data
             };
             schema['x-component-props'] = fieldSchema['x-component-props'];

package/lib/block-provider/hooks/index.js

@@ -361,7 +361,7 @@ var __webpack_exports__ = {};
                     '$or'
                 ].includes(p));
             const fieldPath = filteredParts.join('.');
-            const uniqueKey = "".concat(fieldPath, "|").concat(JSON.stringify(value));
+            const uniqueKey = "".concat(fieldPath);
             if (!seen.has(uniqueKey)) {
                 seen.add(uniqueKey);
                 result[key] = value;

package/lib/built-in/page-style/TabHeader.js

@@ -38,6 +38,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
+const schema_namespaceObject = require("@tachybase/schema");
+const core_namespaceObject = require("@dnd-kit/core");
 const css_namespaceObject = require("@emotion/css");
 const external_antd_namespaceObject = require("antd");
 const external_classnames_namespaceObject = require("classnames");
@@ -96,19 +98,136 @@ const TabHeader = ()=>{
     const { styles } = (0, external_TabHeader_style_js_namespaceObject.useStyles)();
     return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("div", {
         className: styles.tabWrapper,
-        children: items.map((item)=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(Tag, {
-                active: item.key === targetKey,
-                onClick: ()=>{
-                    navigate(item.key);
-                },
-                onClose: (e)=>{
-                    e.stopPropagation();
-                    setItems((items)=>items.filter((i)=>i.key !== item.key));
-                },
-                children: item.label
-            }, item.key))
+        children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(DndProvider, {
+            targetKey: targetKey,
+            navigate: navigate,
+            setItems: setItems,
+            items: items,
+            children: items.map((item)=>/*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(TabTitle, {
+                    item: item,
+                    targetKey: targetKey,
+                    navigate: navigate,
+                    setItems: setItems
+                }))
+        })
     });
 };
+const TabTag = (props)=>{
+    const { item, targetKey, navigate, setItems } = props;
+    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(Tag, {
+        active: item.key === targetKey,
+        onClick: ()=>{
+            navigate(item.key);
+        },
+        onClose: (e)=>{
+            e.stopPropagation();
+            setItems((items)=>items.filter((i)=>i.key !== item.key));
+        },
+        children: item.label
+    }, item.key);
+};
+const DndProvider = (0, schema_namespaceObject.observer)((props)=>{
+    const { targetKey, navigate, setItems, items } = props;
+    const [activeTab, setActiveId] = (0, external_react_namespaceObject.useState)(null);
+    const onDragEnd = async (props)=>{
+        const { active, over } = props;
+        setTimeout(()=>{
+            setActiveId(null);
+        });
+        if (over && over.id !== active.id) {
+            const newItems = [
+                ...items
+            ];
+            const activeIndex = newItems.findIndex((item)=>item.key === active.id);
+            const overIndex = newItems.findIndex((item)=>item.key === over.id);
+            const item = newItems.splice(activeIndex, 1);
+            newItems.splice(overIndex, 0, ...item);
+            setItems(newItems);
+        }
+    };
+    function onDragStart(event) {
+        var _event_active;
+        setActiveId(null == (_event_active = event.active) ? void 0 : _event_active.data.current);
+    }
+    const mouseSensor = (0, core_namespaceObject.useSensor)(core_namespaceObject.MouseSensor, {
+        activationConstraint: {
+            distance: 10
+        }
+    });
+    const sensors = (0, core_namespaceObject.useSensors)(mouseSensor);
+    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsxs)(core_namespaceObject.DndContext, {
+        sensors: sensors,
+        onDragEnd: onDragEnd,
+        onDragStart: onDragStart,
+        children: [
+            props.children,
+            /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(core_namespaceObject.DragOverlay, {
+                children: activeTab ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("span", {
+                    style: {
+                        whiteSpace: 'nowrap'
+                    },
+                    children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(TabTag, {
+                        item: activeTab,
+                        targetKey: targetKey,
+                        navigate: navigate,
+                        setItems: setItems
+                    })
+                }) : null
+            })
+        ]
+    });
+}, {
+    displayName: 'DndProvider'
+});
+const Draggable = (props)=>{
+    const { attributes, listeners, setNodeRef } = (0, core_namespaceObject.useDraggable)({
+        id: props.id,
+        data: props.data
+    });
+    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("div", {
+        ref: setNodeRef,
+        ...listeners,
+        ...attributes,
+        children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("div", {
+            children: props.children
+        })
+    });
+};
+function Droppable(props) {
+    const { isOver, setNodeRef } = (0, core_namespaceObject.useDroppable)({
+        id: props.id,
+        data: props.data
+    });
+    const style = isOver ? {
+        color: 'green'
+    } : void 0;
+    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("div", {
+        ref: setNodeRef,
+        style: style,
+        children: props.children
+    });
+}
+const TabTitle = (0, schema_namespaceObject.observer)((props)=>{
+    const { item, targetKey, navigate, setItems } = props;
+    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(Droppable, {
+        id: item.key,
+        data: item,
+        children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("div", {
+            children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(Draggable, {
+                id: item.key,
+                data: item,
+                children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(TabTag, {
+                    item: item,
+                    targetKey: targetKey,
+                    navigate: navigate,
+                    setItems: setItems
+                })
+            })
+        })
+    });
+}, {
+    displayName: 'TabTitle'
+});
 exports.TabHeader = __webpack_exports__.TabHeader;
 exports.Tag = __webpack_exports__.Tag;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [

package/lib/collection-manager/interfaces/number.js

@@ -157,6 +157,26 @@ class NumberFieldInterface extends CollectionFieldInterface_js_namespaceObject.C
                     {
                         value: '0.00001',
                         label: '1.00000'
+                    },
+                    {
+                        value: '0.000001',
+                        label: '1.000000'
+                    },
+                    {
+                        value: '0.0000001',
+                        label: '1.0000000'
+                    },
+                    {
+                        value: '0.00000001',
+                        label: '1.00000000'
+                    },
+                    {
+                        value: '0.000000001',
+                        label: '1.000000000'
+                    },
+                    {
+                        value: '0.0000000001',
+                        label: '1.0000000000'
                     }
                 ]
             },

package/lib/collection-manager/interfaces/percent.js

@@ -124,6 +124,26 @@ class PercentFieldInterface extends CollectionFieldInterface_js_namespaceObject.
                     {
                         value: '0.00001',
                         label: '1.00000%'
+                    },
+                    {
+                        value: '0.000001',
+                        label: '1.000000%'
+                    },
+                    {
+                        value: '0.0000001',
+                        label: '1.0000000%'
+                    },
+                    {
+                        value: '0.00000001',
+                        label: '1.00000000%'
+                    },
+                    {
+                        value: '0.000000001',
+                        label: '1.000000000%'
+                    },
+                    {
+                        value: '0.0000000001',
+                        label: '1.0000000000%'
                     }
                 ]
             },

package/lib/schema-component/antd/input-number/ReadPretty.js

@@ -39,7 +39,10 @@ const external_mathjs_namespaceObject = require("mathjs");
 function countDecimalPlaces(value) {
     const number = Number(value);
     if (!Number.isFinite(number)) return 0;
-    const decimalPart = String(number).split('.')[1];
+    const decimalPart = number.toLocaleString('en-US', {
+        useGrouping: false,
+        maximumSignificantDigits: 10
+    }).split('.')[1];
     return decimalPart ? decimalPart.length : 0;
 }
 const separators = {

package/lib/schema-settings/SchemaSettingsNumberFormat.js

@@ -158,6 +158,26 @@ const SchemaSettingsNumberFormat = function(props) {
                         {
                             value: '0.00001',
                             label: '1.00000'
+                        },
+                        {
+                            value: '0.000001',
+                            label: '1.000000'
+                        },
+                        {
+                            value: '0.0000001',
+                            label: '1.0000000'
+                        },
+                        {
+                            value: '0.00000001',
+                            label: '1.00000000'
+                        },
+                        {
+                            value: '0.000000001',
+                            label: '1.000000000'
+                        },
+                        {
+                            value: '0.0000000001',
+                            label: '1.0000000000'
                         }
                     ]
                 },
@@ -183,7 +203,7 @@ const SchemaSettingsNumberFormat = function(props) {
             };
             schema['x-component-props'] = fieldSchema['x-component-props'] || {};
             fieldSchema['x-component-props'] = {
-                ...fieldSchema['x-component-props'] || {},
+                ...fieldSchema['x-component-props'],
                 ...data
             };
             schema['x-component-props'] = fieldSchema['x-component-props'];

package/package.json

@@ -1,6 +1,15 @@
 {
   "name": "@tachybase/client",
-  "version": "1.6.6",
+  "version": "1.6.8-alpha.1",
+  "homepage": "https://github.com/tegojs/tego-standard#readme",
+  "bugs": {
+    "url": "https://github.com/tegojs/tego-standard/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/tegojs/tego-standard",
+    "directory": "packages/client"
+  },
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -21,8 +30,8 @@
     "@floating-ui/react": "0.26.28",
     "@js-preview/excel": "^1.7.14",
     "@lottiefiles/dotlottie-react": "^0.9.3",
-    "@tachybase/schema": "1.6.2",
-    "@tego/client": "1.6.2",
+    "@tachybase/schema": "1.6.3",
+    "@tego/client": "1.6.3",
     "ahooks": "^3.9.0",
     "antd": "5.22.5",
     "antd-style": "3.7.1",