Merge branch 'master' into production

src/pages/orchestration/event/index.tsx

@@ -97,6 +97,9 @@ const HandleModal = ({ visible, onChangeVisible, onRefresh }) => {
                 if (value.includes('**empty**')) {
                   return cb('非法事件标识，请重新输入');
                 }
+                if (!/^[A-Za-z0-9_]+$/.test(value)) {
+                  return cb('事件标识只能输入英文字母、数字和下划线');
+                }
 
                 return cb();
               }
@@ -323,4 +326,4 @@ const EventContainer = () => {
   );
 };
 
-export default EventContainer;
+export default EventContainer;

src/pages/orchestration/globalVar/addModal.tsx

@@ -151,6 +151,9 @@ const AddGlobalVarModal = ({ visible, onOk, onChangeVisible, form }) => {
                 if (!value) {
                   return cb('请填写变量名');
                 }
+                if (!/^[A-Za-z0-9_]+$/.test(value)) {
+                  return cb('变量名只能输入英文字母、数字和下划线');
+                }
 
                 return cb();
               }
@@ -254,4 +257,4 @@ const AddGlobalVarModal = ({ visible, onOk, onChangeVisible, form }) => {
   );
 };
 
-export default AddGlobalVarModal;
+export default AddGlobalVarModal;