1.修复sql语句中因为有;号导致语句分割错误的问题

2.修复数据源全部删除时会报错的显示问题
3.工单说明修改为textarea类型
4.修改数据源删除二次确认提示

Author: cookie

src/core/api/auditorder.py

@@ -3,6 +3,7 @@
 import ast
 import threading
 import datetime
+import sqlparse
 from libs import baseview, call_inception, util, serializers, send_email
 from rest_framework.response import Response
 from django.http import HttpResponse
@@ -268,7 +269,8 @@ def get(self, request, args: str = None):
         bundle = request.GET.get('bundle_id')
         baseCon = DatabaseList.objects.filter(id=bundle).first()
         sql = SqlOrder.objects.filter(id=id).only('sql').first()
-        return Response({'sql': sql.sql, 'comRoom': baseCon.computer_room, 'conn': baseCon.connection_name})
+        ser_sql = sqlparse.split(sql.sql)
+        return Response({'sql': json.dumps(ser_sql), 'comRoom': baseCon.computer_room, 'conn': baseCon.connection_name})
 
 
 def push_message(message=None, type=None, user=None, to_addr=None, work_id=None, status=None):

src/core/api/managerdb.py

@@ -68,6 +68,14 @@ def get(self, request, args=None):
                                                        computer_room__contains=con['computer_room'])[start:end]
                 else:
                     page_number = DatabaseList.objects.count()
+                    if page_number == 0:
+                        return Response(
+                            {
+                                'page': page_number,
+                                'data': [],
+                                'custom': custom_com['con_room']
+                            }
+                        )
                     info = DatabaseList.objects.all().order_by('connection_name')[start:end]
                 serializers = Sqllist(info, many=True)
 

src/core/api/sqlorder.py

@@ -1,5 +1,6 @@
 import logging
 import json
+import sqlparse
 from libs import baseview, util
 from libs import call_inception
 from core.task import submit_push_messages
@@ -46,7 +47,6 @@ def put(self, request, args=None):
                 id = request.data['id']
                 base = request.data['base']
                 sql = request.data['sql']
-                sql = str(sql).strip('\n').strip().rstrip(';')
                 data = DatabaseList.objects.filter(id=id).first()
                 info = {
                     'host': data.ip,
@@ -78,10 +78,10 @@ def post(self, request, args=None):
             return HttpResponse(status=500)
         else:
             try:
-                x = [x.rstrip(';') for x in tmp]
+                x = [x for x in sqlparse.split(tmp)]
                 if str(x[0]).lstrip().startswith('use'):
                     del x[0]
-                sql = ';'.join(x)
+                sql = ''.join(x)
                 sql = sql.strip(' ').rstrip(';')
                 workId = util.workId()
                 SqlOrder.objects.get_or_create(

webpage/src/components/audit/sqlAudit.vue

@@ -401,8 +401,7 @@
         this.tableData[index].status === 2 ? this.switch_show = true : this.switch_show = false
         axios.get(`${this.$config.url}/getsql?id=${this.formitem.id}&bundle_id=${this.formitem.bundle_id}`)
           .then(res => {
-            let tmpSql = res.data.sql.split(';')
-            for (let i of tmpSql) {
+            for (let i of JSON.parse(res.data.sql)) {
               this.sql.push({'sql': i})
             }
             this.formitem.computer_room = res.data.comRoom

webpage/src/components/home/home.vue

@@ -50,7 +50,7 @@
               <Col span="8">
                 <p class="notwrap">当前版本:</p>
               </Col>
-              <Col span="16" class="padding-left-8"> <a target="_Blank"  href="https://cookiey.github.io/Yearning-document/update/">v1.4.2</a></Col>
+              <Col span="16" class="padding-left-8"> <a target="_Blank"  href="https://cookiey.github.io/Yearning-document/update/">v1.4.4</a></Col>
             </Row>
           </Card>
         </Row>

webpage/src/components/management/databaseManager.vue

@@ -56,7 +56,7 @@
               <Button type="success" size="small" @click="dingInfoModal(row)" style="margin-right: 5px">钉钉消息</Button>
               <Poptip
                 confirm
-                title="确定要删除此连接名吗？"
+                title="删除数据源将会删除对应的所有工单信息,确定要删除吗？"
                 @on-ok="delConnection(row)">
                 <Button type="warning" size="small">删除</Button>
               </Poptip>

webpage/src/components/order/ddlOrder.vue

@@ -56,7 +56,7 @@ p {
                 <Button type="error" @click="canel()">重置</Button>
               </Form-item>
               <FormItem label="工单提交说明:" prop="text">
-                <Input v-model="formItem.text" placeholder="请输入工单说明"></Input>
+                <Input v-model="formItem.text" placeholder="请输入工单说明" type="textarea" rows="4"></Input>
               </FormItem>
               <FormItem label="指定审核人:" prop="assigned">
                 <Select v-model="formItem.assigned" filterable transfer>
@@ -459,7 +459,7 @@ export default {
     commitOrder () {
       this.$refs['formItem'].validate((valid) => {
         if (valid) {
-          let sql = this.formDynamic.replace(/(;|；)$/gi, '').replace(/\s/g, ' ').replace(/；/g, ';').split(';')
+          let sql = this.formDynamic.replace(/(;|；)$/gi, '').replace(/\s/g, ' ').replace(/；/g, ';')
           axios.post(`${this.$config.url}/sqlsyntax/`, {
             'data': JSON.stringify(this.formItem),
             'sql': JSON.stringify(sql),

webpage/src/components/order/dmlOrder.vue

@@ -44,7 +44,7 @@
                 </FormItem>
 
                 <FormItem label="工单说明:" prop="text">
-                  <Input v-model="formItem.text" placeholder="请输入"></Input>
+                  <Input v-model="formItem.text" placeholder="请输入" type="textarea" rows="4"></Input>
                 </FormItem>
 
                 <FormItem label="指定审核人:" prop="assigned">
@@ -323,7 +323,7 @@
         this.$refs['formItem'].validate((valid) => {
           if (valid) {
             if (this.formItem.textarea) {
-              this.datalist.sqllist = this.formItem.textarea.replace(/(;|；)$/gi, '').replace(/\s/g, ' ').replace(/；/g, ';').split(';')
+              this.datalist.sqllist = this.formItem.textarea.replace(/(;|；)$/gi, '').replace(/\s/g, ' ').replace(/；/g, ';')
               axios.post(`${this.$config.url}/sqlsyntax/`, {
                 'data': JSON.stringify(this.formItem),
                 'sql': JSON.stringify(this.datalist.sqllist),