crud-page-react 0.2.2 → 0.3.1

package/dist/index.esm.js

@@ -88,8 +88,10 @@ function shouldShowAction(condition, record) {
     for (const [fieldPath, allowedValues] of Object.entries(condition)) {
         // 支持点分路径获取嵌套值
         const actualValue = getNestedValue(record, fieldPath);
+        // 确保 allowedValues 是数组
+        const valuesArray = Array.isArray(allowedValues) ? allowedValues : [allowedValues];
         // 检查值是否在允许的值列表中
-        if (!allowedValues.includes(actualValue)) {
+        if (!valuesArray.includes(actualValue)) {
             return false;
         }
     }
@@ -757,8 +759,7 @@ function DynamicForm({ schema, mode, visible, initialValues, onSubmit, onCancel,
         view: `查看${entityName}`,
     };
     const formFields = schema.fields.filter((f) => {
-        if (mode === 'view')
-            return f.table !== false && f.table !== undefined;
+        // 查看模式和编辑模式都应该遵循form字段配置
         return f.form !== false && f.form !== undefined;
     });
     useEffect(() => {
@@ -869,7 +870,22 @@ function DynamicForm({ schema, mode, visible, initialValues, onSubmit, onCancel,
 }
 
 const { Title } = Typography;
-/** 处理模板数据，支持 {{fieldName}} 格式的变量替换 */
+/** 动态替换 URL 模板中的占位符，支持 :fieldName 和 {{fieldName}} 两种格式 */
+function buildUrl(template, record) {
+    let result = template;
+    // 替换 :fieldName 格式
+    result = result.replace(/:(\w+)/g, (match, fieldName) => {
+        const value = record[fieldName];
+        return value !== undefined ? String(value) : match;
+    });
+    // 替换 {{fieldName}} 格式
+    result = result.replace(/\{\{(\w+)\}\}/g, (match, fieldName) => {
+        const value = record[fieldName];
+        return value !== undefined ? String(value) : match;
+    });
+    return result;
+}
+/** 处理模板数据，支持 {{fieldName}} 格式的变量替换，支持嵌套对象和数组 */
 function processTemplateData(data, record) {
     const result = {};
     for (const [key, value] of Object.entries(data)) {
@@ -880,6 +896,27 @@ function processTemplateData(data, record) {
                 return fieldValue !== undefined ? String(fieldValue) : match;
             });
         }
+        else if (typeof value === 'object' && value !== null) {
+            if (Array.isArray(value)) {
+                // 处理数组
+                result[key] = value.map(item => {
+                    if (typeof item === 'object' && item !== null) {
+                        return processTemplateData(item, record);
+                    }
+                    else if (typeof item === 'string' && item.includes('{{') && item.includes('}}')) {
+                        return item.replace(/\{\{(\w+)\}\}/g, (match, fieldName) => {
+                            const fieldValue = record[fieldName];
+                            return fieldValue !== undefined ? String(fieldValue) : match;
+                        });
+                    }
+                    return item;
+                });
+            }
+            else {
+                // 处理嵌套对象
+                result[key] = processTemplateData(value, record);
+            }
+        }
         else {
             result[key] = value;
         }
@@ -953,17 +990,32 @@ const CrudPage = ({ schema, initialData = [], apiRequest: customApiRequest, loca
                 method: listApiConfig.method || 'GET',
                 headers: Object.assign({ 'Content-Type': 'application/json' }, listApiConfig.headers)
             };
-            // 如果是 POST 请求，将查询参数放到请求体中
-            let url = listApiConfig.url;
+            // 构建 URL，支持动态占位符替换
+            let url = buildUrl(listApiConfig.url, params);
             if (listApiConfig.method === 'POST') {
                 const queryParams = {};
                 query.forEach((value, key) => {
                     queryParams[key] = value;
                 });
-                const requestData = Object.assign(Object.assign({}, queryParams), listApiConfig.data);
+                // 处理模板数据（如果有的话）
+                let processedApiData = {};
+                if (listApiConfig.data) {
+                    // 对于list API，通常没有特定的record，使用查询参数作为上下文
+                    processedApiData = processTemplateData(listApiConfig.data, queryParams);
+                }
+                const requestData = Object.assign(Object.assign({}, queryParams), processedApiData);
                 options.body = JSON.stringify(requestData);
             }
             else {
+                // 对于GET请求，如果有data配置，将其作为查询参数处理
+                if (listApiConfig.data) {
+                    const processedApiData = processTemplateData(listApiConfig.data, params);
+                    Object.entries(processedApiData).forEach(([key, value]) => {
+                        if (value !== undefined && value !== null && value !== '') {
+                            query.set(key, String(value));
+                        }
+                    });
+                }
                 url = `${url}?${query}`;
             }
             const json = await request(url, options);
@@ -1011,11 +1063,7 @@ const CrudPage = ({ schema, initialData = [], apiRequest: customApiRequest, loca
         const deleteApiConfig = schema.api.delete;
         try {
             // 构建 URL，动态替换占位符
-            let url = deleteApiConfig.url;
-            url = url.replace(/:(\w+)/g, (match, fieldName) => {
-                const value = record[fieldName];
-                return value !== undefined ? String(value) : match;
-            });
+            let url = buildUrl(deleteApiConfig.url, record);
             // 构建请求选项
             const options = {
                 method: deleteApiConfig.method || 'DELETE',
@@ -1037,11 +1085,56 @@ const CrudPage = ({ schema, initialData = [], apiRequest: customApiRequest, loca
     }, [request, schema.api.delete, fetchList, messageApi, rowKey]);
     // ---------- 操作列点击 ----------
     const handleAction = useCallback(async (action, record) => {
-        if (action.type === 'view') {
-            setModalState({ open: true, mode: 'view', record });
-        }
-        else if (action.type === 'edit') {
-            setModalState({ open: true, mode: 'edit', record });
+        var _a, _b;
+        if (action.type === 'view' || action.type === 'edit') {
+            // 如果配置了detail API，先调用获取详细数据
+            if (schema.api.detail) {
+                try {
+                    const detailApiConfig = schema.api.detail;
+                    // 构建 URL，动态替换占位符
+                    let url = buildUrl(detailApiConfig.url, record);
+                    // 构建请求选项
+                    const options = {
+                        method: detailApiConfig.method || 'GET',
+                        headers: Object.assign({ 'Content-Type': 'application/json' }, detailApiConfig.headers)
+                    };
+                    // 处理请求体数据（对于GET请求，通常不需要body，但有些API可能需要）
+                    if (detailApiConfig.data && ['POST', 'PUT', 'PATCH'].includes(detailApiConfig.method || 'GET')) {
+                        const processedData = processTemplateData(detailApiConfig.data, record);
+                        options.body = JSON.stringify(processedData);
+                    }
+                    else if (detailApiConfig.method === 'GET' && detailApiConfig.data) {
+                        // 对于GET请求，将data作为查询参数
+                        const processedData = processTemplateData(detailApiConfig.data, record);
+                        const query = new URLSearchParams();
+                        Object.entries(processedData).forEach(([key, value]) => {
+                            if (value !== undefined && value !== null) {
+                                query.set(key, String(value));
+                            }
+                        });
+                        url = `${url}?${query}`;
+                    }
+                    const response = await request(url, options);
+                    // 提取详细数据
+                    let detailData = record; // 默认使用列表数据
+                    if (response && typeof response === 'object') {
+                        const responseObj = response;
+                        // 尝试从不同的响应结构中提取数据
+                        detailData = ((_b = (_a = responseObj.data) !== null && _a !== void 0 ? _a : responseObj.result) !== null && _b !== void 0 ? _b : responseObj);
+                    }
+                    setModalState({ open: true, mode: action.type, record: detailData });
+                }
+                catch (error) {
+                    console.error('Failed to fetch detail:', error);
+                    messageApi.error('获取详细数据失败，使用列表数据');
+                    // 如果获取详细数据失败，仍然使用列表数据
+                    setModalState({ open: true, mode: action.type, record });
+                }
+            }
+            else {
+                // 没有配置detail API，直接使用列表数据
+                setModalState({ open: true, mode: action.type, record });
+            }
         }
         else if (action.type === 'delete') {
             handleDelete(record);
@@ -1075,11 +1168,7 @@ const CrudPage = ({ schema, initialData = [], apiRequest: customApiRequest, loca
             }
             try {
                 // 构建 URL，动态替换占位符
-                let url = apiConfig.url;
-                url = url.replace(/:(\w+)/g, (match, fieldName) => {
-                    const value = record[fieldName];
-                    return value !== undefined ? String(value) : match;
-                });
+                let url = buildUrl(apiConfig.url, record);
                 // 构建请求选项
                 const options = {
                     method: apiConfig.method || 'GET',
@@ -1146,7 +1235,9 @@ const CrudPage = ({ schema, initialData = [], apiRequest: customApiRequest, loca
                     requestData = Object.assign(Object.assign(Object.assign({}, requestData), processedData), { timestamp: new Date().toISOString() });
                 }
                 options.body = JSON.stringify(requestData);
-                await request(createApiConfig.url, options);
+                // 构建 URL，支持动态占位符替换
+                const url = buildUrl(createApiConfig.url, values);
+                await request(url, options);
                 messageApi.success('新增成功');
                 setModalState({ open: false, mode: 'create' });
                 fetchList();
@@ -1164,11 +1255,7 @@ const CrudPage = ({ schema, initialData = [], apiRequest: customApiRequest, loca
             const updateApiConfig = schema.api.update;
             try {
                 // 构建 URL，动态替换占位符
-                let url = updateApiConfig.url;
-                url = url.replace(/:(\w+)/g, (match, fieldName) => {
-                    const value = values[fieldName];
-                    return value !== undefined ? String(value) : match;
-                });
+                let url = buildUrl(updateApiConfig.url, values);
                 // 构建请求选项
                 const options = {
                     method: updateApiConfig.method || 'PUT',