Update: 合并python_mixpy中xml到python_pyodide

boards/default_src/python_mixpy/template.xml

@@ -213,6 +213,13 @@
       </statement>
     </block>
     <block type="controls_millis"></block>
+    <block type="datetime_fromtimestamp">
+      <value name="VAR">
+        <shadow type="math_number">
+          <field name="NUM">18029</field>
+        </shadow>
+      </value>
+    </block>
     <block type="time_localtime"></block>
     <block type="garbage_collection"></block>
     <block type="get_mem_alloc"></block>
@@ -382,6 +389,13 @@
         </shadow>
       </value>
     </block>
+    <block type="generate_cartesian_product">
+      <value name="REPEAT">
+        <shadow type="math_number">
+          <field name="NUM">2</field>
+        </shadow>
+      </value>
+    </block>
   </category>
   <category id="catLogic" colour="210">
     <block type="logic_compare"></block>
@@ -894,6 +908,18 @@
         </shadow>
       </value>
     </block>
+    <block type="enumerate">
+      <value name="LIST">
+        <shadow type="variables_get">
+          <field name="VAR">mylist</field>
+        </shadow>
+      </value>
+      <value name="VALUE">
+        <shadow type="math_number">
+          <field name="NUM">0</field>
+        </shadow>
+      </value>
+    </block>
   </category>
   <category id="catTuple" colour="195">
     <block type="tuple_create_with"></block>
@@ -1159,6 +1185,33 @@
         </shadow>
       </value>
     </block>
+    <block type="dicts_to_to">
+      <value name="DICT">
+        <shadow type="variables_get">
+          <field name="VAR">mydict</field>
+        </shadow>
+      </value>
+      <value name=VAR1>
+        <shadow type="text">
+          <field name="TEXT">results</field>
+        </shadow>
+      </value>
+      <value name=VAR2>
+        <shadow type="math_number">
+          <field name="NUM">0</field>
+        </shadow>
+      </value>
+      <value name=VAR3>
+        <shadow type="text">
+          <field name="TEXT">location</field>
+        </shadow>
+      </value>
+      <value name=VAR4>
+        <shadow type="text">
+          <field name="TEXT">name</field>
+        </shadow>
+      </value>
+    </block>
   </category>
   <category id="catSet" colour="100">
     <block type="set_create_with"></block>
@@ -2527,6 +2580,11 @@
           <field name="VAR">df</field>
         </shadow>
       </value>
+      <value name="COLUMNS">
+        <shadow type="list_many_input">
+          <field name="CONTENT">'a','b','c','d'</field>
+        </shadow>
+      </value>
     </block>
     <block type="variables_set">
       <field name="VAR">x</field>
@@ -3516,6 +3574,30 @@
         <shadow type="logic_null"></shadow>
       </value>
     </block>
+    <block type="sklearn_pca">
+      <value name="model_name">
+        <shadow type="variables_get">
+          <field name="VAR">pca</field>
+        </shadow>
+      </value>
+      <value name="n_components">
+        <shadow type="math_number">
+          <field name="NUM">2</field>
+        </shadow>
+      </value>
+    </block>
+    <block type="sklearn_pca_fit_transform">
+      <value name="model_name">
+        <shadow type="variables_get">
+          <field name="VAR">pca</field>
+        </shadow>
+      </value>
+      <value name="train_data">
+        <shadow type="variables_get">
+          <field name="VAR">X</field>
+        </shadow>
+      </value>
+    </block>
     <block type="sklearn_KNeighborsClassifier_Regressor">
       <value name="model_name">
         <shadow type="variables_get">
@@ -3561,6 +3643,18 @@
         <shadow type="logic_null"></shadow>
       </value>
     </block>
+    <block type="sklearn_KMeans_fit">
+      <value name="model_name">
+        <shadow type="variables_get">
+          <field name="VAR">model</field>
+        </shadow>
+      </value>
+      <value name="train_data">
+        <shadow type="variables_get">
+          <field name="VAR">X</field>
+        </shadow>
+      </value>
+    </block>
     <block type="sklearn_fit">
       <value name="model_name">
         <shadow type="variables_get">

boards/default_src/python_pyodide/css/color_mixpy_python_advance.css

@@ -134,35 +134,35 @@ div.blocklyToolboxDiv > div.blocklyToolboxContents > div:nth-child(15) > div.blo
     background:url('../../../../common/media/mark/turtle2.png') no-repeat;
     background-size: 100% auto; 
 }
-/* div.blocklyToolboxDiv > div.blocklyToolboxContents > div:nth-child(16) > div.blocklyTreeRow > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
+div.blocklyToolboxDiv > div.blocklyToolboxContents > div:nth-child(16) > div.blocklyTreeRow > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
     background:url('../../../../common/media/mark/ai.png') no-repeat;
     background-size: 100% auto; 
 }
 div.blocklyToolboxDiv > div.blocklyToolboxContents > div:nth-child(16) > div.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
     background:url('../../../../common/media/mark/ai2.png') no-repeat;
     background-size: 100% auto; 
-} */
+}
-div.blocklyToolboxDiv > div.blocklyToolboxContents > div:nth-child(16) > div.blocklyTreeRow > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
+div.blocklyToolboxDiv > div.blocklyToolboxContents > div:nth-child(17) > div.blocklyTreeRow > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
     background:url('../../../../common/media/mark/data.png') no-repeat;
     background-size: 100% auto; 
 }
-div.blocklyToolboxDiv > div.blocklyToolboxContents > div:nth-child(16) > div.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
+div.blocklyToolboxDiv > div.blocklyToolboxContents > div:nth-child(17) > div.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
     background:url('../../../../common/media/mark/data2.png') no-repeat;
     background-size: 100% auto; 
 }
-/* div.blocklyToolboxDiv > div.blocklyToolboxContents > div:nth-child(18) > div.blocklyTreeRow > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
+div.blocklyToolboxDiv > div.blocklyToolboxContents > div:nth-child(18) > div.blocklyTreeRow > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
     background:url('../../../../common/media/mark/cv.png') no-repeat;
     background-size: 100% auto; 
 }
 div.blocklyToolboxDiv > div.blocklyToolboxContents > div:nth-child(18) > div.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
     background:url('../../../../common/media/mark/cv2.png') no-repeat;
     background-size: 100% auto; 
-} */
+}
-div.blocklyToolboxDiv > div.blocklyToolboxContents > div:nth-child(17) > div.blocklyTreeRow > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
+div.blocklyToolboxDiv > div.blocklyToolboxContents > div:nth-child(19) > div.blocklyTreeRow > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
     background:url('../../../../common/media/mark/algorithm.png') no-repeat;
     background-size: 100% auto; 
 }
-div.blocklyToolboxDiv > div.blocklyToolboxContents > div:nth-child(17) > div.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
+div.blocklyToolboxDiv > div.blocklyToolboxContents > div:nth-child(19) > div.blocklyTreeRow.blocklyTreeSelected > div.blocklyTreeRowContentContainer > span.blocklyTreeIcon{
     background:url('../../../../common/media/mark/algorithm2.png') no-repeat;
     background-size: 100% auto; 
 }

boards/default_src/python_pyodide/template.xml

@@ -2263,7 +2263,7 @@
       </value>
     </block>
   </category>
-  <!-- <category id="catAI" colour="205">
+  <category id="catAI" colour="205">
     <block type="AI_ChooseAndGet">
     </block>
     <block type="AI_audio">
@@ -2482,7 +2482,7 @@
         </block>
       </value>
     </block>
-  </category> -->
+  </category>
   <category id="catData" colour="170">
     <block type="variables_set">
       <field name="VAR">df1</field>
@@ -2581,8 +2581,8 @@
         </shadow>
       </value>
       <value name="COLUMNS">
-        <shadow type="text">
+        <shadow type="list_many_input">
-          <field name="TEXT">列名</field>
+          <field name="CONTENT">'a','b','c','d'</field>
         </shadow>
       </value>
     </block>
@@ -3156,7 +3156,7 @@
       </value>
     </block>
   </category>
-  <!-- <category id="catCv" colour="f0a559">
+  <category id="catCv" colour="f0a559">
     <block type="variables_set">
       <field name="VAR">img</field>
       <value name="VALUE">
@@ -3351,7 +3351,7 @@
         </shadow>
       </value>
     </block>
-  </category> -->
+  </category>
   <category id="catsklearn" colour="80">
     <block type="sklearn_make_classification">
       <value name="n_samples">