Merge pull request #1409 from TencentBlueKing/develop

merge develop to master : v1.1.9

.bk.production.env

@@ -33,6 +33,7 @@ BK_API_GATEWAY_ORIGIN = ${BK_API_URL_TMPL}
 // 静态资源前缀
 BK_STATIC_URL = {{ BK_STATIC_URL }}
 
+
 // itsm 地址
 BK_ITSM_URL =
 

.gitignore

@@ -43,6 +43,7 @@ lib/server/conf/data-source.js
 lib/server/conf/encrypt-secret-key.js
 lib/server/conf/no-code.js
 lib/server/conf/iam.js
+lib/server/conf/flow.js
 
 !lib/server/project-template/project-init-code/bin
 lib/server/project-template/project-target*

lib/client/src/App.vue

@@ -19,6 +19,7 @@
     </section>
     <section v-else-if="authed">
         <div id="app" :class="systemCls">
+            <chrome-tips :domain="cookieDomain" />
             <notice-component :api-url="noticeUrl" @show-alert-change="showAlertChange" />
             <app-header></app-header>
             <div class="page-body" :style="{ height: bodyHeight }" >
@@ -38,17 +39,21 @@
     import ApplyPage from './components/apply-permission/apply-page.vue'
     import NoticeComponent from '@blueking/notice-component-vue2'
     import '@blueking/notice-component-vue2/dist/style.css'
+    import ChromeTips from '@blueking/chrome-tips/vue2'
+    import '@blueking/chrome-tips/vue2/vue2.css'
 
     import { getPlatformConfig, setDocumentTitle, setShortcutIcon } from '@blueking/platform-config';
 
     export default {
         name: 'app',
         components: {
             ApplyPage,
-            NoticeComponent
+            NoticeComponent,
+            ChromeTips
         },
         data () {
             return {
+                cookieDomain: window.BKPAAS_BK_DOMAIN,
                 noticeUrl: `${process.env.BK_AJAX_URL_PREFIX}/notice-center/getNoticeList`,
                 systemCls: 'mac',
                 position: 'middle',

lib/client/src/common/chart-color-sets.js

@@ -34,6 +34,20 @@ const colorSets = [
             '#d2f5a6',
             '#76f2f2'
         ]
+    },
+    {
+        name: 'echartsDef',
+        list: [
+            '#5470c6',
+            '#91cc75',
+            '#fac858',
+            '#ee6666',
+            '#73c0de',
+            '#3ba272',
+            '#fc8452',
+            '#9a60b4',
+            '#ea7ccc'
+        ]
     }
 ]
 

lib/client/src/common/constant-en.js

@@ -1 +1 @@
-export const FOLD_MENU_ROUTE_LIST = ['new', 'editNocode', 'createTicketPageEdit', 'flowConfig', 'flowAdvancedConfig']
+export const FOLD_MENU_ROUTE_LIST = ['new', 'editNocode', 'createTicketPageEdit', 'flowConfig', 'flowAdvancedConfig', 'flowTplCanvas', 'flowTplConfig']

lib/client/src/common/use-resource-lock.js

@@ -2,14 +2,16 @@ import {
     computed,
     getCurrentInstance,
     onBeforeUnmount
-} from '@vue/composition-api'
+} from 'vue'
 import { useStore } from '@/store'
+import { useRoute } from '@/router'
 import { bkNotify, bkMessage } from 'bk-magic-vue'
 
 let lockNotify = ''
 
 export default function () {
     const store = useStore()
+    const route = useRoute()
 
     const currentInstance = getCurrentInstance()
 
@@ -35,8 +37,12 @@ export default function () {
      * @desc 主动释放编辑权
      */
     const release = (params) => {
-        Object.assign(params, { activeUser: userInfo.value.username })
-        store.dispatch('resourceLock/release', params)
+        Object.assign(params, { activeUser: userInfo.value.username, projectId: route.params.projectId })
+        const data = new FormData()
+        Object.keys(params).forEach((attr) => {
+            data.append(attr, params[attr])
+        })
+        navigator.sendBeacon('/api/resourceLock/release', data)
     }
     /**
      * @desc 个状态下的消息提示

lib/client/src/common/util.js

@@ -398,8 +398,9 @@ export function getWindowHeight () {
  *
  * @return {string} uuid
  */
-export function uuid (len = 5, radix = 16) {
-    const chars = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('')
+export function uuid (len = 5, radix = 16, lowercaseOnly = false) {
+    const allSets = lowercaseOnly ? 'abcdefghijklmnopqrstuvwxyz' : '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+    const chars = allSets.split('')
     const uuid = []
     radix = radix || chars.length
 

lib/client/src/components/api/choose-api.vue

@@ -40,7 +40,7 @@
                 }"
                 @click="chooseApi(data, node)"
             >
-                <span v-bk-tooltips="{ content: data.summary, maxWidth: 400 }">{{data.name}}</span>
+                <span v-bk-tooltips="{ content: data.summary, maxWidth: 400, allowHTML: false }">{{data.name}}</span>
                 <i
                     class="bk-drag-icon bk-drag-jump-link"
                     v-if="['lesscode-api', 'datasource-api', 'third-part-api'].includes(data.id)"
@@ -55,7 +55,7 @@
     import {
         defineComponent,
         ref
-    } from '@vue/composition-api'
+    } from 'vue'
     import { useStore } from '@/store'
     import { useRoute } from '@/router'
     import { getDataSourceApiList } from 'shared/data-source'

lib/client/src/components/api/common/scheme-tab.vue

@@ -25,7 +25,7 @@
 <script>
     import {
         defineComponent
-    } from '@vue/composition-api'
+    } from 'vue'
     
     export default defineComponent({
         props: {

lib/client/src/components/api/common/single-scheme.tsx

@@ -10,7 +10,7 @@ import {
     toRef,
     ref,
     getCurrentInstance
-} from '@vue/composition-api'
+} from 'vue'
 import useCustomValidate from '@/hooks/use-custom-validate'
 
 export default defineComponent({
@@ -220,7 +220,7 @@ export default defineComponent({
                                                     id={option.name}
                                                     name={option.name}
                                                     key={option.name}
-                                                    v-bk-tooltips={{ content: option.comment, disabled: !option.comment, maxWidth: 400 }}
+                                                    v-bk-tooltips={{ content: option.comment, disabled: !option.comment, maxWidth: 400, allowHTML: false }}
                                                 >
                                                 </bk-option>
                                             ))
@@ -304,7 +304,7 @@ export default defineComponent({
                     }
                     <bk-input
                         class="layout-middle"
-                        v-bk-tooltips={{ content: this.copyScheme.description, disabled: !this.copyScheme.description, maxWidth: 400 }}
+                        v-bk-tooltips={{ content: this.copyScheme.description, disabled: !this.copyScheme.description, maxWidth: 400, allowHTML: false }}
                         value={this.copyScheme.description}
                         disabled={this.finalDisable}
                         onChange={(description) => this.update({ description })}

lib/client/src/components/api/common/validate.vue

@@ -97,7 +97,7 @@
 <script>
     import {
         ref
-    } from '@vue/composition-api'
+    } from 'vue'
     import {
         API_VALIDATE_TYPES
     } from 'shared/api'

lib/client/src/components/api/create-api-sideslider/basic.vue

@@ -131,7 +131,7 @@
         defineComponent,
         ref,
         onBeforeMount
-    } from '@vue/composition-api'
+    } from 'vue'
     import useForm from './use-form'
     import { useStore } from '@/store'
     import { useRoute } from '@/router'

lib/client/src/components/api/create-api-sideslider/header.vue

@@ -14,7 +14,7 @@
         defineComponent,
         ref,
         watch
-    } from '@vue/composition-api'
+    } from 'vue'
     import {
         getDefaultApiEditScheme
     } from 'shared/api'

lib/client/src/components/api/create-api-sideslider/index.vue

@@ -92,7 +92,7 @@
         ref,
         watch,
         computed
-    } from '@vue/composition-api'
+    } from 'vue'
     import {
         parseScheme2Value,
         getDefaultApi,

lib/client/src/components/api/create-api-sideslider/param.vue

@@ -16,7 +16,7 @@
         ref,
         computed,
         watch
-    } from '@vue/composition-api'
+    } from 'vue'
     import {
         METHODS_WITHOUT_DATA,
         getDefaultApiEditScheme,

lib/client/src/components/api/create-api-sideslider/response.vue

@@ -17,7 +17,7 @@
 <script>
     import {
         defineComponent
-    } from '@vue/composition-api'
+    } from 'vue'
     import EditResponseScheme from '@/components/api/edit-scheme/response'
     import useForm from './use-form'
 

lib/client/src/components/api/create-api-sideslider/use-form.ts

@@ -1,6 +1,6 @@
 import {
     ref
-} from '@vue/composition-api'
+} from 'vue'
 
 export default (emit) => {
     const editObjectRef = ref(null)

lib/client/src/components/api/edit-scheme/get.vue

@@ -39,7 +39,7 @@
         watch,
         computed,
         getCurrentInstance
-    } from '@vue/composition-api'
+    } from 'vue'
     import SchemeTab from '../common/scheme-tab'
     import SchemeHeader from '../common/scheme-header'
     import SingleScheme from '../common/single-scheme'

lib/client/src/components/api/edit-scheme/header.vue

@@ -39,7 +39,7 @@
         watch,
         computed,
         getCurrentInstance
-    } from '@vue/composition-api'
+    } from 'vue'
     import SchemeTab from '../common/scheme-tab'
     import SchemeHeader from '../common/scheme-header'
     import SingleScheme from '../common/single-scheme'

lib/client/src/components/api/edit-scheme/post.vue

@@ -35,7 +35,7 @@
         watch,
         computed,
         getCurrentInstance
-    } from '@vue/composition-api'
+    } from 'vue'
     import SchemeTab from '../common/scheme-tab'
     import SchemeHeader from '../common/scheme-header'
     import SingleScheme from '../common/single-scheme'

lib/client/src/components/api/edit-scheme/response.vue

@@ -34,7 +34,7 @@
         ref,
         getCurrentInstance,
         watch
-    } from '@vue/composition-api'
+    } from 'vue'
     import SchemeTab from '../common/scheme-tab'
     import SchemeHeader from '../common/scheme-header'
     import SingleScheme from '../common/single-scheme'

lib/client/src/components/api/use-scheme/get.vue

@@ -44,7 +44,7 @@
         watch,
         computed,
         getCurrentInstance
-    } from '@vue/composition-api'
+    } from 'vue'
     import SchemeTab from '../common/scheme-tab'
     import SchemeHeader from '../common/scheme-header'
     import SingleScheme from '../common/single-scheme'

lib/client/src/components/api/use-scheme/header.vue

@@ -44,7 +44,7 @@
         watch,
         computed,
         getCurrentInstance
-    } from '@vue/composition-api'
+    } from 'vue'
     import SchemeTab from '../common/scheme-tab'
     import SchemeHeader from '../common/scheme-header'
     import SingleScheme from '../common/single-scheme'

lib/client/src/components/api/use-scheme/post.vue

@@ -40,7 +40,7 @@
         watch,
         computed,
         getCurrentInstance
-    } from '@vue/composition-api'
+    } from 'vue'
     import SchemeTab from '../common/scheme-tab'
     import SchemeHeader from '../common/scheme-header'
     import SingleScheme from '../common/single-scheme'

lib/client/src/components/api/use-scheme/response.vue

@@ -24,7 +24,7 @@
         watch,
         onMounted,
         getCurrentInstance
-    } from '@vue/composition-api'
+    } from 'vue'
     import SchemeHeader from '../common/scheme-header'
     import SingleScheme from '../common/single-scheme'
 

lib/client/src/components/app-header.vue

@@ -106,7 +106,7 @@
 </template>
 
 <script>
-    import { defineComponent, computed, ref } from '@vue/composition-api'
+    import { defineComponent, computed, ref } from 'vue'
     import { useStore } from '@/store'
     import { useRouter } from '@/router'
     import { IAM_ACTION } from 'shared/constant'

lib/client/src/components/changelog-version/changelog-data.js

@@ -1,4 +1,26 @@
 export default [
+    {
+        date: '2024.11.07',
+        detailList: [
+            {
+                reviseTitle: window.i18n.t('新增'),
+                logMassage: [
+                    window.i18n.t('流程: 流程模块重构、对接新的流程引擎'),
+                    window.i18n.t('画布: 组件属性进行分组'),
+                    window.i18n.t('画布: 补充组件缺少的属性'),
+                    window.i18n.t('画布: 组件事件增加简易中文描述'),
+                    window.i18n.t('画布: vue2组件升级到最新版本'),
+                    window.i18n.t('画布: echarts图表提供简易配置'),
+                    window.i18n.t('平台: 源码工程里面的vue升级到2.7.x版本')
+                ]
+            }, {
+                reviseTitle: window.i18n.t('修复'),
+                logMassage: [
+                    window.i18n.t('画布: 兼容当组件的数据中，含有连字符跟驼峰格式的的相同属性')
+                ]
+            }
+        ]
+    },
     {
         date: '2024.08.19',
         detailList: [

lib/client/src/components/changelog-version/index.vue

@@ -23,7 +23,7 @@
     </bk-version-detail>
 </template>
 <script>
-    import { defineComponent, ref, reactive } from '@vue/composition-api'
+    import { defineComponent, ref, reactive } from 'vue'
     import logMassageList from './changelog-data'
     export default defineComponent({
         setup () {

lib/client/src/components/choose-data-table.vue

@@ -160,7 +160,7 @@
         defineComponent,
         ref,
         onBeforeMount
-    } from '@vue/composition-api'
+    } from 'vue'
     import store from '@/store'
     import router from '@/router'
     import useDatasource from '@/hooks/use-datasource'