add 2 example of @expr; fix escape problem in demo

zhangchunlin · zhangchunlin · commit 214bdc22d287 · 2019-05-23T14:31:57.000+08:00
diff --git a/demo/apps/apijson_demo/templates/index.html b/demo/apps/apijson_demo/templates/index.html
@@ -101,11 +101,11 @@
     el: '#app',
     delimiters: ['{', '}'],
     data: {
-        request_get : {{=request_get_json}},
-        request_head : {{=request_head_json}},
-        request_post : {{=request_post_json}},
-        request_put : {{=request_put_json}},
-        request_delete : {{=request_delete_json}},
+        request_get : {{<<request_get_json}},
+        request_head : {{<<request_head_json}},
+        request_post : {{<<request_post_json}},
+        request_put : {{<<request_put_json}},
+        request_delete : {{<<request_delete_json}},
         request_data : "",
         select_current : "",
         can_post : true,
diff --git a/demo/apps/apijson_demo/views.py b/demo/apps/apijson_demo/views.py
@@ -77,6 +77,41 @@ def index():
         "username$":"%user%"
     }
   }
+}''',
+        },
+        {
+            "label":"Array query: simple @expr",
+            "value":'''{
+  "[]":{
+    "@count":4,
+    "@page":0,
+    "user":{
+        "@column":"id,username,nickname,email",
+        "@order":"id-",
+        "@role":"ADMIN",
+        "@expr":["username$","|","nickname$"],
+        "username$":"%b%",
+        "nickname$":"%c%"
+    }
+  }
+}''',
+        },
+        {
+            "label":"Array query: complex @expr",
+            "value":'''{
+  "[]":{
+    "@count":4,
+    "@page":0,
+    "user":{
+        "@column":"id,username,nickname,email",
+        "@order":"id-",
+        "@role":"ADMIN",
+        "@expr":[["username$","&","email$"],"&",["!","nickname$"]],,
+        "username$":"%b%",
+        "nickname$":"%Admin%",
+        "email$":"%local%"
+    }
+  }
 }''',
         },
     ]
@@ -141,7 +176,6 @@ def index():
 }''',
         },
     ]
-
     return {
         "user_info":user_info,
         "request_get_json":dumps(request_get),
