diff --git a/Front/src/assets/toolbox.json b/Front/src/assets/toolbox.json index 823e0b96fab22bf8e9ccc20756b8edb0d7d828e8..0c6dd2e77593e46ee7a34cc098cef3244703ae8d 100644 --- a/Front/src/assets/toolbox.json +++ b/Front/src/assets/toolbox.json @@ -24,6 +24,10 @@ } } }, + { + "kind": "block", + "type": "console_log" + }, { "kind": "block", "type": "controls_for", @@ -366,7 +370,10 @@ }, { "kind": "block", - "type": "dict_create" + "type": "dict_create", + "extraState": { + "hasPair": true + } }, { "kind": "block", @@ -431,8 +438,12 @@ { "kind": "category", "name": "Sqlite", - "categorystyle": "sqlite", + "categorystyle": "sqlite", "contents": [ + { + "kind": "block", + "type": "sqlite_import" + }, { "kind": "block", "type": "sqlite_open" @@ -450,6 +461,144 @@ "type": "sqlite_close" } ] + }, + { + "kind": "category", + "name": "io", + "categorystyle": "io", + "contents": [ + { + "kind": "block", + "type": "file_open" + }, + { + "kind": "block", + "type": "file_read" + }, + { + "kind": "block", + "type": "file_write" + } + ] + }, + { + "kind": "category", + "name": "数据编码", + "categorystyle": "data_encoding", + "contents": [ + { + "kind": "block", + "type": "base64_import" + }, + { + "kind": "block", + "type": "text_base64_encode" + }, + { + "kind": "block", + "type": "text_base64_decode" + }, + { + "kind": "block", + "type": "json_to_base64" + }, + { + "kind": "block", + "type": "md5_import" + }, + { + "kind": "block", + "type": "md5_hash" + } + ] + }, + { + "kind": "category", + "name": "JSON", + "categorystyle": "json", + "contents": [ + { + "kind": "block", + "type": "json_parse", + "inputs": { + "JSON_STRING": { + "block": { + "type": "text", + "fields": { + "TEXT": "{}" + } + } + } + } + }, + { + "kind": "block", + "type": "json_stringify", + "inline": "true", + "extraState": { + "itemCount": 1 + } + }, + { + "kind": "block", + "type": "json_keys" + }, + { + "kind": "sep", + "gap": "32" + }, + { + "kind": "block", + "type": "json_get_path", + "inputs": { + "PATH": { + "block": { + "type": "text", + "fields": { + "TEXT": "path.to.value" + } + } + } + } + }, + { + "kind": "block", + "type": "json_merge", + "inputs": { + "JSON1": { + "block": { "type": "text" } + }, + "JSON2": { + "block": { "type": "text" } + } + } + }, + { + "kind": "block", + "type": "json_to_base64" + } + ] + }, + { + "kind": "category", + "name": "threading", + "categorystyle": "threading", + "contents": [ + ] + }, + { + "kind": "category", + "name": "turtle", + "categorystyle": "turtle", + "contents": [ + ] + }, + { + "kind": "category", + "name": "subprocess", + "categorystyle": "subprocess", + "contents": [ + ] } ] -} +} \ No newline at end of file diff --git a/Front/src/blocks/boxy.js b/Front/src/blocks/boxy.js index 92f5edea62a30171be20bded9b8b14d1a6c80579..8c53f80171feaf71d9bc852726ceb979483006f0 100644 --- a/Front/src/blocks/boxy.js +++ b/Front/src/blocks/boxy.js @@ -387,15 +387,20 @@ Blockly.defineBlocksWithJsonArray([ }, { type: 'sqlite_query', - message0: '执行查询 %1', + message0: '执行查询 数据库：%1 SQL：%2', args0: [ { type: 'input_value', - name: 'QUERY', + name: 'DB', + check: 'sqlite3.Connection' + }, + { + type: 'input_value', + name: 'SQL', check: 'String' } ], - output: 'sqlite3.Cursor', + output: 'Array', style: 'sqlite', tooltip: '执行SQL查询。' }, @@ -483,7 +488,146 @@ Blockly.defineBlocksWithJsonArray([ style: 'http', tooltip: '发送POST请求。' }, + { //字典 + type: 'json_parse', + message0: '解析JSON字符串 %1', + args0: [ + { + type: 'input_value', + name: 'JSON_STRING', + check: 'String' + } + ], + output: 'Object', + style: 'json', + tooltip: '将JSON字符串解析为Python字典对象' + }, + { + type: 'json_stringify', + message0: '转为JSON字符串 键 %1 值 %2', + args0: [ + { + type: 'input_value', + name: 'KEY', + check: 'String' + }, + { + type: 'input_value', + name: 'VALUE' + } + ], + output: 'String', + style: 'json', + inline: true, + extraState: { + itemCount: 1 + }, + tooltip: '将键值对转换为JSON字符串' + }, + { + type: 'json_keys', + message0: '获取 %1 的所有键', + args0: [ + { + type: 'input_value', + name: 'DICT', + check: 'Object' + } + ], + output: 'Array', + style: 'json', + tooltip: '获取字典对象的所有键列表' + }, + { + type: 'json_get_path', + message0: '获取 %1 路径 %2 的值', + args0: [ + { + type: 'input_value', + name: 'DICT', + check: 'Object' + }, + { + type: 'input_value', + name: 'PATH', + check: 'String' + } + ], + output: 'Any', + style: 'json', + tooltip: '使用点路径语法获取嵌套字典的值' + }, + { + type: 'json_merge', + message0: '合并字典 %1 和 %2', + args0: [ + { + type: 'input_value', + name: 'JSON1', + check: ['Object', 'Array', 'String'] // 添加 Array 类型支持 + }, + { + type: 'input_value', + name: 'JSON2', + check: ['Object', 'Array','String'] // 添加 Array 类型支持 + } + ], + output: 'Object', + style: 'json', + tooltip: '合并两个字典对象' + }, + // 在 http_import 积木之后添加 + { + type: 'base64_import', + message0: '引入base64库', + previousStatement: null, + nextStatement: null, + style: 'json', + tooltip: '引入Base64编码库' + }, + { + type: 'json_to_base64', + message0: '将 %1 转为Base64', + args0: [ + { + type: 'input_value', + name: 'DICT', + check: 'Object' + } + ], + output: 'String', + style: 'json', + tooltip: '将字典对象序列化为Base64编码字符串' + }, + { + type: 'text_base64_encode', + message0: '将 %1 编码为Base64', + args0: [ + { + type: 'input_value', + name: 'TEXT', + check: 'String' + } + ], + output: 'String', + style: 'json', + tooltip: '将文本编码为Base64字符串' + }, + { + type: 'text_base64_decode', + message0: '解码Base64字符串 %1', + args0: [ + { + type: 'input_value', + name: 'BASE64', + check: 'String' + } + ], + output: 'String', + style: 'json', + tooltip: '将Base64字符串解码为原始文本' + }, { type: 'dict_get', message0: '获取字典 %1 的键 %2 的值', @@ -553,5 +697,86 @@ Blockly.defineBlocksWithJsonArray([ output: 'Array', style: 'dict', tooltip: '创建一个空字典。' + }, + { + type:'console_log', + message0: '打印 %1', + args0: [ + { + type: 'input_value', + name: 'VALUE' + } + ], + previousStatement: null, + nextStatement: null, + style: 'controller', + tooltip: '打印值到控制台。' + }, + { + type: 'sqlite_import', + message0: '引入sqlite3库', + previousStatement: null, + nextStatement: null, + style: 'sqlite', + tooltip: '引入sqlite3库。' + }, + // 在已有base64积木之后添加 + { + type: 'md5_import', + message0: '引入哈希库', + previousStatement: null, + nextStatement: null, + style: 'data_encoding', + tooltip: '引入哈希算法支持库' + }, + { + type: 'md5_hash', + message0: '生成MD5哈希 文本 %1', + args0: [ + { + type: 'input_value', + name: 'TEXT', + check: 'String' + } + ], + output: 'String', + style: 'data_encoding', + tooltip: '生成文本的MD5哈希值' + }, + + // 在Blockly.defineBlocksWithJsonArray数组中添加： + { + type: 'file_open', + message0: '打开文件 %1 模式 %2', + args0: [ + {type: 'input_value', name: 'FILENAME', check: 'String'}, + {type: 'field_dropdown', name: 'MODE', + options: [ + ['读取', 'r'], + ['写入', 'w'], + ['追加', 'a'] + ]} + ], + output: null, + style: 'io' + }, + { + type: 'file_read', + message0: '读取文件 %1', + args0: [{type: 'input_value', name: 'FILE', check: 'File'}], + output: 'String', + style: 'io' + }, + { + type: 'file_write', + message0: '写入文件 %1 内容 %2', + args0: [ + {type: 'input_value', name: 'FILE', check: 'File'}, + {type: 'input_value', name: 'CONTENT', check: 'String'} + ], + previousStatement: null, + nextStatement: null, + style: 'io' } + ]) diff --git a/Front/src/components/FilePanel.vue b/Front/src/components/FilePanel.vue index dd34196c4af5fda69294dae2d56c93f0ba5b4d9a..ef4e3c6fc64c8bf9922c5f00acb2538438bfcd41 100644 --- a/Front/src/components/FilePanel.vue +++ b/Front/src/components/FilePanel.vue @@ -2,6 +2,20 @@
+ + + + + 新建文件 + + + + @@ -16,7 +30,7 @@ @@ -39,6 +53,10 @@ - + +
diff --git a/dist/sw.js b/dist/sw.js index b5b42f6785c6fbbf466c2f74fc03b31f52f7c913..ede63575927cf15d194d6066d9c89224c89e31e5 100644 --- a/dist/sw.js +++ b/dist/sw.js @@ -1 +1 @@ -if(!self.define){let e,s={};const n=(n,i)=>(n=new URL(n+".js",i).href,s[n]||new Promise((s=>{if("document"in self){const e=document.createElement("script");e.src=n,e.onload=s,document.head.appendChild(e)}else e=n,importScripts(n),s()})).then((()=>{let e=s[n];if(!e)throw new Error(`Module ${n} didn’t register its module`);return e})));self.define=(i,t)=>{const o=e||("document"in self?document.currentScript.src:"")||location.href;if(s[o])return;let r={};const l=e=>n(e,o),a={module:{uri:o},exports:r,require:l};s[o]=Promise.all(i.map((e=>a[e]||l(e)))).then((e=>(t(...e),r)))}}define(["./workbox-bf1ed05b"],(function(e){"use strict";self.addEventListener("message",(e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()})),e.precacheAndRoute([{url:"assets/index-5aafaa0d.css",revision:null},{url:"assets/index-fe8aae6c.js",revision:null},{url:"assets/workbox-window.prod.es5-a7b12eab.js",revision:null},{url:"index.html",revision:"64341c9558da8f8d8350dd68008e3844"},{url:"manifest.webmanifest",revision:"4fd5a74a9ab05dcb5196ecee501098a3"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("index.html"))),e.registerRoute(/.*/i,new e.NetworkFirst({cacheName:"boxy-cache",plugins:[new e.ExpirationPlugin({maxEntries:10,maxAgeSeconds:2592e3}),new e.CacheableResponsePlugin({statuses:[0,200]})]}),"GET")})); +if(!self.define){let e,s={};const n=(n,i)=>(n=new URL(n+".js",i).href,s[n]||new Promise((s=>{if("document"in self){const e=document.createElement("script");e.src=n,e.onload=s,document.head.appendChild(e)}else e=n,importScripts(n),s()})).then((()=>{let e=s[n];if(!e)throw new Error(`Module ${n} didn’t register its module`);return e})));self.define=(i,t)=>{const o=e||("document"in self?document.currentScript.src:"")||location.href;if(s[o])return;let r={};const l=e=>n(e,o),c={module:{uri:o},exports:r,require:l};s[o]=Promise.all(i.map((e=>c[e]||l(e)))).then((e=>(t(...e),r)))}}define(["./workbox-bf1ed05b"],(function(e){"use strict";self.addEventListener("message",(e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()})),e.precacheAndRoute([{url:"assets/index-66c1eb0f.js",revision:null},{url:"assets/index-b2dbd107.css",revision:null},{url:"assets/workbox-window.prod.es5-a7b12eab.js",revision:null},{url:"index.html",revision:"89020126524304ca3fcf0c451ec164a3"},{url:"manifest.webmanifest",revision:"4fd5a74a9ab05dcb5196ecee501098a3"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("index.html"))),e.registerRoute(/.*/i,new e.NetworkFirst({cacheName:"boxy-cache",plugins:[new e.ExpirationPlugin({maxEntries:10,maxAgeSeconds:2592e3}),new e.CacheableResponsePlugin({statuses:[0,200]})]}),"GET")})); diff --git a/main.py b/main.py index 9661708b83a44151a7df958f67ecb491079c4b1a..ce341a714291181b9267560e03e11a82052a1c00 100644 --- a/main.py +++ b/main.py @@ -4,6 +4,8 @@ author: CodeKpy & 小宏XeLa & 小树林 & Coconut Studio """ import base64 import json +import shutil + from flask import Flask, render_template, request, jsonify, make_response import pipList import subprocess @@ -68,7 +70,7 @@ def index(): # 创建一个响应对象 response = make_response(render_template('index.html')) # 设置 Cookie - response.set_cookie('currentProjectPath', value='/default/path', max_age=3600*24*7) + response.set_cookie('currentProjectPath', value=absolute_path, max_age=3600*24*7) return response return render_template('index.html') @@ -85,11 +87,11 @@ def api(api): # 创建一个响应对象 response = make_response(render_template('index.html')) # 设置 Cookie - response.set_cookie('currentProjectPath', value='/default/path', max_age=3600*24*7) + response.set_cookie('currentProjectPath', value=absolute_path, max_age=3600*24*7) return response if api == 'pipList': # 获取pip列表，调用cmd命令，进入project虚拟环境，获取内容， - current_project_path = request.cookies.get('currentProjectPath') or absolute_path + current_project_path = request.cookies.get('currentProjectPath', absolute_path) result = pipList.main(current_project_path) return {'pipList': result} elif api == 'pyVenv': @@ -141,15 +143,20 @@ def api(api): elif api == 'file_list': # 获取Cookie-currentProjectPath，若无则为'./project' current_project_path = request.cookies.get('currentProjectPath') or absolute_path - # 获取currentProjectPath下的所有后缀为.boxy文件列表，返回字段为name, path, time - file_list = [] - for file in os.listdir(current_project_path): - if file.endswith('.boxy'): - file_path = os.path.join(current_project_path, file) - file_time = os.path.getmtime(file_path) - file_list.append({'name': file, 'path': file_path, 'time': file_time}) - file_list.sort(key=lambda x: x['time'], reverse=True) - return jsonify(file_list) + print("current_project_path",current_project_path) + print("absolute_path", absolute_path) + try: + # 获取currentProjectPath下的所有后缀为.boxy文件列表，返回字段为name, path, time + file_list = [] + for file in os.listdir(current_project_path): + if file.endswith('.boxy'): + file_path = os.path.join(current_project_path, file) + file_time = os.path.getmtime(file_path) + file_list.append({'name': file, 'path': file_path, 'time': file_time}) + file_list.sort(key=lambda x: x['time'], reverse=True) + return jsonify(file_list) + except Exception as e: + return jsonify({'message':'failed','error': str(e)}), 403 elif api == 'get_file': # 获取Cookie-currentFilePath current_file_path = request.cookies.get('currentFilePath') @@ -174,14 +181,60 @@ def api(api): f.write(file_content) with open(path.replace('.boxy', '.py'), 'w') as f: f.write(code) - return jsonify({'success': True}) + return jsonify({'message': 'success'}) except Exception as e: return jsonify({'success': False, 'error': str(e)}), 500 elif api == 'get_absolute_path': name = request.args.get('name') - current_project_path = request.cookies.get('currentProjectPath') or absolute_path - # os.path.abspath(os.path.join(current_project_path, name)) + current_project_path = request.cookies.get('currentProjectPath', absolute_path) return jsonify({'absolute_path': os.path.join(current_project_path, name)}) + elif api == 'save_project': + # 获取post参数name，path + data = request.json # 获取 JSON 数据 + name = data.get('title') + path = data.get('path') + + exist = False + with open('project.json', 'r') as f: + dataJson = json.load(f) + # 检查是否已经存在 + for item in dataJson: + if item['path'] == path: + exist = True + break + # 不存在则添加 + # 新建Python 虚拟环境 + if not exist: + print("不存在") + os.system('python -m venv ' + path) + dataJson.append({'title': name, 'path': path}) + + # 写入 + with open('project.json', 'w') as j: + j.write(json.dumps(dataJson)) + + return {'message': 'success'} + elif api == 'delete_project': + # 获取post参数path + data = request.json # 获取 JSON 数据 + current_project_path = data.get('path') + try: + # 删除当前项目 + shutil.rmtree(current_project_path) + return {'message': 'success'} + except Exception as e: + return {'message': 'error', 'error': str(e)} + elif api == 'delete_file': + # 处理文件删除请求 + # 从 Cookie 中获取当前文件路径 + current_file_path = request.cookies.get('currentFilePath') + try: + # 删除指定路径的文件 + os.remove(current_file_path) + return {'message': 'success'} + except Exception as e: + # 返回删除失败的异常信息 + return {'message': 'error', 'error': str(e)} if __name__ == '__main__': app.run(debug=True) diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000000000000000000000000000000000000..87eddbd1d3af879a48bd931b044952ec75cd5bad Binary files /dev/null and b/requirements.txt differ