aio-entitykit 2.0.0 → 2.0.2

package/d1.css

@@ -464,7 +464,7 @@
 }
 
 .d1 .ai-indent-line {
-    stroke: var(--d1-border-light);
+    color: var(--d1-border-light);
 }
 
 
@@ -911,4 +911,4 @@
     text-align: center;
     border:1px solid var(--d1-border-medium);
     padding:0;
-}
+}

package/index.d.ts

@@ -1,7 +1,7 @@
 import { type FC, type ReactNode } from "react";
-import { type I_table } from './../aio-table';
-import type { AIOCordova } from './../aio-cordova';
-import { useEntity } from './../aio-entity';
+import { type I_table } from 'aio-table';
+import type { AIOCordova } from 'aio-cordova';
+import { useEntity } from 'aio-entity';
 import './index.css';
 type I_option = {
     text: string;

package/index.js

@@ -25,20 +25,20 @@ export const EntityTable = (props) => {
     const DATE = new AIODate();
     const { table, moveTo, entity, popup, archive, filteredData } = props;
     const [showArchive, setShowArchive] = useState(false);
-    const { getId, data } = entity;
+    const { data } = entity;
     const [selected, setSelected] = useState({});
     const select = (row) => {
         if (!props.getSelectedOptions) {
             return;
         }
-        const rowId = entity.getId(row);
+        const rowId = entity.id.get(row);
         const keys = Object.keys(selected);
         const firstSelected = keys.length ? selected[keys[0]] : undefined;
         if (firstSelected) {
-            const firstSelectedParent = entity.getParentByRowId({ rowId: entity.getId(firstSelected), rows: entity.data });
-            const firstSelectedParentId = firstSelectedParent ? entity.getId(firstSelectedParent) : undefined;
-            const rowParent = entity.getParentByRowId({ rowId: entity.getId(row), rows: entity.data });
-            const rowParentId = rowParent ? entity.getId(rowParent) : undefined;
+            const firstSelectedParent = entity.getParentByRowId(entity.data, entity.id.get(firstSelected));
+            const firstSelectedParentId = firstSelectedParent ? entity.id.get(firstSelectedParent) : undefined;
+            const rowParent = entity.getParentByRowId(entity.data, entity.id.get(row));
+            const rowParentId = rowParent ? entity.id.get(rowParent) : undefined;
             if (firstSelectedParentId !== rowParentId) {
                 setSelected({ [rowId]: row });
                 return;
@@ -60,7 +60,7 @@ export const EntityTable = (props) => {
         }
     };
     const canMoveTo = (row) => {
-        const rowId = entity.getId(row);
+        const rowId = entity.id.get(row);
         if (selected[rowId.toString()]) {
             return false;
         }
@@ -112,19 +112,19 @@ export const EntityTable = (props) => {
                 show: canMoveTo(row), text: 'انتقال به اینجا', onClick: () => __awaiter(void 0, void 0, void 0, function* () {
                     const keys = Object.keys(selected);
                     const toRow = row;
-                    const toId = getId(toRow);
+                    const toId = entity.id.get(toRow);
                     if (!moveTo || !keys.length) {
                         return;
                     }
-                    const { parents } = entity.getRowAndParentsById({ rowId: toId });
+                    const { parents } = entity.getRowAndParentsById(toId);
                     for (let i = 0; i < parents.length; i++) {
-                        const id = getId(parents[i]).toString();
+                        const id = entity.id.get(parents[i]).toString();
                         if (selected[id]) {
                             return;
                         }
                     }
                     const rows = keys.map((key) => selected[key]).filter((fromRow) => !!moveTo(fromRow, toRow));
-                    const fromIds = rows.map((o) => getId(o));
+                    const fromIds = rows.map((o) => entity.id.get(o));
                     yield entity.moveTo(fromIds, toId);
                     setSelected({});
                 })
@@ -135,7 +135,7 @@ export const EntityTable = (props) => {
             { show: !!archive && !!row.archive, text: 'خروج از آرشیو', onClick: () => { if (!!archive) {
                     entity.edit(Object.assign(Object.assign({}, row), { archive: false }));
                 } } },
-            { text: 'حذف', onClick: () => entity.remove(getId(row)) }
+            { text: 'حذف', onClick: () => entity.remove(entity.id.get(row)) }
         ];
     };
     const side = useSide({
@@ -161,7 +161,7 @@ const Selected = () => {
         if (!getSelectedOptions || !keys.length) {
             return [];
         }
-        const parent = keys.length ? entity.getParentByRowId({ rowId: entity.getId(selected[keys[0]]), rows: entity.data }) : undefined;
+        const parent = keys.length ? entity.getParentByRowId(entity.data, entity.id.get(selected[keys[0]])) : undefined;
         const list = [];
         for (let prop in selected) {
             list.push(selected[prop]);
@@ -192,27 +192,38 @@ const TableToolbar = () => {
 };
 export const Card = ({ row }) => {
     const { rootProps, getOptions, entity, showArchive, select, selected } = useProvider();
-    const rowId = entity.getId(row);
+    const rowId = entity.id.get(row);
     const isSelected = selected[rowId];
     const { getCardContent, getCardTitle } = rootProps;
     const [open, setOpen] = useState(false);
-    const childs = entity.getChilds(row);
-    return (_jsxs("div", { className: "entity-card", children: [_jsxs("div", { className: "entity-card-header", children: [_jsx("div", { className: "entity-card-toggle-icon", onClick: () => setOpen(!open), children: new GetSvg().getIcon(open ? 'mdiChevronDown' : 'mdiChevronLeft', .8) }), _jsxs("div", { className: "entity-card-title", style: { flex: 1, color: isSelected ? 'orange' : undefined }, onClick: () => select(row), children: [!!isSelected && _jsx(Icon, { path: mdiCheckboxMarked, size: 0.8, color: 'orange' }), getCardTitle(row)] }), !!getOptions && _jsx(CardOptions, { row: row, parent: false, isRoot: true })] }), getCardContent(row, false, 'root'), !!childs && !!open &&
-                _jsx(AITree, { rtl: true, autoHeight: true, indent: 24, value: childs, option: {
-                        childs: (o) => entity.getChilds(o),
-                        text: (row, { parentOptions }) => {
-                            const rowId = entity.getId(row);
-                            const isSelected = selected[rowId];
-                            const childs = entity.getChilds(row);
-                            const parentOption = parentOptions.length ? parentOptions[parentOptions.length - 1] : undefined;
-                            const parent = parentOption ? parentOption.optionOrg : false;
-                            return (_jsxs("div", { className: classListToString(["entity-row", isSelected ? 'selected' : undefined]), children: [_jsxs("div", { className: "entity-row-header", children: [!!isSelected && _jsx(Icon, { path: mdiCheckboxMarked, size: 0.8, color: 'orange' }), _jsx("div", { className: 'entity-row-title', style: { color: isSelected ? 'orange' : undefined }, onClick: () => select(row), children: getCardTitle(row) }), !!getOptions && _jsx(CardOptions, { row: row, parent: parent })] }), getCardContent(row, parent, childs ? 'node' : 'leaf')] }));
-                        },
-                        value: (o) => entity.getId(o),
-                        show: (o) => showArchive ? true : !o.archive,
-                        className: () => `${'d1-bg-dark-gray'} !rounded-md`,
-                        style: () => ({ borderBottom: '2px dashed #333' })
-                    } })] }));
+    //const tree = useMemo(() => {return <CardTree<T> row={row as any} open={open} />}, [row, selected, open])
+    return (_jsxs("div", { className: "entity-card", children: [_jsxs("div", { className: "entity-card-header", children: [_jsx("div", { className: "entity-card-toggle-icon", onClick: () => setOpen(!open), children: new GetSvg().getIcon(open ? 'mdiChevronDown' : 'mdiChevronLeft', .8) }), _jsxs("div", { className: "entity-card-title", style: { flex: 1, color: isSelected ? 'orange' : undefined }, onClick: () => select(row), children: [!!isSelected && _jsx(Icon, { path: mdiCheckboxMarked, size: 0.8, color: 'orange' }), getCardTitle(row)] }), !!getOptions && _jsx(CardOptions, { row: row, parent: false, isRoot: true })] }), getCardContent(row, false, 'root'), _jsx(CardTree, { row: row, open: open })] }));
+};
+const CardTree = ({ row, open }) => {
+    const { entity, showArchive } = useProvider();
+    const childs = entity.childs.get(row);
+    if (!childs || !childs.length || !open) {
+        return null;
+    }
+    return (_jsx(AITree, { rtl: true, autoHeight: true, indent: 24, value: childs, option: {
+            childs: (o) => entity.childs.get(o),
+            text: (row, { parentOptions }) => _jsx(CardTreeRow, { row: row, parentOptions: parentOptions }),
+            value: (o) => entity.id.get(o),
+            show: (o) => showArchive ? true : !o.archive,
+            className: () => `${'d1-bg-dark-gray'} !rounded-md`,
+            style: () => ({ borderBottom: '2px dashed #333' })
+        } }));
+};
+const CardTreeRow = ({ row, parentOptions }) => {
+    const { rootProps, getOptions, entity, select, selected } = useProvider();
+    const { getCardContent, getCardTitle } = rootProps;
+    const rowId = entity.id.get(row);
+    const isSelected = selected[rowId];
+    const childs = entity.childs.get(row);
+    const parentOption = parentOptions.length ? parentOptions[parentOptions.length - 1] : undefined;
+    const parent = parentOption ? parentOption.optionOrg : false;
+    console.log('tree row');
+    return (_jsxs("div", { className: classListToString(["entity-row", isSelected ? 'selected' : undefined]), children: [_jsxs("div", { className: "entity-row-header", children: [!!isSelected && _jsx(Icon, { path: mdiCheckboxMarked, size: 0.8, color: 'orange' }), _jsx("div", { className: 'entity-row-title', style: { color: isSelected ? 'orange' : undefined }, onClick: () => select(row), children: getCardTitle(row) }), !!getOptions && _jsx(CardOptions, { row: row, parent: parent })] }), getCardContent(row, parent, childs ? 'node' : 'leaf')] }));
 };
 const CardOptions = ({ row, parent, isRoot }) => {
     const { getOptions } = useProvider();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "aio-entitykit",
-    "version": "2.0.0",
+    "version": "2.0.2",
     "description": "kit",
     "main": "index.js",
     "scripts": {