Enhance role and hero forms with color attribute and multiple selecti…

…on support
YaoApp · Nov 4, 2024 · 46da884 · 46da884
1 parent 6b7a4e8
commit 46da884
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 17 deletions.
diff --git a/forms/hero.form.yao b/forms/hero.form.yao
@@ -418,10 +418,13 @@
       },
 
       "Select QueryParam": {
-        "bind": "identity",
+        "bind": "identity_multiple",
         "edit": {
           "type": "Select",
           "props": {
+            "allowClear": true,
+            "showSearch": true,
+            "mode": "multiple",
             "query": {
               "debug": true, // optional. show the debug information
 
@@ -440,11 +443,13 @@
               // [[ $keywords ]] is the search keywords, xgen request will be send if the search is enabled
               // [[ $selected ]] is the selected value, the type could be a number, string or an array. xgen request will be send if some options are selected
               "wheres": [
+                { "column": "name", "op": "notnull" },
                 { "column": "name", "value": "[[ $keywords ]]", "op": "match" }, // if the search is enabled, the query will be executed when the user types in the search box
                 {
                   "method": "orwhere",
-                  "column": "name",
-                  "value": "[[ $keywords ]]"
+                  "column": "type",
+                  "op": "in",
+                  "value": "[[ $selected ]]"
                 } // suggest showing the selected value, if the selected value is not in the search result, it will be added to the search result
               ],
               "limit": 20, // the number of records returned, default is 100. if it's 0, use the default value
@@ -463,6 +468,8 @@
         "edit": {
           "type": "Select",
           "props": {
+            "allowClear": true,
+            "showSearch": true,
             "query": {
               "debug": true, // optional. show the debug information
 
@@ -480,8 +487,9 @@
               // [[ $keywords ]] is the search keywords, xgen request will be send if the search is enabled
               // [[ $selected ]] is the selected value, the type could be a number, string or an array. xgen request will be send if some options are selected
               "wheres": [
+                { "field": "name", "is": "not null" },
                 { "field": "name", "match": "[[ $keywords ]]" }, // if the search is enabled, the query will be executed when the user types in the search box
-                { "or": true, ":value": "[[ $selected ]]" } // suggest showing the selected value, if the selected value is not in the search result, it will be added to the search result
+                { "or": true, "field": "value", "eq": "[[ $selected ]]" } // suggest showing the selected value, if the selected value is not in the search result, it will be added to the search result
               ],
 
               "limit": 20, // the number of records returned, default is 100. if it's 0, use the default value
@@ -543,12 +551,12 @@
               // @see QueryParams for more details
               // You can use the query variables
               // [[ $keywords ]] is the search keywords, xgen request will be send if the search is enabled
-              // [[ $selected ]] is the selected value, the type could be a number, string or an array. xgen request will be send if some options are selected
               "wheres": [
+                { "column": "name", "op": "notnull" },
                 { "column": "name", "value": "[[ $keywords ]]", "op": "match" }, // if the search is enabled, the query will be executed when the user types in the search box
                 {
                   "method": "orwhere",
-                  "column": "name",
+                  "column": "type",
                   "value": "[[ $keywords ]]"
                 } // suggest showing the selected value, if the selected value is not in the search result, it will be added to the search result
               ],
@@ -583,10 +591,10 @@
               // @see QueryDSL for more details
               // You can use the query variables
               // [[ $keywords ]] is the search keywords, xgen request will be send if the search is enabled
-              // [[ $selected ]] is the selected value, the type could be a number, string or an array. xgen request will be send if some options are selected
               "wheres": [
+                { "field": "name", "is": "not null" },
                 { "field": "name", "match": "[[ $keywords ]]" }, // if the search is enabled, the query will be executed when the user types in the search box
-                { "or": true, ":value": "[[ $selected ]]" } // suggest showing the selected value, if the selected value is not in the search result, it will be added to the search result
+                { "or": true, ":type": "[[ $keywords ]]" } // suggest showing the selected value, if the selected value is not in the search result, it will be added to the search result
               ],
 
               "limit": 20, // the number of records returned, default is 100. if it's 0, use the default value

diff --git a/forms/role.form.yao b/forms/role.form.yao
@@ -71,7 +71,8 @@
           "columns": [
             { "name": "角色名称", "width": 24 },
             { "name": "角色类型", "width": 24 },
-            { "name": "图标", "width": 24 }
+            { "name": "图标", "width": 24 },
+            { "name": "颜色", "width": 24 }
           ]
         }
       ]

diff --git a/models/role.mod.yao b/models/role.mod.yao
@@ -27,6 +27,14 @@
       "type": "string",
       "length": 200,
       "nullable": true
+    },
+    {
+      "name": "color",
+      "label": "颜色",
+      "comment": "颜色",
+      "type": "string",
+      "length": 20,
+      "nullable": true
     }
   ],
   "relations": {},

diff --git a/scripts/init.ts b/scripts/init.ts
@@ -70,12 +70,12 @@ function setData() {
 
   Process(
     "models.role.Insert",
-    ["name", "type", "icon"],
+    ["name", "type", "icon", "color"],
     [
-      ["法师", "mage", "icon-shield"],
-      ["战士", "fighter", "material-favorite"],
-      ["坦克", "tank", "icon-pocket"],
-      ["辅助", "support", ""],
+      ["法师", "mage", "icon-shield", "primary"],
+      ["战士", "fighter", "material-favorite", "danger"],
+      ["坦克", "tank", "icon-pocket", "success"],
+      ["辅助", "support", "", "warning"],
     ]
   );
 }
diff --git a/tables/hero.tab.yao b/tables/hero.tab.yao
@@ -291,9 +291,9 @@
           "props": {
             "query": {
               "from": "role",
-              "select": ["name", "type"],
               "labelField": "name",
-              "valueField": "type"
+              "valueField": "type",
+              "colorField": "color"
             }
           }
         },

diff --git a/tables/role.tab.json b/tables/role.tab.json
@@ -46,7 +46,8 @@
       "columns": [
         { "name": "角色名称" },
         { "name": "角色类型" },
-        { "name": "角色图标" }
+        { "name": "角色图标" },
+        { "name": "角色颜色" }
       ],
       "operation": {
         "fold": false,
@@ -136,6 +137,17 @@
           "type": "Input",
           "props": {}
         }
+      },
+      "角色颜色": {
+        "bind": "color",
+        "view": {
+          "type": "Text",
+          "props": {}
+        },
+        "edit": {
+          "type": "Input",
+          "props": {}
+        }
       }
     }
   }