From aa8afb8f18fee21361742b62061b4d4db4a09bb5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 17:51:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

---
 cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html |  333 ++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 217 insertions(+), 116 deletions(-)

diff --git a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
index 1f4080d..fd33deb 100644
--- a/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
+++ b/cloud-server-management/src/main/webapp/WEB-INF/view/system/ball/ball_pre_add.html
@@ -37,7 +37,6 @@
     // 通过替换下面这个配置来生成不同页面
     let amisJSON = {
       "type": "page",
-      "id": "u:8c028a595aa6",
       "body": [
         {
           "type": "form",
@@ -50,13 +49,21 @@
               "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp*所属运营商:",
               "inline": true,
               "wrapperComponent": "",
-
               "style": {
-                "marginLeft": "0",
-                "fontFamily": "",
-                "fontSize": 18
+                "fontFamily": ""
+              },
+              "themeCss": {
+                "baseControlClassName": {
+                  "padding-and-margin:default": {
+                    "marginLeft": "0"
+                  },
+                  "font:default": {
+                    "fontSize": 18
+                  }
+                }
               }
-            },{
+            },
+            {
               "type": "select",
               "label": "",
               "name": "operationId",
@@ -75,12 +82,12 @@
               "source": {
                 "url": "/ball/yunying",
                 "method": "post",
-                "messages": {
-                }
+                "messages": {}
               },
               "labelField": "value",
               "valueField": "id"
-            },{
+            },
+            {
               "type": "checkbox",
               "option": "平台",
               "name": "is",
@@ -102,7 +109,6 @@
               "trueValue": "平台",
               "falseValue": 0,
               "mode": "inline"
-
             },
             {
               "type": "select",
@@ -112,20 +118,18 @@
               "multiple": false,
               "mode": "horizontal",
               "size": "md",
-              "value":"",
+              "value": "",
               "horizontal": {
                 "leftFixed": "lg"
               },
               "source": {
                 "url": "/coursePackage/queryProvince",
                 "method": "get",
-                "messages": {
-                },
+                "messages": {},
                 "sendOn": "",
                 "requestAdaptor": "",
                 "adaptor": "",
                 "silent": true
-
               },
               "onEvent": {
                 "change": {
@@ -158,8 +162,7 @@
               "source": {
                 "url": "/coursePackage/queryCity1/$province",
                 "method": "post",
-                "messages": {
-                },
+                "messages": {},
                 "sendOn": "this.province != null &&this.province != ' '",
                 "requestAdaptor": "",
                 "adaptor": "",
@@ -197,9 +200,8 @@
               },
               "source": {
                 "method": "post",
-                "url": "/coursePackage/queryStore1/$city",
-                "messages": {
-                },
+                "url": "/coursePackage/queryStore1/$city/$operationId",
+                "messages": {},
                 "sendOn": "this.city != null &&this.city != ' '",
                 "requestAdaptor": "",
                 "adaptor": "",
@@ -225,7 +227,7 @@
               "type": "select",
               "label": "所属场地:",
               "name": "site",
-              "value":"",
+              "value": "",
               "id": "u:0d288f4bdd8e",
               "multiple": false,
               "mode": "horizontal",
@@ -236,8 +238,7 @@
               "source": {
                 "url": "/coursePackage/querySite/$store",
                 "method": "post",
-                "messages": {
-                },
+                "messages": {},
                 "dataType": "form",
                 "requestAdaptor": "",
                 "adaptor": "",
@@ -255,9 +256,17 @@
               "wrapperComponent": "",
               "id": "u:587781d5d181",
               "style": {
-                "marginLeft": "0",
-                "fontFamily": "",
-                "fontSize": 18
+                "fontFamily": ""
+              },
+              "themeCss": {
+                "baseControlClassName": {
+                  "padding-and-margin:default": {
+                    "marginLeft": "0"
+                  },
+                  "font:default": {
+                    "fontSize": 18
+                  }
+                }
               }
             },
             {
@@ -272,8 +281,6 @@
               },
               "value": "",
               "required": true
-              ,
-              "value":""
             },
             {
               "type": "input-text",
@@ -283,9 +290,8 @@
               "mode": "inline",
               "clearValueOnHidden": false,
               "hidden": false,
-              "required": true
-              ,
-              "value":""
+              "required": true,
+              "value": ""
             },
             {
               "type": "button",
@@ -345,14 +351,20 @@
                           "multiple": false,
                           "hideUploadButton": false,
                           "fixedSize": false
-                        },{
+                        },
+                        {
                           "type": "tpl",
                           "id": "u:587781d5d181",
                           "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp推荐像素:780px x 424px",
                           "inline": true,
                           "wrapperComponent": "",
-                          "style": {
-                            "marginLeft": "0"
+                          "style": {},
+                          "themeCss": {
+                            "baseControlClassName": {
+                              "padding-and-margin:default": {
+                                "marginLeft": "0"
+                              }
+                            }
                           }
                         },
                         {
@@ -379,8 +391,13 @@
                           "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp",
                           "inline": true,
                           "wrapperComponent": "",
-                          "style": {
-                            "marginLeft": "0"
+                          "style": {},
+                          "themeCss": {
+                            "baseControlClassName": {
+                              "padding-and-margin:default": {
+                                "marginLeft": "0"
+                              }
+                            }
                           }
                         },
                         {
@@ -408,8 +425,7 @@
                           "labelClassName": "text-dark m-b text-lg"
                         }
                       ],
-                      "actions": [
-                      ],
+                      "actions": [],
                       "id": "u:8445330f451b",
                       "bodyClassName": "no-border b-light",
                       "className": "no-border"
@@ -446,14 +462,20 @@
                           "multiple": false,
                           "hideUploadButton": false,
                           "fixedSize": false
-                        },{
+                        },
+                        {
                           "type": "tpl",
                           "id": "u:587781d5d181",
                           "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp推荐像素:780px x 424px",
                           "inline": true,
                           "wrapperComponent": "",
-                          "style": {
-                            "marginLeft": "0"
+                          "style": {},
+                          "themeCss": {
+                            "baseControlClassName": {
+                              "padding-and-margin:default": {
+                                "marginLeft": "0"
+                              }
+                            }
                           }
                         },
                         {
@@ -480,8 +502,13 @@
                           "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp",
                           "inline": true,
                           "wrapperComponent": "",
-                          "style": {
-                            "marginLeft": "0"
+                          "style": {},
+                          "themeCss": {
+                            "baseControlClassName": {
+                              "padding-and-margin:default": {
+                                "marginLeft": "0"
+                              }
+                            }
                           }
                         },
                         {
@@ -509,8 +536,7 @@
                           "labelClassName": "text-dark m-b text-lg"
                         }
                       ],
-                      "actions": [
-                      ],
+                      "actions": [],
                       "id": "u:8445330f451b",
                       "bodyClassName": "no-border b-light",
                       "className": "no-border"
@@ -546,14 +572,20 @@
                           "multiple": false,
                           "hideUploadButton": false,
                           "fixedSize": false
-                        },{
+                        },
+                        {
                           "type": "tpl",
                           "id": "u:587781d5d181",
                           "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp推荐像素:780px x 424px",
                           "inline": true,
                           "wrapperComponent": "",
-                          "style": {
-                            "marginLeft": "0"
+                          "style": {},
+                          "themeCss": {
+                            "baseControlClassName": {
+                              "padding-and-margin:default": {
+                                "marginLeft": "0"
+                              }
+                            }
                           }
                         },
                         {
@@ -580,8 +612,13 @@
                           "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp",
                           "inline": true,
                           "wrapperComponent": "",
-                          "style": {
-                            "marginLeft": "0"
+                          "style": {},
+                          "themeCss": {
+                            "baseControlClassName": {
+                              "padding-and-margin:default": {
+                                "marginLeft": "0"
+                              }
+                            }
                           }
                         },
                         {
@@ -609,8 +646,7 @@
                           "labelClassName": "text-dark m-b text-lg"
                         }
                       ],
-                      "actions": [
-                      ],
+                      "actions": [],
                       "id": "u:8445330f451b",
                       "bodyClassName": "no-border b-light",
                       "className": "no-border"
@@ -652,14 +688,20 @@
                           "multiple": false,
                           "hideUploadButton": false,
                           "fixedSize": false
-                        },{
+                        },
+                        {
                           "type": "tpl",
                           "id": "u:587781d5d181",
                           "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp推荐像素:780px x 424px",
                           "inline": true,
                           "wrapperComponent": "",
-                          "style": {
-                            "marginLeft": "0"
+                          "style": {},
+                          "themeCss": {
+                            "baseControlClassName": {
+                              "padding-and-margin:default": {
+                                "marginLeft": "0"
+                              }
+                            }
                           }
                         },
                         {
@@ -677,8 +719,13 @@
                           "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp",
                           "inline": true,
                           "wrapperComponent": "",
-                          "style": {
-                            "marginLeft": "0"
+                          "style": {},
+                          "themeCss": {
+                            "baseControlClassName": {
+                              "padding-and-margin:default": {
+                                "marginLeft": "0"
+                              }
+                            }
                           }
                         },
                         {
@@ -715,8 +762,7 @@
                           "labelClassName": "text-dark m-b text-lg"
                         }
                       ],
-                      "actions": [
-                      ],
+                      "actions": [],
                       "id": "u:89bd6bd7e231",
                       "bodyClassName": "no-border b-light",
                       "className": "no-border"
@@ -753,14 +799,20 @@
                           "multiple": false,
                           "hideUploadButton": false,
                           "fixedSize": false
-                        },{
+                        },
+                        {
                           "type": "tpl",
                           "id": "u:587781d5d181",
                           "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp推荐像素:780px x 424px",
                           "inline": true,
                           "wrapperComponent": "",
-                          "style": {
-                            "marginLeft": "0"
+                          "style": {},
+                          "themeCss": {
+                            "baseControlClassName": {
+                              "padding-and-margin:default": {
+                                "marginLeft": "0"
+                              }
+                            }
                           }
                         },
                         {
@@ -787,8 +839,13 @@
                           "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp",
                           "inline": true,
                           "wrapperComponent": "",
-                          "style": {
-                            "marginLeft": "0"
+                          "style": {},
+                          "themeCss": {
+                            "baseControlClassName": {
+                              "padding-and-margin:default": {
+                                "marginLeft": "0"
+                              }
+                            }
                           }
                         },
                         {
@@ -816,8 +873,7 @@
                           "labelClassName": "text-dark m-b text-lg"
                         }
                       ],
-                      "actions": [
-                      ],
+                      "actions": [],
                       "id": "u:8445330f451b",
                       "bodyClassName": "no-border b-light",
                       "className": "no-border"
@@ -853,14 +909,20 @@
                           "multiple": false,
                           "hideUploadButton": false,
                           "fixedSize": false
-                        },{
+                        },
+                        {
                           "type": "tpl",
                           "id": "u:587781d5d181",
                           "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp推荐像素:780px x 424px",
                           "inline": true,
                           "wrapperComponent": "",
-                          "style": {
-                            "marginLeft": "0"
+                          "style": {},
+                          "themeCss": {
+                            "baseControlClassName": {
+                              "padding-and-margin:default": {
+                                "marginLeft": "0"
+                              }
+                            }
                           }
                         },
                         {
@@ -887,8 +949,13 @@
                           "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp",
                           "inline": true,
                           "wrapperComponent": "",
-                          "style": {
-                            "marginLeft": "0"
+                          "style": {},
+                          "themeCss": {
+                            "baseControlClassName": {
+                              "padding-and-margin:default": {
+                                "marginLeft": "0"
+                              }
+                            }
                           }
                         },
                         {
@@ -916,8 +983,7 @@
                           "labelClassName": "text-dark m-b text-lg"
                         }
                       ],
-                      "actions": [
-                      ],
+                      "actions": [],
                       "id": "u:8445330f451b",
                       "bodyClassName": "no-border b-light",
                       "className": "no-border"
@@ -959,14 +1025,20 @@
                           "multiple": false,
                           "hideUploadButton": false,
                           "fixedSize": false
-                        },{
+                        },
+                        {
                           "type": "tpl",
                           "id": "u:587781d5d181",
                           "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp推荐像素:780px x 424px",
                           "inline": true,
                           "wrapperComponent": "",
-                          "style": {
-                            "marginLeft": "0"
+                          "style": {},
+                          "themeCss": {
+                            "baseControlClassName": {
+                              "padding-and-margin:default": {
+                                "marginLeft": "0"
+                              }
+                            }
                           }
                         },
                         {
@@ -993,8 +1065,13 @@
                           "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp",
                           "inline": true,
                           "wrapperComponent": "",
-                          "style": {
-                            "marginLeft": "0"
+                          "style": {},
+                          "themeCss": {
+                            "baseControlClassName": {
+                              "padding-and-margin:default": {
+                                "marginLeft": "0"
+                              }
+                            }
                           }
                         },
                         {
@@ -1022,8 +1099,7 @@
                           "labelClassName": "text-dark m-b text-lg"
                         }
                       ],
-                      "actions": [
-                      ],
+                      "actions": [],
                       "id": "u:20efa0a87285",
                       "bodyClassName": "no-border b-light",
                       "className": "no-border"
@@ -1060,14 +1136,20 @@
                           "multiple": false,
                           "hideUploadButton": false,
                           "fixedSize": false
-                        },{
+                        },
+                        {
                           "type": "tpl",
                           "id": "u:587781d5d181",
                           "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp推荐像素:780px x 424px",
                           "inline": true,
                           "wrapperComponent": "",
-                          "style": {
-                            "marginLeft": "0"
+                          "style": {},
+                          "themeCss": {
+                            "baseControlClassName": {
+                              "padding-and-margin:default": {
+                                "marginLeft": "0"
+                              }
+                            }
                           }
                         },
                         {
@@ -1094,8 +1176,13 @@
                           "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp",
                           "inline": true,
                           "wrapperComponent": "",
-                          "style": {
-                            "marginLeft": "0"
+                          "style": {},
+                          "themeCss": {
+                            "baseControlClassName": {
+                              "padding-and-margin:default": {
+                                "marginLeft": "0"
+                              }
+                            }
                           }
                         },
                         {
@@ -1123,8 +1210,7 @@
                           "labelClassName": "text-dark m-b text-lg"
                         }
                       ],
-                      "actions": [
-                      ],
+                      "actions": [],
                       "id": "u:4b37f6a2c067",
                       "bodyClassName": "no-border b-light",
                       "className": "no-border"
@@ -1160,14 +1246,20 @@
                           "multiple": false,
                           "hideUploadButton": false,
                           "fixedSize": false
-                        },{
+                        },
+                        {
                           "type": "tpl",
                           "id": "u:587781d5d181",
                           "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp推荐像素:780px x 424px",
                           "inline": true,
                           "wrapperComponent": "",
-                          "style": {
-                            "marginLeft": "0"
+                          "style": {},
+                          "themeCss": {
+                            "baseControlClassName": {
+                              "padding-and-margin:default": {
+                                "marginLeft": "0"
+                              }
+                            }
                           }
                         },
                         {
@@ -1194,8 +1286,13 @@
                           "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp",
                           "inline": true,
                           "wrapperComponent": "",
-                          "style": {
-                            "marginLeft": "0"
+                          "style": {},
+                          "themeCss": {
+                            "baseControlClassName": {
+                              "padding-and-margin:default": {
+                                "marginLeft": "0"
+                              }
+                            }
                           }
                         },
                         {
@@ -1223,8 +1320,7 @@
                           "labelClassName": "text-dark m-b text-lg"
                         }
                       ],
-                      "actions": [
-                      ],
+                      "actions": [],
                       "id": "u:cd832349886c",
                       "bodyClassName": "no-border b-light",
                       "className": "no-border"
@@ -1266,14 +1362,20 @@
                           "multiple": false,
                           "hideUploadButton": false,
                           "fixedSize": false
-                        },{
+                        },
+                        {
                           "type": "tpl",
                           "id": "u:587781d5d181",
                           "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp推荐像素:780px x 424px",
                           "inline": true,
                           "wrapperComponent": "",
-                          "style": {
-                            "marginLeft": "0"
+                          "style": {},
+                          "themeCss": {
+                            "baseControlClassName": {
+                              "padding-and-margin:default": {
+                                "marginLeft": "0"
+                              }
+                            }
                           }
                         },
                         {
@@ -1300,8 +1402,13 @@
                           "tpl": "&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp",
                           "inline": true,
                           "wrapperComponent": "",
-                          "style": {
-                            "marginLeft": "0"
+                          "style": {},
+                          "themeCss": {
+                            "baseControlClassName": {
+                              "padding-and-margin:default": {
+                                "marginLeft": "0"
+                              }
+                            }
                           }
                         },
                         {
@@ -1329,8 +1436,7 @@
                           "labelClassName": "text-dark m-b text-lg"
                         }
                       ],
-                      "actions": [
-                      ],
+                      "actions": [],
                       "id": "u:fe79896823ad",
                       "bodyClassName": "no-border b-light",
                       "className": "no-border"
@@ -1340,13 +1446,11 @@
                   "columnClassName": "p-l-lg"
                 },
                 {
-                  "body": [
-                  ],
+                  "body": [],
                   "id": "u:5a16b34e0128"
                 },
                 {
-                  "body": [
-                  ],
+                  "body": [],
                   "id": "u:a49cf291b3fe"
                 }
               ],
@@ -1370,8 +1474,7 @@
                             "click": {
                               "actions": [
                                 {
-                                  "args": {
-                                  },
+                                  "args": {},
                                   "script": "parent.layer.close(window.parent.TStudent.layerIndex);",
                                   "actionType": "custom"
                                 }
@@ -1392,8 +1495,7 @@
                                   "actionType": "submit"
                                 },
                                 {
-                                  "args": {
-                                  },
+                                  "args": {},
                                   "script": "window.parent.TStudent.table.refresh();",
                                   "actionType": "custom"
                                 }
@@ -1416,27 +1518,26 @@
           "api": {
             "url": "/ball/save",
             "method": "post",
-            "messages": {
-            },
+            "messages": {},
             "dataType": "form-data"
           },
-          "actions": [
-          ],
+          "actions": [],
           "onEvent": {
             "submitSucc": {
               "weight": 0,
               "actions": [
                 {
-                  "args": {
-                  },
+                  "args": {},
                   "script": "parent.layer.close(window.parent.TStudent.layerIndex);",
                   "actionType": "custom"
                 }
               ]
             }
-          }
+          },
+          "feat": "Insert"
         }
-      ]
+      ],
+      "id": "u:8c028a595aa6"
     };
 
     let amisScoped = amis.embed('#root', amisJSON);

--
Gitblit v1.7.1