@giteeteam/apps-team-components 1.0.32 → 1.0.34

package/dist/components/fields/tree/BaseField.d.ts

@@ -9,5 +9,6 @@ export type BaseTreeProps = TreeSelectProps<any> & FieldProps & {
     value?: string;
     options?: selectValue[];
     onChange?: (e: any) => void;
+    showParentPath?: boolean;
 };
 export {};

package/dist/components/fields/tree/ReadView.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import type { BaseTreeProps } from './BaseField';
-declare const TreeReadView: React.FC<Pick<BaseTreeProps, 'value' | 'options' | 'multiple' | 'readonly'>>;
+declare const TreeReadView: React.FC<BaseTreeProps>;
 export default TreeReadView;

package/dist/components/fields/tree/ReadView.js

@@ -3,34 +3,36 @@ import { memo, useEffect, useMemo, useState } from 'react';
 import { cloneDeep } from 'lodash-es';
 import EmptyField from '../../common/EmptyField';
 import BaseOverflowTooltip from '../../common/overflow-tooltip/BaseOverflowTooltip';
-import { toTree } from './utils';
-const TreeReadView = memo(({ value: propsValue, options: propsOptions, multiple, readonly }) => {
+import { toFlatten, toTree } from './utils';
+const TreeReadView = memo(({ value: propsValue, options: originalOptions, multiple, readonly, showParentPath }) => {
     const [value, setValue] = useState(null);
-    const options = useMemo(() => {
-        return propsOptions ? toTree(cloneDeep(propsOptions)) : [];
-    }, [propsOptions]);
+    const { options, optionList } = useMemo(() => {
+        const options = originalOptions ? toTree(cloneDeep(originalOptions), showParentPath) : [];
+        const optionList = toFlatten(options);
+        return { options, optionList };
+    }, [originalOptions, showParentPath]);
     useEffect(() => {
         if (options.length) {
             const val = Array.isArray(propsValue) ? propsValue : [];
-            const filterValue = val.filter(v => propsOptions.find(item => item.value === v));
+            const filterValue = val.filter(v => optionList.find(item => item.value === v));
             setValue(multiple ? filterValue : filterValue[0]);
         }
         else {
             setValue(undefined);
         }
-    }, [propsOptions, propsValue, setValue, options, multiple]);
+    }, [optionList, propsValue, setValue, options, multiple]);
     const showValue = useMemo(() => {
         let showValue = null;
         if (multiple) {
-            if (Array.isArray(propsOptions) && propsOptions.length >= 1 && value && Array.isArray(value)) {
+            if (Array.isArray(optionList) && optionList.length >= 1 && value && Array.isArray(value)) {
                 showValue = value.reduce((showValue, val) => {
-                    const opt = propsOptions.filter(item => item.value === val);
+                    const opt = optionList.filter(item => item.value === val);
                     if (opt.length) {
                         if (showValue) {
-                            return showValue + ',' + opt[0].title;
+                            return showValue + ',' + opt[0].fullTitle;
                         }
                         else {
-                            return showValue + opt[0].title;
+                            return showValue + opt[0].fullTitle;
                         }
                     }
                     return '';
@@ -38,15 +40,15 @@ const TreeReadView = memo(({ value: propsValue, options: propsOptions, multiple,
             }
         }
         else {
-            if (Array.isArray(propsOptions) && propsOptions.length >= 1 && value) {
-                const opt = propsOptions.filter(item => item.value === value);
+            if (Array.isArray(optionList) && optionList.length >= 1 && value) {
+                const opt = optionList.filter(item => item.value === value);
                 if (opt.length >= 1) {
-                    showValue = opt[0].title;
+                    showValue = opt[0].fullTitle;
                 }
             }
         }
         return showValue;
-    }, [value, multiple, propsOptions]);
+    }, [value, multiple, optionList]);
     if (!showValue) {
         return _jsx(EmptyField, { readonly: readonly });
     }

package/dist/components/fields/tree/types.d.ts

@@ -0,0 +1,9 @@
+export interface SelectValue {
+    id: string;
+    label: string;
+    value: string | number;
+    title?: string;
+    fullTitle?: string;
+    children?: SelectValue[];
+    parentId?: string;
+}

package/dist/components/fields/tree/types.js

@@ -0,0 +1 @@
+export {};

package/dist/components/fields/tree/utils.d.ts

@@ -1,2 +1,3 @@
-export declare const toTree: (data: any[]) => any[];
-export declare const toflatten: (data: any[]) => any[];
+import { SelectValue } from './types';
+export declare const toTree: (data: SelectValue[], showParentPath?: boolean) => SelectValue[];
+export declare const toFlatten: (data: SelectValue[]) => SelectValue[];

package/dist/components/fields/tree/utils.js

@@ -1,4 +1,22 @@
-export const toTree = (data) => {
+const titleDelimiter = '/';
+const addFullTitle = (showParentPath, tree, parentTitle) => {
+    if (!tree)
+        return;
+    for (const item of tree) {
+        if (showParentPath) {
+            let suffix = '';
+            if (parentTitle) {
+                suffix = `${parentTitle}${titleDelimiter}`;
+            }
+            item.fullTitle = `${suffix}${item.title}`;
+        }
+        else {
+            item.fullTitle = item.title;
+        }
+        addFullTitle(showParentPath, item.children, item.fullTitle);
+    }
+};
+export const toTree = (data, showParentPath = false) => {
     const temp = {};
     const tree = [];
     for (const i in data) {
@@ -15,8 +33,9 @@ export const toTree = (data) => {
             tree.push(temp[i]);
         }
     }
+    addFullTitle(showParentPath, tree);
     return tree;
 };
-export const toflatten = (data) => {
-    return data.reduce((arr, { id, title, parentId, value, label, children = [] }) => arr.concat([{ id, title, parentId, value, label }], toflatten(children)), []);
+export const toFlatten = (data) => {
+    return data.reduce((arr, { id, title, parentId, value, label, fullTitle, children = [] }) => arr.concat([{ id, title, parentId, value, label, fullTitle }], toFlatten(children)), []);
 };

package/dist/components/fields/user/ReadView.js

@@ -13,10 +13,16 @@ const UserReadView = memo(({ value, readonly }) => {
             return (_jsxs("span", { children: [i ? ',' : '', _jsx(ClassNames, { children: ({ cx, css }) => (_jsx("span", { className: cx({ [css(userDeletedStyle)]: isUserDeleted(item) }, { [css(userDisabledStyle)]: isUserDisabled(item) }), children: generateUserDisplayName(item) })) })] }, i));
         })) || EMPTY_ARRAY);
     }, [value]);
+    const tooltipValues = useMemo(() => {
+        return value === null || value === void 0 ? void 0 : value.map((val) => {
+            const item = userDataFormat(val);
+            return generateUserDisplayName(item);
+        });
+    }, [value]);
     if (!displayValues.length) {
         return _jsx(EmptyField, { readonly: readonly, isUser: true });
     }
-    return _jsx(BaseOverflowTooltip, { title: displayValues, maxline: 1, children: displayValues });
+    return _jsx(BaseOverflowTooltip, { title: tooltipValues.join(','), maxline: 1, children: displayValues });
 });
 UserReadView.displayName = 'UserReadView';
 export default UserReadView;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@giteeteam/apps-team-components",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "description": "Gitee team components",
   "main": "./dist/index.js",
   "module": "./dist/index.js",