From ba71ae288ed450dea2a1d91e67db9f4ff1cf1593 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=B8=9B=E8=BE=B0?=
 <10956606+zou-bochen@user.noreply.gitee.com>
Date: Thu, 10 Nov 2022 12:05:26 +0000
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E4=B9=89=E7=A7=AF=E6=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 邹帛辰 <10956606+zou-bochen@user.noreply.gitee.com>
---
 blockly/ini/blocks/get.js    | 44 ++++++++++++++++++++++++------------
 blockly/ini/blocks/get.js.js | 39 +++++++++-----------------------
 2 files changed, 40 insertions(+), 43 deletions(-)

diff --git a/blockly/ini/blocks/get.js b/blockly/ini/blocks/get.js
index 7375e5f..406c7df 100644
--- a/blockly/ini/blocks/get.js
+++ b/blockly/ini/blocks/get.js
@@ -261,20 +261,6 @@ Blockly.Blocks['body'] = {
   }
 };
 
-Blockly.Blocks['style_css'] = {
-  init: function() {
-    this.appendValueInput("css")
-        .setCheck("String")
-        .appendField("自定义css属性");
-    this.setInputsInline(true);
-    this.setPreviousStatement(true, null);
-    this.setNextStatement(true, null);
-    this.setColour(230);
- this.setTooltip("");
- this.setHelpUrl("");
-  }
-};
-
 Blockly.Blocks['title'] = {
   init: function() {
     this.appendValueInput("NAME")
@@ -406,4 +392,32 @@ Blockly.Blocks['br'] = {
  this.setTooltip("");
  this.setHelpUrl("");
   }
-};
\ No newline at end of file
+};
+Blockly.Blocks['shuxing'] = {
+  init: function() {
+    this.appendDummyInput()
+        .setCheck("String")
+        .appendField("属性名")
+        .appendField(new Blockly.FieldTextInput("name"), "NAME")
+        .appendField("属性值");
+        .appendField(new Blockly.FieldTextInput("value"),"value")
+    this.setInputsInline(true);
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(230);
+ this.setTooltip("");
+ this.setHelpUrl("");
+  }
+};
+Blockly.Blocks['css'] = {
+  init: function() {
+    this.appendStatementInput("NAME")
+        .setCheck(null)
+        .appendField("CSS样式（属性）");
+    this.setPreviousStatement(true, null);
+    this.setNextStatement(true, null);
+    this.setColour(230);
+ this.setTooltip("");
+ this.setHelpUrl("");
+  }
+};
diff --git a/blockly/ini/blocks/get.js.js b/blockly/ini/blocks/get.js.js
index a010f64..83e3ff6 100644
--- a/blockly/ini/blocks/get.js.js
+++ b/blockly/ini/blocks/get.js.js
@@ -128,10 +128,10 @@ Blockly.PHP['head'] = function(block) {
   return code;
 };
 
-Blockly.PHP['diyphp'] = function(block) {
+Blockly.PHP['diycode'] = function(block) {
   var text_code = block.getFieldValue('code');
   // TODO: Assemble PHP into code variable.
-  var code = text_code + ';<br>';
+  var code = text_code + '<br>';
   return code;
 };
 Blockly.PHP['h_'] = function(block) {
@@ -139,7 +139,7 @@ Blockly.PHP['h_'] = function(block) {
   var statements_name = Blockly.PHP.statementToCode(block, 'NAME');
   var statements_attribute = Blockly.PHP.statementToCode(block, 'attribute');
   // TODO: Assemble PHP into code variable.
-  var code = '&lt;'+dropdown_test + ' ' + statements_attribute + '&gt;<br>'+statements_name+'<br>&lt;/'+dropdown_test+'&gt;<br>';
+  var code = '&lt;'+dropdown_test + ' ' + statements_attribute + "&gt;<br>'+statements_name+'<br>&lt;/'+dropdown_test+'&gt;<br>';
   return code;
 };
 
@@ -157,13 +157,6 @@ Blockly.PHP['html5'] = function(block) {
   return code;
 };
 
-Blockly.PHP['style_css'] = function(block) {
-  var value_css = Blockly.PHP.valueToCode(block, 'css', Blockly.PHP.ORDER_ATOMIC);
-  // TODO: Assemble PHP into code variable.
-  var code = '...;\n';
-  return code;
-};
-
 Blockly.PHP['p'] = function(block) {
   var statements_name = Blockly.PHP.statementToCode(block, 'NAME');
   var statements_attribute = Blockly.PHP.statementToCode(block, 'attribute');
@@ -177,7 +170,7 @@ Blockly.PHP['img'] = function(block) {
   var number_width = block.getFieldValue('width');
   var number_height = block.getFieldValue('height');
   // TODO: Assemble PHP into code variable.
-  var code = '&lt;img ' + statements_attribute +'"&gt;<br>' + statements_name + '<br>';
+  var code = '&lt;img '+' src="'+text_src+'"'+' width="'+number_width+'"'+' heigth="'+number_height+'"'+'"&gt;<br>' + statements_name + '<br>';
   return code;
 };
 
@@ -187,27 +180,17 @@ Blockly.PHP['title'] = function(block) {
   var code = '&lt;title&gt;' + value_name + '&lt;/title&gt;<br>';
   return code;
 };
-
-Blockly.PHP['test'] = function(block) {
-  var text_name = block.getFieldValue('NAME');
-  // TODO: Assemble PHP into code variable.
-  var code = '...;\n';
-  return code;
-};
-
 Blockly.PHP['br'] = function(block) {
   // TODO: Assemble PHP into code variable.
-  var code = '<br>';
+  var code = '&lt;br&gt;';
   return code;
 };
-
-
 Blockly.PHP['a'] = function(block) {
   var text_link = block.getFieldValue('link');
   var statements_name = Blockly.PHP.statementToCode(block, 'NAME');
   var statements_attribute = Blockly.PHP.statementToCode(block, 'attribute');
   // TODO: Assemble PHP into code variable.
-  var code = '...;\n';
+  var code = '&lt;img '+' src="'+text_link+'" '+statements_attribute+'&gt;'+ statements_name + '&lt;/a&gt;<br>';
   return code;
 };
 
@@ -216,13 +199,13 @@ Blockly.PHP['video'] = function(block) {
   var number_width = block.getFieldValue('width');
   var number_height = block.getFieldValue('height');
   // TODO: Assemble PHP into code variable.
-  var code = '...;\n';
+  var code = '&lt;video '+' src="'+text_src+'"'+' width="'+number_width+'"'+' heigth="'+number_height+'"'+'"&gt;<br>&lt;/video&gt;<br>';
   return code;
 };
-
-Blockly.PHP['diyjs'] = function(block) {
-  var text_code = block.getFieldValue('code');
+Blockly.PHP['shuxing'] = function(block) {
+  var text_name = block.getFieldValue('NAME');
+  var text_value = block.getFieldValue('value');
   // TODO: Assemble PHP into code variable.
-  var code = '...;\n';
+  var code = text_name+':'+text_value+';<br>';
   return code;
 };
\ No newline at end of file
-- 
Gitee