.

dist/assets/javascript-CprOHXm8.js → dist/assets/javascript-CbvoP-qD.js

@@ -1 +1 @@
-import{conf as t,language as e}from"./typescript-DwXhQBcB.js";import"./index-DNvQzQ1B.js";var o=t,r={defaultToken:"invalid",tokenPostfix:".js",keywords:["break","case","catch","class","continue","const","constructor","debugger","default","delete","do","else","export","extends","false","finally","for","from","function","get","if","import","in","instanceof","let","new","null","return","set","super","switch","symbol","this","throw","true","try","typeof","undefined","var","void","while","with","yield","async","await","of"],typeKeywords:[],operators:e.operators,symbols:e.symbols,escapes:e.escapes,digits:e.digits,octaldigits:e.octaldigits,binarydigits:e.binarydigits,hexdigits:e.hexdigits,regexpctl:e.regexpctl,regexpesc:e.regexpesc,tokenizer:e.tokenizer};export{o as conf,r as language};
+import{conf as t,language as e}from"./typescript-BaxiLt3b.js";import"./index-DFpXF1Cy.js";var o=t,r={defaultToken:"invalid",tokenPostfix:".js",keywords:["break","case","catch","class","continue","const","constructor","debugger","default","delete","do","else","export","extends","false","finally","for","from","function","get","if","import","in","instanceof","let","new","null","return","set","super","switch","symbol","this","throw","true","try","typeof","undefined","var","void","while","with","yield","async","await","of"],typeKeywords:[],operators:e.operators,symbols:e.symbols,escapes:e.escapes,digits:e.digits,octaldigits:e.octaldigits,binarydigits:e.binarydigits,hexdigits:e.hexdigits,regexpctl:e.regexpctl,regexpesc:e.regexpesc,tokenizer:e.tokenizer};export{o as conf,r as language};

dist/assets/xml-B3_NAzp4.js → dist/assets/xml-qcY82du4.js

@@ -1 +1 @@
-import{l as e}from"./index-DNvQzQ1B.js";var n={comments:{blockComment:["<!--","-->"]},brackets:[["<",">"]],autoClosingPairs:[{open:"<",close:">"},{open:"'",close:"'"},{open:'"',close:'"'}],surroundingPairs:[{open:"<",close:">"},{open:"'",close:"'"},{open:'"',close:'"'}],onEnterRules:[{beforeText:new RegExp("<([_:\\w][_:\\w-.\\d]*)([^/>]*(?!/)>)[^<]*$","i"),afterText:/^<\/([_:\w][_:\w-.\d]*)\s*>$/i,action:{indentAction:e.IndentAction.IndentOutdent}},{beforeText:new RegExp("<(\\w[\\w\\d]*)([^/>]*(?!/)>)[^<]*$","i"),action:{indentAction:e.IndentAction.Indent}}]},a={defaultToken:"",tokenPostfix:".xml",ignoreCase:!0,qualifiedName:/(?:[\w\.\-]+:)?[\w\.\-]+/,tokenizer:{root:[[/[^<&]+/,""],{include:"@whitespace"},[/(<)(@qualifiedName)/,[{token:"delimiter"},{token:"tag",next:"@tag"}]],[/(<\/)(@qualifiedName)(\s*)(>)/,[{token:"delimiter"},{token:"tag"},"",{token:"delimiter"}]],[/(<\?)(@qualifiedName)/,[{token:"delimiter"},{token:"metatag",next:"@tag"}]],[/(<\!)(@qualifiedName)/,[{token:"delimiter"},{token:"metatag",next:"@tag"}]],[/<\!\[CDATA\[/,{token:"delimiter.cdata",next:"@cdata"}],[/&\w+;/,"string.escape"]],cdata:[[/[^\]]+/,""],[/\]\]>/,{token:"delimiter.cdata",next:"@pop"}],[/\]/,""]],tag:[[/[ \t\r\n]+/,""],[/(@qualifiedName)(\s*=\s*)("[^"]*"|'[^']*')/,["attribute.name","","attribute.value"]],[/(@qualifiedName)(\s*=\s*)("[^">?\/]*|'[^'>?\/]*)(?=[\?\/]\>)/,["attribute.name","","attribute.value"]],[/(@qualifiedName)(\s*=\s*)("[^">]*|'[^'>]*)/,["attribute.name","","attribute.value"]],[/@qualifiedName/,"attribute.name"],[/\?>/,{token:"delimiter",next:"@pop"}],[/(\/)(>)/,[{token:"tag"},{token:"delimiter",next:"@pop"}]],[/>/,{token:"delimiter",next:"@pop"}]],whitespace:[[/[ \t\r\n]+/,""],[/<!--/,{token:"comment",next:"@comment"}]],comment:[[/[^<\-]+/,"comment.content"],[/-->/,{token:"comment",next:"@pop"}],[/<!--/,"comment.content.invalid"],[/[<\-]/,"comment.content"]]}};export{n as conf,a as language};
+import{l as e}from"./index-DFpXF1Cy.js";var n={comments:{blockComment:["<!--","-->"]},brackets:[["<",">"]],autoClosingPairs:[{open:"<",close:">"},{open:"'",close:"'"},{open:'"',close:'"'}],surroundingPairs:[{open:"<",close:">"},{open:"'",close:"'"},{open:'"',close:'"'}],onEnterRules:[{beforeText:new RegExp("<([_:\\w][_:\\w-.\\d]*)([^/>]*(?!/)>)[^<]*$","i"),afterText:/^<\/([_:\w][_:\w-.\d]*)\s*>$/i,action:{indentAction:e.IndentAction.IndentOutdent}},{beforeText:new RegExp("<(\\w[\\w\\d]*)([^/>]*(?!/)>)[^<]*$","i"),action:{indentAction:e.IndentAction.Indent}}]},a={defaultToken:"",tokenPostfix:".xml",ignoreCase:!0,qualifiedName:/(?:[\w\.\-]+:)?[\w\.\-]+/,tokenizer:{root:[[/[^<&]+/,""],{include:"@whitespace"},[/(<)(@qualifiedName)/,[{token:"delimiter"},{token:"tag",next:"@tag"}]],[/(<\/)(@qualifiedName)(\s*)(>)/,[{token:"delimiter"},{token:"tag"},"",{token:"delimiter"}]],[/(<\?)(@qualifiedName)/,[{token:"delimiter"},{token:"metatag",next:"@tag"}]],[/(<\!)(@qualifiedName)/,[{token:"delimiter"},{token:"metatag",next:"@tag"}]],[/<\!\[CDATA\[/,{token:"delimiter.cdata",next:"@cdata"}],[/&\w+;/,"string.escape"]],cdata:[[/[^\]]+/,""],[/\]\]>/,{token:"delimiter.cdata",next:"@pop"}],[/\]/,""]],tag:[[/[ \t\r\n]+/,""],[/(@qualifiedName)(\s*=\s*)("[^"]*"|'[^']*')/,["attribute.name","","attribute.value"]],[/(@qualifiedName)(\s*=\s*)("[^">?\/]*|'[^'>?\/]*)(?=[\?\/]\>)/,["attribute.name","","attribute.value"]],[/(@qualifiedName)(\s*=\s*)("[^">]*|'[^'>]*)/,["attribute.name","","attribute.value"]],[/@qualifiedName/,"attribute.name"],[/\?>/,{token:"delimiter",next:"@pop"}],[/(\/)(>)/,[{token:"tag"},{token:"delimiter",next:"@pop"}]],[/>/,{token:"delimiter",next:"@pop"}]],whitespace:[[/[ \t\r\n]+/,""],[/<!--/,{token:"comment",next:"@comment"}]],comment:[[/[^<\-]+/,"comment.content"],[/-->/,{token:"comment",next:"@pop"}],[/<!--/,"comment.content.invalid"],[/[<\-]/,"comment.content"]]}};export{n as conf,a as language};

dist/index.html

@@ -4,10 +4,10 @@
     <meta charset="UTF-8">
     <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Mini Pi</title>
+    <title>Pi2</title>
     <script src="/socket.js"></script>
-    <script type="module" crossorigin src="/assets/index-DNvQzQ1B.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-DpnOlC1-.css">
+    <script type="module" crossorigin src="/assets/index-DFpXF1Cy.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-BfkElBjr.css">
   </head>
   <body>
     <div id="app"></div>

index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8">
     <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Mini Pi</title>
+    <title>Pi2</title>
     <script src="/socket.js"></script>
   </head>
   <body>

src/blockly/blocks/BlocklyFunction.js

@@ -1,6 +1,6 @@
 import * as Blockly from 'blockly';
 // import googObject from "../goog/googObject";
-const goog = Blockly || {}
+const goog = {};
 goog.array = {};
 // goog.
 goog.typeOf = function(a) {

src/blockly/blocks/list.js

@@ -2,7 +2,7 @@ import * as Blockly from 'blockly';
 import { pythonGenerator } from "blockly/python";
 import CategoryColors from './define_color'
 
-Blockly.Python = pythonGenerator
+Blockly.Python = pythonGenerator || { Msg: Object.create(null) };
 Blockly.Blocks['lists_create_with'] = {
     /**
      * Block for creating a list with any number of elements of any type.

src/components/BlocklyComponent.vue

@@ -30,8 +30,8 @@ import hant from '../blockly/msg/zh-hant';
 import en from '../blockly/msg/en';
 import blocklyXml from '../blockly/blocklyXml'
 import Basic from '@/blockly/blocks/index'
-import BlocklyStyle from '../blockly/style/blockly'
 import BlocklyPython from '../blockly/pythonCode/index'
+import BlocklyStyle from '../blockly/style/blockly'
 import codeMirrorPython from './codemirror/codemirror.vue'
 import store from '../stores/blockly'
 import Device from './device/device.vue'
@@ -57,7 +57,7 @@ onMounted(() => {
   }
   language.value = lang
   let blocklyXmls = Blockly.utils.xml.textToDom(blocklyXml.xml)
-  console.log('--------blockly xml-------',blocklyXmls);
+
   var categoryNodes = blocklyXmls.getElementsByTagName('category');
   for (var i = 0, cat; cat = categoryNodes[i]; i++) {
     var catId = cat.getAttribute('id');

src/components/addVariable.vue

@@ -1,121 +0,0 @@
-<template>
-    <div>
-        <div id="blocklyDiv" style="height: 800px; width: 100%;"></div>
-        <el-dialog title="添加块" :visible.sync="dialogVisible" :close-on-click-modal="false" :close-on-press-escape="false">
-            <el-form label-position="top" label-width="80px" :model="formLabelAlign">
-                <el-form-item label="变量名">
-                    <el-input v-model="formLabelAlign.name"></el-input>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="addBlockEvent">添 加</el-button>
-            </span>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-import Blockly from 'blockly';
-import * as Ch from 'blockly/msg/zh-hans';
-Blockly.setLocale(Ch);
-export default {
-    data() {
-        return {
-            workspace: null,
-            dialogVisible: false,
-            toolboxXml: `<xml  style="height: 100%">
-             <category name="创建" custom="CREATE_TYPED_VARIABLE"></category>
-          </xml>`,
-            formLabelAlign: {
-                name: ''
-            }
-        }
-    },
-    mounted() {
-        this.workspace = Blockly.inject('blocklyDiv', { toolbox: this.toolboxXml });
-        this.registerToolboxCategory();
-
-    },
-    methods: {
-        // 注册工具箱
-        registerToolboxCategory() {
-            this.workspace.registerToolboxCategoryCallback('CREATE_TYPED_VARIABLE', this.createFlyout);
-            this.registerButton();
-        },
-        // 注册工具箱内按钮
-        registerButton() {
-            this.workspace.registerButtonCallback('ADD_VAR_BLOCK', this.buttonClickCallbackEvent);
-        },
-        // 工具箱内按钮生成
-        createFlyout(workspace) {
-            let xmlList = [];
-            const button = document.createElement('button');
-            button.setAttribute('text', '添加变量块');
-            button.setAttribute('callbackKey', 'ADD_VAR_BLOCK');
-            xmlList.push(button);
-            const blockList = Blockly.VariablesDynamic.flyoutCategoryBlocks(workspace);
-            xmlList = blockList.concat(xmlList);
-            return xmlList;
-        },
-        // 按钮点击事件
-        buttonClickCallbackEvent(e) {
-            this.dialogVisible = true;
-        },
-        // 点击添加
-        addBlockEvent() {
-            let name = this.formLabelAlign.name;
-            this.createVariable(name)
-        },
-        // 创建变量块
-        createVariable(name) {
-            let [text, type, msg] = [this.getValidInput(name), '', ''];
-            if (text) {
-                const existing = Blockly.Variables.nameUsedWithAnyType(text, this.workspace);
-                if (existing) {
-                    if (existing.type === type) {
-                        msg = Blockly.Msg['VARIABLE_ALREADY_EXISTS'].replace('%1', existing.name);
-                    } else {
-                        msg = Blockly.Msg['VARIABLE_ALREADY_EXISTS_FOR_ANOTHER_TYPE'];
-                        msg = msg.replace('%1', existing.name).replace('%2', this.getDisplayName(existing.type));
-                    }
-                    this.$message({ message: msg, type: 'warning' })
-                } else {
-                    this.workspace.createVariable(text, type);
-                }
-            }
-            if (!msg) {
-                this.workspace.createVariable(text, type);
-                this.dialogVisible = false;
-            }
-        },
-        // 类型判断
-        getDisplayName(type) {
-            for (let i = 0; i < this.types_.length; i++) {
-                const typeNames = this.types_[i];
-                if (type === typeNames[1]) {
-                    return typeNames[0];
-                }
-            }
-            return '';
-        },
-        // 获取名称
-        getValidInput(newVar) {
-            if (newVar) {
-                newVar = newVar.replace(/[\s\xa0]+/g, ' ').trim();
-                if (newVar === Blockly.Msg['RENAME_VARIABLE'] ||
-                    newVar === Blockly.Msg['NEW_VARIABLE']) {
-                    newVar = null;
-                }
-            }
-            return newVar;
-        },
-
-    }
-}
-</script>
-<style>
-.blockly-contant /deep/ .el-dialog {
-    text-align: left !important;
-}
-</style>