crud-page-react 0.3.0 → 0.3.2

package/dist/index.esm.js

@@ -759,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(() => {
@@ -1255,8 +1254,10 @@ const CrudPage = ({ schema, initialData = [], apiRequest: customApiRequest, loca
             }
             const updateApiConfig = schema.api.update;
             try {
+                // 使用原始记录数据进行模板变量替换（来自detail或列表数据）
+                const templateData = modalState.record || {};
                 // 构建 URL，动态替换占位符
-                let url = buildUrl(updateApiConfig.url, values);
+                let url = buildUrl(updateApiConfig.url, templateData);
                 // 构建请求选项
                 const options = {
                     method: updateApiConfig.method || 'PUT',
@@ -1265,7 +1266,8 @@ const CrudPage = ({ schema, initialData = [], apiRequest: customApiRequest, loca
                 // 处理请求体数据
                 let requestData = Object.assign({}, values);
                 if (updateApiConfig.data) {
-                    const processedData = processTemplateData(updateApiConfig.data, values);
+                    // 使用原始记录数据处理模板变量，而不是表单值
+                    const processedData = processTemplateData(updateApiConfig.data, templateData);
                     requestData = Object.assign(Object.assign(Object.assign({}, requestData), processedData), { timestamp: new Date().toISOString() });
                 }
                 options.body = JSON.stringify(requestData);
@@ -1280,7 +1282,7 @@ const CrudPage = ({ schema, initialData = [], apiRequest: customApiRequest, loca
             }
         }
     }, [
-        request, modalState.mode, schema.api, fetchList, messageApi,
+        request, modalState.mode, modalState.record, schema.api, fetchList, messageApi,
     ]);
     return (jsx(ConfigProvider, { locale: locale, children: jsxs("div", { style: { padding: 24, background: '#f5f6fa', minHeight: '100vh' }, children: [contextHolder, jsxs("div", { style: { display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 16 }, children: [jsx(Title, { level: 4, style: { margin: 0 }, children: schema.title }), schema.api.create && (jsx(Button, { type: "primary", icon: jsx(PlusOutlined, {}), onClick: () => setModalState({ open: true, mode: 'create', record: undefined }), children: schema.createButtonLabel || '新增' }))] }), jsx(DynamicFilter, { schema: schema, onSearch: handleSearch, onReset: () => handleSearch({}) }), jsx(DynamicTable, { schema: schema, data: data, loading: loading, pagination: {
                         current: page,