seeder-st2110-components 1.6.1 → 1.6.2

package/dist/index.js

@@ -1088,16 +1088,13 @@ const NetworkSettingsModal = _ref2 => {
       const allSucceeded = results.every(result => result.status === 'fulfilled');
       if (allSucceeded) {
         handleSuccess();
-      } else {
-        message.error('Some configurations failed to update');
       }
     } catch (error) {
       console.error('Failed to update configurations: ', error);
-      message.error('Failed to update configurations');
     } finally {
       setSubmitLoading(false);
     }
-  }, [form, sections, lanConfigs, st2110Interfaces, updateLanConfig, updateSysConfig, handleSuccess, message]);
+  }, [form, sections, lanConfigs, st2110Interfaces, updateLanConfig, updateSysConfig, handleSuccess]);
 
   // 合并默认模态框属性和传入的属性
   const mergedModalProps = _objectSpread2({
@@ -1409,7 +1406,7 @@ const LeftList = /*#__PURE__*/React.memo(_ref => {
     showDescription = false,
     texts = {
       newButton: "New Preset",
-      removeButton: "Remove"
+      removeButton: "Delete"
     }
   } = _ref;
   // 动态计算列布局
@@ -1420,7 +1417,7 @@ const LeftList = /*#__PURE__*/React.memo(_ref => {
       className: "list-container",
       children: /*#__PURE__*/jsxRuntime.jsx(antd.List, {
         header: /*#__PURE__*/jsxRuntime.jsxs("div", {
-          className: "grid ".concat(gridColumns, " w-full list-header"),
+          className: "grid ".concat(gridColumns, " gap-2 w-full list-header"),
           children: [/*#__PURE__*/jsxRuntime.jsx("div", {
             children: "Name"
           }), /*#__PURE__*/jsxRuntime.jsx("div", {
@@ -1438,14 +1435,27 @@ const LeftList = /*#__PURE__*/React.memo(_ref => {
           },
           onClick: () => onSelectPreset(item),
           children: /*#__PURE__*/jsxRuntime.jsxs("div", {
-            className: "grid ".concat(gridColumns, " w-full text-text-normal"),
+            className: "grid ".concat(gridColumns, " gap-2 w-full text-text-normal"),
             children: [/*#__PURE__*/jsxRuntime.jsx("div", {
-              title: item.name,
-              children: item.name || "Untitled Preset"
+              className: "min-w-0",
+              children: /*#__PURE__*/jsxRuntime.jsx(antd.Typography.Text, {
+                ellipsis: true,
+                title: item.name,
+                children: item.name || "Untitled Preset"
+              })
             }), /*#__PURE__*/jsxRuntime.jsx("div", {
-              children: item.create_time
+              className: "min-w-0",
+              children: /*#__PURE__*/jsxRuntime.jsx(antd.Typography.Text, {
+                ellipsis: true,
+                children: item.create_time
+              })
             }), showDescription && /*#__PURE__*/jsxRuntime.jsx("div", {
-              children: item.description
+              className: "min-w-0",
+              children: /*#__PURE__*/jsxRuntime.jsx(antd.Typography.Text, {
+                ellipsis: true,
+                title: item.description,
+                children: item.description
+              })
             })]
           })
         }),
@@ -1461,7 +1471,7 @@ const LeftList = /*#__PURE__*/React.memo(_ref => {
                   onClick: onAddNew,
                   className: "p-0 h-auto",
                   icon: /*#__PURE__*/jsxRuntime.jsx(icons.PlusOutlined, {}),
-                  children: "Create new preset"
+                  children: "Create New Preset"
                 })
               })
             })
@@ -1477,18 +1487,16 @@ const LeftList = /*#__PURE__*/React.memo(_ref => {
         size: "middle",
         children: [/*#__PURE__*/jsxRuntime.jsx(antd.Button, {
           type: "default",
-          icon: /*#__PURE__*/jsxRuntime.jsx(icons.PlusOutlined, {}),
-          style: {
-            padding: "20px 12px"
-          },
+          icon: /*#__PURE__*/jsxRuntime.jsx(icons.PlusOutlined, {})
+          // style={{ padding: "20px 12px" }}
+          ,
           className: "btn-gray",
           onClick: onAddNew,
           children: texts.newButton
         }), /*#__PURE__*/jsxRuntime.jsx(antd.Button, {
-          type: "default",
-          style: {
-            padding: "20px 12px"
-          },
+          type: "default"
+          // style={{ padding: "20px 12px" }}
+          ,
           className: "btn-gray",
           onClick: onRemove,
           children: texts.removeButton
@@ -1525,8 +1533,8 @@ const RightDetailForm = /*#__PURE__*/React.memo(_ref3 => {
     originalPresetData,
     fields = {
       name: {
-        label: "Preset Name",
-        placeholder: "Enter preset name",
+        label: "Name",
+        placeholder: "Please enter name",
         required: true
       }
     },
@@ -1534,7 +1542,7 @@ const RightDetailForm = /*#__PURE__*/React.memo(_ref3 => {
       loadButton: "Load",
       saveButton: "Save"
     },
-    presetChanged
+    presetChanged // 作用：在切换选中预设时强制触发 Checkbox 的重新初始化
   } = _ref3;
   const [initialSelected, setInitialSelected] = React.useState([]);
   const currentSelected = antd.Form.useWatch('category_list', form) || [];
@@ -1594,32 +1602,40 @@ const RightDetailForm = /*#__PURE__*/React.memo(_ref3 => {
       },
       children: [/*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
         name: "name",
-        label: fields.name.label,
-        rules: [{
-          required: fields.name.required,
-          validator: async (_, value) => {
-            if (!value || value.trim() === '') {
-              return Promise.reject(new Error('Preset name cannot be empty or spaces only'));
-            }
-          }
-        }],
+        label: fields.name.label
+        // rules={[
+        //   { 
+        //     required: fields.name.required,
+        //     validator: async (_, value) => {
+        //       if (!value || value.trim() === '') {
+        //         return Promise.reject(new Error('Preset name cannot be empty or spaces only'));
+        //       }
+        //     }
+        //   }
+        // ]}
+        ,
+        required: true,
         children: /*#__PURE__*/jsxRuntime.jsx(antd.Input, {
           placeholder: fields.name.placeholder,
           disabled: isEditing
         })
       }), hasCategoryList && /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
         name: "category_list",
-        label: fields.category_list.label,
-        rules: [{
-          required: fields.category_list.required,
-          message: 'Please select at least one category',
-          validator: (_, value) => {
-            if (value && value.length > 0) {
-              return Promise.resolve();
-            }
-            return Promise.reject(new Error('Please select at least one category'));
-          }
-        }],
+        label: fields.category_list.label
+        // rules={[
+        //   { 
+        //     required: fields.category_list.required,
+        //     message: 'Please select at least one category',
+        //     validator: (_, value) => {
+        //       if (value && value.length > 0) {
+        //         return Promise.resolve();
+        //       }
+        //       return Promise.reject(new Error('Please select at least one category'));
+        //     }
+        //   }
+        // ]}
+        ,
+        required: true,
         children: /*#__PURE__*/jsxRuntime.jsx(antd.Checkbox.Group, {
           className: "grid grid-cols-2 gap-2",
           onChange: handleCheckboxChange,
@@ -1635,7 +1651,10 @@ const RightDetailForm = /*#__PURE__*/React.memo(_ref3 => {
         children: /*#__PURE__*/jsxRuntime.jsx(antd.Input.TextArea, {
           rows: 4,
           placeholder: fields.description.placeholder,
-          disabled: isEditing
+          disabled: isEditing,
+          style: {
+            resize: 'none'
+          }
         })
       })]
     }), isEditing ? /*#__PURE__*/jsxRuntime.jsx(SubmitButton, _objectSpread2(_objectSpread2({
@@ -1668,20 +1687,20 @@ const Preset = _ref => {
     // 字段配置
     fields = {
       name: {
-        label: "Preset Name",
-        placeholder: "Enter preset name",
+        label: "Name",
+        placeholder: "Please enter name",
         required: true
       }
     },
     texts = {
       title: "Preset Management",
       emptyText: "Select a preset from the list to view details",
-      deleteConfirm: "Are you sure to delete preset",
+      deleteConfirm: "Are you sure you want to delete preset",
       loadConfirm: "Are you sure you want to load preset",
       loadText: "Loading...",
       successText: "Success",
       newButton: "New Preset",
-      removeButton: "Remove",
+      removeButton: "Delete",
       loadButton: "Load",
       saveButton: "Save"
     },
@@ -1699,16 +1718,19 @@ const Preset = _ref => {
   const [loading, setLoading] = React.useState(false);
   const [presetChanged, setPresetChanged] = React.useState(0);
   const [form] = antd.Form.useForm();
-
-  // 获取预设列表
-  React.useEffect(() => {
-    fetchPresetList();
-  }, []);
   const fetchPresetList = React.useCallback(async () => {
     try {
       const data = await getPresetList();
       const presets = (data === null || data === void 0 ? void 0 : data.preset_list) || data || [];
       setPresetList(presets);
+
+      // 自动选中第一个预设
+      if (presets.length > 0) {
+        const firstPreset = presets[0];
+        setSelectedPreset(firstPreset);
+        form.setFieldsValue(firstPreset);
+        setPresetChanged(prev => prev + 1);
+      }
     } catch (error) {
       console.error('Failed to fetch preset list:', error);
     }
@@ -1716,7 +1738,7 @@ const Preset = _ref => {
   const handleSelectPreset = React.useCallback(preset => {
     setSelectedPreset(preset);
     form.setFieldsValue(preset);
-    setPresetChanged(prev => prev + 1); // 触发react更新
+    setPresetChanged(prev => prev + 1);
   }, [form]);
   const handleAddNew = React.useCallback(() => {
     var _fields$category_list;
@@ -1754,18 +1776,44 @@ const Preset = _ref => {
         cancelText: 'No',
         okText: 'Yes',
         onOk: async () => {
+          // 在删除前记录当前选中项的位置
+          const currentIndex = presetList.findIndex(item => isUnsavedPreset ? !item.id : item.id === selectedPreset.id);
           if (!isUnsavedPreset) {
             await removePreset({
               id: selectedPreset.id
             });
             AntdMessage.success(texts.successText);
-            // 刷新列表
-            await fetchPresetList();
           } else {
+            // 移除未保存的预设
             setPresetList(prev => prev.filter(item => !!item.id));
           }
 
-          // 重置表单和选择状态
+          // 获取删除后的列表
+          const updatedList = isUnsavedPreset ? presetList.filter(item => !!item.id) : await getPresetList().then(data => (data === null || data === void 0 ? void 0 : data.preset_list) || data || []);
+
+          // 更新列表
+          setPresetList(updatedList);
+          if (updatedList.length > 0) {
+            // 计算下一个索引
+            let nextIndex = 0;
+            if (currentIndex > 0) {
+              // 如果删除的不是最后一项
+              if (currentIndex < updatedList.length) {
+                nextIndex = currentIndex; // 保持相同位置
+              } else {
+                nextIndex = updatedList.length - 1; // 选最后一个
+              }
+            }
+            const nextPreset = updatedList[nextIndex];
+            if (nextPreset) {
+              setSelectedPreset(nextPreset);
+              form.setFieldsValue(nextPreset);
+              setPresetChanged(prev => prev + 1);
+              return;
+            }
+          }
+
+          // 列表为空
           setSelectedPreset(null);
           form.resetFields();
         }
@@ -1773,7 +1821,7 @@ const Preset = _ref => {
     } catch (error) {
       console.error('Failed to delete preset:', error);
     }
-  }, [selectedPreset, form, AntdModal, AntdMessage, fetchPresetList, texts]);
+  }, [selectedPreset, form, AntdModal, AntdMessage, texts, removePreset, getPresetList]);
   const handleLoadPreset = React.useCallback(async loadData => {
     if (!loadData) return;
 
@@ -1829,27 +1877,53 @@ const Preset = _ref => {
   const handleSave = React.useCallback(async () => {
     setLoading(true);
     try {
-      const values = await form.validateFields();
-      console.log('Form values:', values);
+      var _fields$name, _fields$category_list2;
+      const values = await form.getFieldsValue();
+
+      // 验证预设名称
+      if ((_fields$name = fields.name) !== null && _fields$name !== void 0 && _fields$name.required) {
+        if (!values.name || values.name.trim() === '') {
+          AntdMessage.error('Name is required.');
+          return; // 直接返回 不执行
+        }
+      }
+
+      // 验证分类列表
+      if ((_fields$category_list2 = fields.category_list) !== null && _fields$category_list2 !== void 0 && _fields$category_list2.required) {
+        if (!values.category_list || values.category_list.length === 0) {
+          AntdMessage.error('No category selected.');
+          return;
+        }
+      }
       await savePreset(values);
       AntdMessage.success(texts.successText);
+      const savedPresetName = values.name;
+
       // 刷新列表
-      await fetchPresetList();
+      const data = await getPresetList();
+      const presets = (data === null || data === void 0 ? void 0 : data.preset_list) || data || [];
+      setPresetList(presets);
 
-      // 重置表单和选择状态
-      setSelectedPreset(null);
-      form.resetFields();
-    } catch (error) {
-      if (error.errorFields) {
-        // 表单验证错误
-        console.error('Form validation failed:', error.errorFields);
+      // 在刷新后的列表中查找同名的预设
+      const newlySavedPreset = presets.find(item => item.name === savedPresetName);
+      if (newlySavedPreset) {
+        setSelectedPreset(newlySavedPreset);
+        form.setFieldsValue(newlySavedPreset);
+        setPresetChanged(prev => prev + 1);
       } else {
-        console.error('Failed to save preset:', error);
+        setSelectedPreset(values);
       }
+    } catch (error) {
+      console.error('Failed to save preset:', error);
     } finally {
       setLoading(false);
     }
-  }, [form, AntdMessage, fetchPresetList, savePreset, texts]);
+  }, [form, AntdMessage, texts, savePreset, getPresetList]);
+
+  // 初始化数据
+  React.useEffect(() => {
+    fetchPresetList();
+  }, [fetchPresetList]);
   return /*#__PURE__*/jsxRuntime.jsx(antd.Modal, {
     title: texts.title,
     width: width,