diff --git a/LICENSE.txt b/LICENSE.txt index cdaf9c141..70d446f9a 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,5 @@ Tencent is pleased to support the open source community by making 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition) available. -Copyright (C) 2017-2018 THL A29 Limited, a Tencent company. All rights reserved. +Copyright (C) 2025 Tencent. All rights reserved. If you have downloaded a copy of the 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition) binary from Tencent, please note that the 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition) binary is licensed under the MIT License. If you have downloaded a copy of the 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition) source code from Tencent, please note that 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition) source code is licensed under the MIT License, except for the third-party components listed below which are subject to different license terms. Your integration of 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition) into your own projects may require compliance with the MIT License, as well as the other licenses applicable to the third-party components included within 蓝鲸智云PaaS平台社区版 (BlueKing PaaS Community Edition). A copy of the MIT License is included in this file. @@ -8,7 +8,7 @@ A copy of the MIT License is included in this file. Other dependencies and licenses: Open Source Software Licensed Under the BSD 3-Clause License: -The below software in this distribution may have been modified by THL A29 Limited (“Tencent Modifications”). All Tencent Modifications are Copyright (C) 2017-2018 THL A29 Limited. +The below software in this distribution may have been modified by Tencent. ---------------------------------------------------------------------------------------- 1. Django 1.8.11 Copyright (c) Django Software Foundation and individual contributors. diff --git a/bk.config.js b/bk.config.js index cc0d0916e..f65a4b42b 100644 --- a/bk.config.js +++ b/bk.config.js @@ -1,5 +1,6 @@ const mdLoaderOption = require('./scripts/mark-dowm/md-loader-option') +const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin') const path = require('path') const webpack = require('webpack') @@ -45,8 +46,7 @@ module.exports = { VueI18n: path.resolve(__dirname, './node_modules/vue-i18n') }, fallback: { - buffer: require.resolve('buffer'), - vm: require.resolve('vm-browserify') + buffer: require.resolve('buffer') } }, devServer: { @@ -118,6 +118,13 @@ module.exports = { chunks: 'all', reuseExistingChunk: true }, + monaco: { + name: 'monaco-editor', + test: /monaco-editor/, + priority: 1, + chunks: 'all', + reuseExistingChunk: true + }, xlsxTypeormMoment: { name: 'xlsx-typeorm-moment', test: /(xlsx)|(typeorm)|(moment)/, @@ -152,6 +159,14 @@ module.exports = { Buffer: ['buffer', 'Buffer'] }] ) + config.plugin('monaco-editor') + .use(MonacoWebpackPlugin, [ + { + // 配置需要的语言和功能 + languages: ['javascript', 'css', 'html', 'typescript', 'sql'], + features: ['!gotoSymbol'] // 禁用某些功能 + } + ]) return config } } diff --git a/docs/develop/demo_com/x-script/components/utils/pop-manager.js b/docs/develop/demo_com/x-script/components/utils/pop-manager.js index fb4c1f198..51a45dc5a 100644 --- a/docs/develop/demo_com/x-script/components/utils/pop-manager.js +++ b/docs/develop/demo_com/x-script/components/utils/pop-manager.js @@ -1,11 +1,13 @@ // 获取唯一随机数 function uuid () { - let id = '' - const randomNum = Math.floor((1 + Math.random()) * 0x10000).toString(16).substring(1) + const cryptoObj = window.crypto + const array = new Uint32Array(4) + cryptoObj.getRandomValues(array) - for (let i = 0; i < 7; i++) { - id += randomNum + let id = '' + for (let i = 0; i < array.length; i++) { + id += array[i].toString(16).padStart(8, '0') } return id } @@ -124,7 +126,7 @@ function uuid () { document.body.style.overflow = 'hidden' }, hideModalMask: function () { - this.dialogMask.setAttribute('style', `display: none;`) + this.dialogMask.setAttribute('style', 'display: none;') document.body.style.overflow = '' }, __hideInstance: function (instance) { diff --git a/lib/client/index.html b/lib/client/index.html index 5ab44d81c..85e75bd03 100644 --- a/lib/client/index.html +++ b/lib/client/index.html @@ -1,6 +1,6 @@