Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -41,10 +41,6 @@ export interface ScreenInspectionContentProps {
|
||||
workItems?: WorkItemData[];
|
||||
inspectionDataMap?: InspectionDataMap;
|
||||
inspectionSetting?: InspectionSetting;
|
||||
/** @deprecated inspectionSetting.schematicImage 사용 */
|
||||
schematicImage?: string;
|
||||
/** @deprecated inspectionSetting.inspectionStandardImage 사용 */
|
||||
inspectionStandardImage?: string;
|
||||
}
|
||||
|
||||
interface InspectionRow {
|
||||
@@ -87,9 +83,8 @@ export const ScreenInspectionContent = forwardRef<InspectionContentRef, ScreenIn
|
||||
workItems,
|
||||
inspectionDataMap,
|
||||
inspectionSetting,
|
||||
schematicImage: schematicImageProp,
|
||||
}, ref) {
|
||||
const schematicImage = inspectionSetting?.schematicImage || schematicImageProp;
|
||||
const schematicImage = inspectionSetting?.schematicImage;
|
||||
const fullDate = getFullDate();
|
||||
const today = getToday();
|
||||
const { documentNo, primaryAssignee } = getOrderInfo(order);
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
*/
|
||||
|
||||
import { useState, useMemo, useCallback, useEffect } from 'react';
|
||||
import { useMenuStore } from '@/store/menuStore';
|
||||
import { useMenuStore } from '@/stores/menuStore';
|
||||
import { ClipboardList, PlayCircle, CheckCircle2, AlertTriangle, ChevronDown, ChevronUp, List } from 'lucide-react';
|
||||
import { ContentSkeleton } from '@/components/ui/skeleton';
|
||||
import { Card, CardContent } from '@/components/ui/card';
|
||||
|
||||
Reference in New Issue
Block a user