@giteeteam/apps-team-components 1.1.4 → 1.1.6

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

@@ -1 +1,8 @@
-export declare const formatUserOption: (actorData: any) => any;
+import type { ObjectId, User as UserTyped } from '../../../lib/types/models';
+type UserOption = {
+    label: string;
+    value: ObjectId;
+    key: string;
+};
+export declare const formatUserOption: (actorData: UserTyped) => UserOption;
+export {};

package/dist/components/fields/actors/BaseField.js

@@ -1,5 +1,5 @@
 import { userOptionAdapter } from '../../../lib/users';
-export const formatUserOption = actorData => {
+export const formatUserOption = (actorData) => {
     const isUserData = !!(actorData === null || actorData === void 0 ? void 0 : actorData.username) && (actorData === null || actorData === void 0 ? void 0 : actorData.enabled);
     if (isUserData)
         return userOptionAdapter(actorData);

package/dist/components/fields/data-quote/ReadView.js

@@ -17,7 +17,8 @@ const DataQuoteReadView = ({ value, userData }) => {
         }
     }, [dataQuoteList, userData === null || userData === void 0 ? void 0 : userData.display, value, currentDeleteItem]);
     const cellDisplay = (dataList === null || dataList === void 0 ? void 0 : dataList.length) ? (dataList.map((item, index) => (_jsxs("span", { children: [item.label, " ", index === dataList.length - 1 ? '' : '、'] }, item.value)))) : (_jsx(EmptyField, { readonly: true }));
-    return (_jsx("div", { css: css(fieldValueOverlayStyle), children: _jsx(BaseOverflowTooltip, { maxline: 1, children: cellDisplay }) }));
+    const showValue = (dataList === null || dataList === void 0 ? void 0 : dataList.length) ? dataList.map(item => item.label).join('、') : '';
+    return (_jsx("div", { css: css(fieldValueOverlayStyle), children: _jsx(BaseOverflowTooltip, { title: showValue, maxline: 1, children: cellDisplay }) }));
 };
 DataQuoteReadView.displayName = 'DataQuoteReadView';
 export default DataQuoteReadView;

package/dist/components/fields/data-quote/utils.d.ts

@@ -1,3 +1,5 @@
 import { Item } from '../../../lib/types/models';
 import { selectValue as selectValueProps } from '../dropdown/BaseField';
+export declare const DATA_QUOTE_OPTION_FORMAT_REG: RegExp;
+export declare const dataQuoteOptionFormat: (data: Item, display?: string) => selectValueProps;
 export declare const dataQuoteInit: (dates: Item[], value: string[], display?: string) => selectValueProps[];

package/dist/components/fields/data-quote/utils.js

@@ -1,26 +1,30 @@
+export const DATA_QUOTE_OPTION_FORMAT_REG = /{(\S+?)}/g;
+export const dataQuoteOptionFormat = (data, display) => {
+    var _a, _b, _c;
+    if (!data)
+        return undefined;
+    const dataCopy = {
+        ...data,
+        status: (_a = data.status) === null || _a === void 0 ? void 0 : _a.name,
+        itemType: (_b = data.itemType) === null || _b === void 0 ? void 0 : _b.name,
+    };
+    return {
+        label: display
+            ? display.replace(DATA_QUOTE_OPTION_FORMAT_REG, function (itemKey) {
+                const key = itemKey.slice(1, itemKey.length - 1);
+                return dataCopy[key] || (data.values && data.values[key]) || '';
+            })
+            : data.name,
+        value: data.objectId,
+        name: data.name,
+        key: data.key,
+        itemType: data.itemType,
+        icon: (_c = data === null || data === void 0 ? void 0 : data.itemType) === null || _c === void 0 ? void 0 : _c.icon,
+        values: data.values,
+    };
+};
 export const dataQuoteInit = (dates, value, display) => {
-    const regex = /({\S+?})/g;
-    const existedDatas = dates === null || dates === void 0 ? void 0 : dates.filter(data => value === null || value === void 0 ? void 0 : value.includes(data.objectId));
-    const dataInit = existedDatas === null || existedDatas === void 0 ? void 0 : existedDatas.map(existedData => {
-        var _a, _b, _c;
-        const dataCopy = {
-            ...existedData,
-            status: (_a = existedData.status) === null || _a === void 0 ? void 0 : _a.name,
-            itemType: (_b = existedData.itemType) === null || _b === void 0 ? void 0 : _b.name,
-        };
-        const values = existedData.values || {};
-        return {
-            label: display
-                ? display.replace(regex, function (itemKey) {
-                    const key = itemKey.slice(1, itemKey.length - 1);
-                    return dataCopy[key] || values[key] || '';
-                })
-                : existedData.name,
-            value: existedData.objectId,
-            itemType: existedData.itemType,
-            icon: (_c = existedData === null || existedData === void 0 ? void 0 : existedData.itemType) === null || _c === void 0 ? void 0 : _c.icon,
-            values: existedData.values,
-        };
-    });
+    const existedDataList = dates === null || dates === void 0 ? void 0 : dates.filter(data => value === null || value === void 0 ? void 0 : value.includes(data.objectId));
+    const dataInit = existedDataList === null || existedDataList === void 0 ? void 0 : existedDataList.map(existedData => dataQuoteOptionFormat(existedData, display));
     return dataInit;
 };

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

@@ -2,5 +2,6 @@
 export interface selectValue {
     label: React.ReactNode;
     value: string | number;
+    [key: string]: any;
 }
 export declare const handleValue: (value: selectValue | string | number) => string | number;

package/dist/components/fields/status/TransitionPanel.js

@@ -31,9 +31,13 @@ const TransitionPanel = ({ itemId, itemType, workspace, objectId, onTransitionSu
     const [fetching, setFetching] = useState(true);
     const [approval, setApproval] = useState(cloneDeep(DEFAULT_APPROVAL_DATA));
     const [checkIn, setCheckIn] = useState(cloneDeep(DEFAULT_CHECK_IN_DATA));
+    const newItem = useRef(itemId);
     useEffect(() => {
         setStatusId(objectId);
-    }, [objectId]);
+        return () => {
+            newItem.current = itemId;
+        };
+    }, [itemId, objectId]);
     const { checkTransitionScript, getWorkflowData, getItemStatus, runTransition } = useWorkflowConfig();
     const { currentUser } = useCurrentUser();
     const [groupIds, roleIds, workspaceRoleIds] = useWorkflowPermission((_a = itemData === null || itemData === void 0 ? void 0 : itemData.workspace) === null || _a === void 0 ? void 0 : _a.objectId);
@@ -95,14 +99,17 @@ const TransitionPanel = ({ itemId, itemType, workspace, objectId, onTransitionSu
         logger('updateWorkflowMessage', statusId);
         updateWorkflowMessage(workflowData, statusId);
     }, [statusId]);
-    const refreshItem = (status) => {
+    const refreshItem = useCallback((status) => {
+        if (newItem.current !== itemId) {
+            return;
+        }
         setStatusId(status.objectId);
         onTransitionSuccess === null || onTransitionSuccess === void 0 ? void 0 : onTransitionSuccess(status);
         itemMutate();
         proximaSdk.execute('updateStatusLog');
         proximaSdk.execute('updateApprovalInfo', status.objectId);
         proximaSdk.execute('updateCheckInInfo', status.objectId);
-    };
+    }, [itemId, itemMutate, onTransitionSuccess]);
     const submitHandle = useCallback(async (transitionText, itemDetail = null) => {
         const params = {
             workflowId: workflowData.objectId,

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

@@ -14,7 +14,7 @@ const UserReadView = memo(({ value, readonly }) => {
         })) || EMPTY_ARRAY);
     }, [value]);
     const tooltipValues = useMemo(() => {
-        return value === null || value === void 0 ? void 0 : value.map((val) => {
+        return value === null || value === void 0 ? void 0 : value.map(val => {
             const item = userDataFormat(val);
             return generateUserDisplayName(item);
         });
@@ -22,7 +22,7 @@ const UserReadView = memo(({ value, readonly }) => {
     if (!displayValues.length) {
         return _jsx(EmptyField, { readonly: readonly, isUser: true });
     }
-    return _jsx(BaseOverflowTooltip, { title: tooltipValues.join(','), maxline: 1, children: displayValues });
+    return (_jsx(BaseOverflowTooltip, { title: tooltipValues.join(','), maxline: 1, children: displayValues }));
 });
 UserReadView.displayName = 'UserReadView';
 export default UserReadView;

package/dist/lib/array.d.ts

@@ -6,5 +6,5 @@ export declare const arrayDiff: (origin: Array<any>, target: Array<any>) => IDif
 export declare const serializationArrayByKey: (list: any[], keyPath: string) => Record<string, any> | null;
 export declare const createHash: () => number;
 export declare function parseArray(str: string): string[];
-export declare const getArrayValue: (value: any) => any[];
+export declare const getArrayValue: <T = any>(value: T) => T[];
 export {};

package/dist/lib/array.js

@@ -41,4 +41,4 @@ export function parseArray(str) {
     }
     return [];
 }
-export const getArrayValue = (value) => { var _a; return (_a = (isArray(value) ? value : [value])) === null || _a === void 0 ? void 0 : _a.filter(Boolean); };
+export const getArrayValue = (value) => { var _a; return (_a = ((isArray(value) ? value : [value]))) === null || _a === void 0 ? void 0 : _a.filter(Boolean); };

package/dist/lib/hooks/useI18n.d.ts

@@ -1,4 +1,3 @@
-declare const useI18n: () => {
-    t: (key: string, opts?: Record<string, any>) => string;
-};
+import { i18n } from '../i18n';
+declare const useI18n: () => Pick<typeof i18n, 't'>;
 export default useI18n;

package/package.json

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