diff --git a/package.json b/package.json index 2e5f8ef3..8b32d860 100644 --- a/package.json +++ b/package.json @@ -63,10 +63,10 @@ "nodemailer": "^6.7.2", "p-queue": "7.2.0", "reflect-metadata": "^0.1.13", - "sequelize": "^6.17.0", + "sequelize": "^6.20.1", "serve-handler": "^6.1.3", "sockjs": "^0.3.24", - "sqlite3": "npm:@louislam/sqlite3@^15.0.3", + "sqlite3": "npm:@louislam/sqlite3@^15.0.6", "toad-scheduler": "^1.6.0", "typedi": "^0.10.0", "uuid": "^8.3.2", diff --git a/src/pages/log/index.tsx b/src/pages/log/index.tsx index 6dad7fb2..c216e1b3 100644 --- a/src/pages/log/index.tsx +++ b/src/pages/log/index.tsx @@ -60,7 +60,7 @@ const Log = ({ headerStyle, isPhone, theme }: any) => { const getLog = (node: any) => { request - .get(`${config.apiPrefix}logs/${node.value}?path=${node.parent || ''}`) + .get(`${config.apiPrefix}logs/${node.title}?path=${node.parent || ''}`) .then((data) => { setValue(data.data); }); @@ -113,6 +113,7 @@ const Log = ({ headerStyle, isPhone, theme }: any) => { dropdownStyle={{ maxHeight: 400, overflow: 'auto' }} treeData={data} placeholder="请选择日志" + fieldNames={{ value: 'key', label: 'title' }} showSearch onSelect={onSelect} />, diff --git a/src/pages/script/editModal.tsx b/src/pages/script/editModal.tsx index 016d0fcc..78253338 100644 --- a/src/pages/script/editModal.tsx +++ b/src/pages/script/editModal.tsx @@ -66,7 +66,7 @@ const EditModal = ({ const getDetail = (node: any) => { request - .get(`${config.apiPrefix}scripts/${node.value}?path=${node.parent || ''}`) + .get(`${config.apiPrefix}scripts/${node.title}?path=${node.parent || ''}`) .then((data) => { setValue(data.data); }); @@ -77,7 +77,7 @@ const EditModal = ({ request .put(`${config.apiPrefix}scripts/run`, { data: { - filename: cNode.value, + filename: cNode.title, path: cNode.parent || '', }, }) @@ -87,13 +87,13 @@ const EditModal = ({ }; const stop = () => { - if (!cNode || !cNode.value) { + if (!cNode || !cNode.title) { return; } request .put(`${config.apiPrefix}scripts/stop`, { data: { - filename: cNode.value, + filename: cNode.title, path: cNode.parent || '', }, }) @@ -146,6 +146,7 @@ const EditModal = ({ dropdownStyle={{ maxHeight: 400, overflow: 'auto' }} treeData={treeData} placeholder="请选择脚本文件" + fieldNames={{ value: 'key', label: 'title' }} showSearch onSelect={onSelect} /> @@ -243,7 +244,7 @@ const EditModal = ({ content: editorRef.current && editorRef.current.getValue().replace(/\r\n/g, '\n'), - filename: cNode?.value, + filename: cNode?.title, }} /> { dropdownStyle={{ maxHeight: 400, overflow: 'auto' }} treeData={data} placeholder="请选择脚本" + fieldNames={{ value: 'key', label: 'title' }} showSearch onSelect={onSelect} />,