Merge remote-tracking branch 'origin/dev_2307' into dev_2307

ant-design-vue-jeecg/src/views/py/modules/PyBasicInfoModal.vue

@@ -206,15 +206,24 @@ export default {
           },
           version: {
             rules: [{required: true, message: '请输入版本!'},
-            {
+              /*{
                 pattern: /(^[0-9]{1,2}$)|(^[0-9]{1,6}[\.]{1}[0-9]{1,1}$)/,
                 message: '版本整数部分输入长度最长为2位，小数点后最多一位！'
-            }],
+              }*/
+              {
+                pattern: /(^[\u4e00-\u9fa5_a-zA-Z0-9_]{1,15}$)/,
+                message: '版本不能为空且长度不能超过15!'
+              }
+              ],
             trigger: 'blur'
           },
           mainSubject: {
             rules: [{required: true, message: '请输入主干学科名字!'},
-            {pattern: /(^[\u4e00-\u9fa5_a-zA-Z0-9_]{1,15}$)/, message: '输入主干学科名字不能为空且长度不能超过15！'}],
+              {
+                pattern: /(^[\u4e00-\u9fa5_a-zA-Z0-9_]{1,15}$)/,
+                message: '输入主干学科名字不能为空且长度不能超过15！'
+              }
+            ],
             trigger: 'blur'
           },
           majorDirection: {