@lingxiteam/ebe-utils 0.5.10 → 0.6.1

package/lib/pcpublic/src/components/pcfactory/src/utils/renderReadOnly.tsx

@@ -26,9 +26,9 @@ export const renderDatePicker = (str: string | string[], separator: any) => {
 
 // 通用 单选 多选 级联 label提取
 export const renderCommonList = (value: any, options: any[], fieldName: {
-    labelKey: string;
-    valueKey: string;
-    childrenKey: string;
+  labelKey: string;
+  valueKey: string;
+  childrenKey: string;
 } = {
   labelKey: 'label',
   valueKey: 'value',
@@ -39,34 +39,43 @@ export const renderCommonList = (value: any, options: any[], fieldName: {
     const row = list?.find?.(o => o[valueKey] === val);
     return row ? row[labelKey] : '';
   };
-  const loopValue = (list: any[], val: any[], split: string = '，', isCascade: boolean = false) => {
-    let lastList = list || [];
-    const res: any[] = val?.map((curVal, idx) => {
-      if (Array.isArray(curVal)) {
-        // TODO list获取有问题
-        return loopValue(cloneDeep(lastList), curVal, '/', true);
-      }
-      const resStr = getLabelName(cloneDeep(lastList), curVal);
-      // 级联需要把当前的list替换成children
-      if (isCascade) {
-        const currentRow = lastList.find(o => o[valueKey] === curVal);
-        if (currentRow?.[childrenKey]) {
-          lastList = currentRow?.[childrenKey] || [];
-        }
+
+  // 处理级联选择器的单个路径值
+  const processCascadePath = (list: any[], pathValues: any[]) => {
+    let currentList = list || [];
+    const labels: string[] = [];
+  
+    pathValues.forEach((currentValue) => {
+      const currentRow = currentList.find(o => o[valueKey] === currentValue);
+    
+      if (currentRow) {
+        labels.push(currentRow[labelKey] || '');
+        // 更新当前列表为下一级的children
+        currentList = currentRow[childrenKey] || [];
+      } else {
+        labels.push('');
       }
-      return resStr;
-    }) || [];
-    return res.join(split);
+    });
+  
+    return labels.filter(label => label).join(' / ');
   };
+
   let label: string = '';
   if (!Array.isArray(value)) {
     label = getLabelName(options, value);
   } else {
-    label = loopValue(options, value);
+  // 检查是否是级联选择器的值格式
+    const isCascadeValue = value.length > 0 && Array.isArray(value[0]);
+    if (isCascadeValue) {
+    // 多选级联：每个元素都是一个路径数组
+      label = value.map(path => processCascadePath(options, path)).join('，');
+    } else {
+    // 单选级联：整个value就是一个路径数组
+      label = processCascadePath(options, value);
+    }
   }
   return renderReadOnly(label || '--');
 };
-
 export const flattenTreeData = (treeList: any[], childrenName: string = 'children'): any[] => {
   const res: any[] = [];
   const cpList = cloneDeep(treeList);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/ebe-utils",
-  "version": "0.5.10",
+  "version": "0.6.1",
   "description": "",
   "keywords": [],
   "author": "",
@@ -19,7 +19,7 @@
     "@babel/types": "^7.12.12",
     "cac": "^6.7.14",
     "fs-extra": "9.x",
-    "@lingxiteam/ebe": "0.5.10"
+    "@lingxiteam/ebe": "0.6.1"
   },
   "publishConfig": {
     "access": "public"

package/es/node/babel/getAllImportFiles.d.ts

@@ -1 +0,0 @@
-export declare const getAllImportFiles: (cwd: string, target: string, allImportFiles?: any) => any;

package/es/node/babel/getRealPath.d.ts

@@ -1,5 +0,0 @@
-export declare const FILE_EXT_NAMES: string[];
-export declare const LESS_EXT_NAMES: string[];
-export declare const isJsFile: (file: string) => boolean;
-export declare const isLessFile: (file: string) => boolean;
-export declare function getRealPath(target: string): string;

package/es/node/babel/parse.d.ts

@@ -1,6 +0,0 @@
-import type { ParserPlugin } from '@babel/parser';
-import * as t from '@babel/types';
-export declare function parse(code: string, opts?: {
-    excludePlugins?: ParserPlugin[];
-    includePlugins?: ParserPlugin[];
-}): t.File;

package/es/node/cli.d.ts

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

package/es/node/constants.d.ts

@@ -1 +0,0 @@
-export declare const VERSION: string;

package/es/node/copyStatic.d.ts

@@ -1,6 +0,0 @@
-/**
- * 将 target 中所有的文件，按照原有的文件夹结构拷贝到 output 目录下，如果不存在对应文件夹则新建，如果存在对应文件则覆盖
- * @param {*} target 拷贝目录
- * @param {*} output 目标路径
- */
-export declare const copyStatic: (target: string, output: string) => void;

package/es/node/ic.d.ts

@@ -1,5 +0,0 @@
-export interface ICConfig {
-    target: string;
-    outDir: string;
-}
-export declare function ic(icConfig: ICConfig): Promise<any>;

package/es/node/move.d.ts

@@ -1,7 +0,0 @@
-export interface MoveConfig {
-    target: string;
-    outDir: string;
-    cwd?: string;
-    plugin?: any;
-}
-export declare function move(moveConfig: MoveConfig): Promise<any>;

package/es/node/setup.d.ts

@@ -1,4 +0,0 @@
-export interface SetupConfig {
-    cwd?: string;
-}
-export declare function setup({ cwd }: SetupConfig): Promise<any>;

package/es/renameComponents.d.ts

@@ -1 +0,0 @@
-export declare function renameComponents(data: any): string;

package/es/requestQueue.d.ts

@@ -1,9 +0,0 @@
-declare class RequestQueue {
-    private maxConcurrent;
-    private pendingRequests;
-    private activeRequests;
-    constructor(maxConcurrent?: number);
-    next(): void;
-    sendRequest(request: any): Promise<unknown>;
-}
-export default RequestQueue;

package/es/types.d.ts

@@ -1,14 +0,0 @@
-export interface IRulesType {
-    [key: string]: IRule;
-}
-export interface IRulePrams {
-    paths: string[];
-    value: any;
-    key: string;
-    diffraction?: (data: any) => any;
-}
-export interface IRule {
-    rule?: (props: IRulePrams) => any;
-    loopRule?: (item: any) => string;
-    loop?: IRulesType;
-}

package/lib/node/babel/getAllImportFiles.d.ts

@@ -1 +0,0 @@
-export declare const getAllImportFiles: (cwd: string, target: string, allImportFiles?: any) => any;

package/lib/node/babel/getRealPath.d.ts

@@ -1,5 +0,0 @@
-export declare const FILE_EXT_NAMES: string[];
-export declare const LESS_EXT_NAMES: string[];
-export declare const isJsFile: (file: string) => boolean;
-export declare const isLessFile: (file: string) => boolean;
-export declare function getRealPath(target: string): string;

package/lib/node/babel/parse.d.ts

@@ -1,6 +0,0 @@
-import type { ParserPlugin } from '@babel/parser';
-import * as t from '@babel/types';
-export declare function parse(code: string, opts?: {
-    excludePlugins?: ParserPlugin[];
-    includePlugins?: ParserPlugin[];
-}): t.File;

package/lib/node/cli.d.ts

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

package/lib/node/constants.d.ts

@@ -1 +0,0 @@
-export declare const VERSION: string;

package/lib/node/copyStatic.d.ts

@@ -1,6 +0,0 @@
-/**
- * 将 target 中所有的文件，按照原有的文件夹结构拷贝到 output 目录下，如果不存在对应文件夹则新建，如果存在对应文件则覆盖
- * @param {*} target 拷贝目录
- * @param {*} output 目标路径
- */
-export declare const copyStatic: (target: string, output: string) => void;

package/lib/node/ic.d.ts

@@ -1,5 +0,0 @@
-export interface ICConfig {
-    target: string;
-    outDir: string;
-}
-export declare function ic(icConfig: ICConfig): Promise<any>;

package/lib/node/move.d.ts

@@ -1,7 +0,0 @@
-export interface MoveConfig {
-    target: string;
-    outDir: string;
-    cwd?: string;
-    plugin?: any;
-}
-export declare function move(moveConfig: MoveConfig): Promise<any>;

package/lib/node/setup.d.ts

@@ -1,4 +0,0 @@
-export interface SetupConfig {
-    cwd?: string;
-}
-export declare function setup({ cwd }: SetupConfig): Promise<any>;