merge develop to master

bk.config.js

@@ -45,7 +45,8 @@ module.exports = {
                     VueI18n: path.resolve(__dirname, './node_modules/vue-i18n')
                 },
                 fallback: {
-                    buffer: require.resolve('buffer')
+                    buffer: require.resolve('buffer'),
+                    vm: require.resolve('vm-browserify')
                 }
             },
             devServer: {

lib/client/src/api/pureAxios.js

@@ -105,7 +105,11 @@ async function getPromise (method, url, data, userConfig = {}) {
         try {
             const response = await axiosRequest
             Object.assign(config, response.config || {})
-            handleResponse({ config, response, resolve, reject })
+            if (Object.prototype.hasOwnProperty.call(response, 'code') && response.code !== 0) {
+                reject(response)
+            } else {
+                handleResponse({ config, response, resolve, reject })
+            }
         } catch (error) {
             Object.assign(config, error.config)
             reject(error)

lib/client/src/common/ai.js

@@ -56,15 +56,19 @@ export class Ai {
         this.pushPrompt(this.systemPrompt, 'system')
     }
 
-    receiveMessage (message) {
-        this.content += message
+    receiveMessage (message, cover) {
+        this.content = cover ? message : this.content + message
         const cmdIndex = this.content.indexOf('``')
         const aiMessage = cmdIndex > 0 ? this.content.slice(0, cmdIndex).trim() : this.content
         // 触发消息更新
         this.handleMessage(aiMessage, this.content)
     }
 
     async endReceiveMessage () {
+        if (!this.content.trim()) {
+            this.handleApiError('模型调用失败，返回空文本')
+            return
+        }
         this.pushPrompt(this.content, 'assistant')
         // 触发指令
         const cmdIndex = this.content.indexOf('``')
@@ -127,27 +131,44 @@ export class Ai {
             while (true) {
                 try {
                     const { value, done } = await reader.read()
-                    if (done) break
-                    const values = (temp + value.toString()).split(/(?<=})\s*(?={"result")/)
+                    // 接口异常处理
+                    if (!response.ok) {
+                        this.handleApiError(value || response.statusText)
+                        break
+                    }
+                    // 接口完成
+                    if (done) {
+                        this.endReceiveMessage()
+                        break
+                    }
+                    const values = (temp + value.toString()).split('\n')
                     values.forEach((value) => {
-                        const item = value.trim()
+                        const item = value.replace('data:', '').trim()
                         if (isJSON(item)) {
                             const {
+                                event,
+                                content,
+                                cover,
                                 result,
-                                data,
                                 message
                             } = JSON.parse(item)
-                            if (result === true) {
-                                const choice = data?.result?.choices?.[0]
-                                if (!choice) {
-                                    this.handleApiError('模型调用失败，返回对象为空')
-                                } else if (choice.finish_reason) {
-                                    this.endReceiveMessage()
-                                } else if (choice.delta.content) {
-                                    this.receiveMessage(choice.delta.content)
-                                }
-                            } else {
+
+                            // 业务错误处理
+                            if (result === false || response.status !== 200) {
                                 this.handleApiError(message || '模型调用失败')
+                                return
+                            }
+
+                            switch (event) {
+                                case 'text':
+                                    this.receiveMessage(content, cover)
+                                    break
+                                case 'done':
+                                    this.endReceiveMessage()
+                                    break
+                                case 'error':
+                                    this.handleApiError(message || '模型调用失败')
+                                    break
                             }
                             temp = ''
                         } else if (item) {
@@ -182,7 +203,7 @@ export class Ai {
                 if (!choice) {
                     this.handleApiError('模型调用失败，返回对象为空')
                 } else {
-                    this.receiveMessage(choice.message.content)
+                    this.receiveMessage(choice.delta.content)
                     this.endReceiveMessage()
                 }
             } else {

lib/client/src/common/util.js

@@ -11,6 +11,7 @@
 
 import { messageSuccess } from '@/common/bkmagic'
 import domToImage from './dom-to-image'
+import DOMPurify from 'dompurify'
 import Vue from 'vue'
 import LC from '@/element-materials/core'
 import store from '@/store'
@@ -1025,3 +1026,8 @@ export const isJSON = (str) => {
         return false
     }
 }
+
+export const filterImgSrc = (src) => {
+    src?.replaceAll('console', '')?.replaceAll('logout', '')
+    return DOMPurify.sanitize(src)
+}

lib/client/src/components/methods/forms/form-items/children/debug/param.vue

@@ -98,7 +98,8 @@
                             break
                         case 'array':
                         case 'object':
-                            renderVal = getValueFromString(val)
+                            // renderVal = getValueFromString(val)
+                            renderVal = val
                             break
                         case 'number':
                             renderVal = Number(val)

lib/client/src/components/project/create-page-dialog.vue

@@ -112,6 +112,10 @@
                 type: String,
                 default: ''
             },
+            useCustomSave: {
+                type: Boolean,
+                default: false
+            },
             // form和flow的数据管理页需要填写默认的pageCode和pageName，带上formId或flowId
             initPageData: {
                 type: Object,
@@ -249,7 +253,7 @@
             },
             handleConfirmClick () {
                 // 判断是不是流程页面或流程管理页面
-                if (['FLOW', 'FLOW_MANAGE'].includes(this.nocodeType)) {
+                if (this.useCustomSave || ['FLOW', 'FLOW_MANAGE'].includes(this.nocodeType)) {
                     this.$emit('save')
                 } else {
                     this.save()
@@ -284,12 +288,7 @@
                         content.push(JSON.parse(template.content))
                         templateFormData = { previewImg: template.previewImg, content: JSON.stringify(content) }
                     }
-
-                    const formData = {
-                        pageName: this.formData.pageName,
-                        pageCode: this.formData.pageCode
-                    }
-
+
                     const payload = {
                         data: {
                             pageData: Object.assign({}, this.formData, templateFormData),
@@ -307,7 +306,7 @@
                     const res = await this.$store.dispatch('page/create', payload)
                     if (res) {
                         // 页面不是流程页面或流程管理页面
-                        if (!['FLOW', 'FLOW_MANAGE'].includes(this.nocodeType)) {
+                        if (!this.useCustomSave && !['FLOW', 'FLOW_MANAGE'].includes(this.nocodeType)) {
                             this.$bkMessage({
                                 theme: 'success',
                                 message: this.$t('新建页面成功')

lib/client/src/components/project/page-from-template.vue

@@ -73,6 +73,7 @@
     import PreivewErrImg from '@/images/preview-error.png'
     import { PAGE_TEMPLATE_TYPE } from '@/common/constant'
     import TemplateEditDialog from '@/views/project/template-manage/components/template-edit-dialog'
+    import { filterImgSrc } from '@/common/util'
 
     export default {
         name: 'page-from-template',
@@ -160,7 +161,7 @@
             },
             getPreviewImg (previewImg) {
                 if (previewImg && previewImg.length > 20) {
-                    return previewImg
+                    return filterImgSrc(previewImg)
                 }
                 return PreivewErrImg
             },

lib/client/src/components/render/pc/render-component.js

@@ -19,6 +19,7 @@ import WidgetVanPicker from './widget/van-picker'
 import WidgetFormContainer from './widget/form-container'
 import WidgetDataManageContainer from './widget/data-manage-container/form-data-manage/edit/index'
 import WidgetFlowManageContainer from './widget/flow-manage-container/edit/index'
+import WidgetFlowWorkbenchContainer from './widget/flow-workbench-container/edit/index'
 import WidgetVanTab from './widget/van-tab'
 import BkCharts from './widget/bk-charts/bk-charts'
 import Chart from './widget/chart/chart'
@@ -53,6 +54,7 @@ export default {
         WidgetFormContainer,
         WidgetDataManageContainer,
         WidgetFlowManageContainer,
+        WidgetFlowWorkbenchContainer,
         WidgetVanTab,
         BkLuckyCanvas
     },

lib/client/src/components/render/pc/tools/lesscode-tool/hooks/use-check-form-engine.js

@@ -1,3 +1,3 @@
 export default function (type) {
-    return ['widget-form-container', 'widget-data-manage-container'].includes(type)
+    return ['widget-form-container', 'widget-data-manage-container', 'widget-flow-manage-container', 'widget-flow-workbench-container'].includes(type)
 }

lib/client/src/components/render/pc/widget/data-manage-container/form-data-manage/edit/components/table/index.postcss

@@ -3,9 +3,6 @@
 
     /* v3 table 样式 */
     .bk-lesscode-table {
-        .bk-lesscode-table-head table th.column_fixed {
-            background: inherit;
-        }
         .bk-lesscode-table-body {
             overflow: visible;
         }

lib/client/src/components/render/pc/widget/data-manage-container/form-data-manage/preview/components/table/index.js

@@ -181,9 +181,10 @@ export default {
         return h({
             component: 'bk-table',
             props: {
+                border: framework === 'vue2' ? false : ['outer', 'row'],
                 data: this.tableData,
                 pagination: this.pagination,
-                remotePagination: true,
+                remotePagination: true
             },
             on: {
                 'page-change': (val) => {
@@ -193,6 +194,7 @@ export default {
                     self.handlePageChange(val)
                 },
                 'page-limit-change': (val) => {
+                    self.pagination.current = 1
                     self.handlePageLimitChange(val)
                 }
             },

lib/client/src/components/render/pc/widget/data-manage-container/form-data-manage/preview/index.js

@@ -69,7 +69,7 @@ export default {
             component: 'div',
             class: 'widget-data-manage-container',
             children: this.loading ? null : [
-                h({
+                (this.buttons.length > 0 || this.filters.length > 0) ? h({
                     component: 'div',
                     class: 'data-manage-operate-area',
                     children: [
@@ -97,7 +97,7 @@ export default {
                             ]
                         }) : null
                     ]
-                }),
+                }) : null,
                 (this.hideFilters || this.filters.length === 0) ? null : h({
                     component: filters,
                     props: {

lib/client/src/components/render/pc/widget/data-manage-container/form-data-manage/preview/index.postcss

@@ -27,4 +27,10 @@
             color: #3a84ff;
         }
     }
+    .bk-lesscode-table {
+        border-bottom: 1px solid #dcdee5;
+        .bk-lesscode-table-body tbody tr td {
+            border-bottom-color: #dcdee5;
+        }
+    }
 }

lib/client/src/components/render/pc/widget/flow-manage-container/edit/flow-manage-container.postcss

@@ -4,6 +4,10 @@
     background: #FFFFFF;
     border: 1px dashed #CCCCCC;
     overflow: hidden;
+    .flow-manage-title {
+        font-size: 16px;
+        color: #313238;
+    }
     &.empty{
         padding: 24px 32px;
         background: #F9F8FC;
@@ -28,7 +32,8 @@
             pointer-events: auto !important;
         }
     }
-    .process-render {
+    .process-render * {
+        pointer-events: auto !important;
         .filter-render-wrapper {
             padding: 16px 24px;
             background: #FAFBFC;
@@ -120,4 +125,10 @@
             }
         }
     }
+    .bk-lesscode-table {
+        border-bottom: 1px solid #dcdee5;
+        .bk-lesscode-table-body tbody tr td {
+            border-bottom-color: #dcdee5;
+        }
+    }
 }