diff --git a/.bk.development.env b/.bk.development.env index 7ba0299e6..550e1e6a9 100644 --- a/.bk.development.env +++ b/.bk.development.env @@ -21,6 +21,12 @@ BK_USER_MANAGE_HOST = // lesscode部署时环境区分(prod/stag) BK_LESSCODE_ENVIRONMENT = stag +// paas 相关url前缀， 如用户管理相关接口 +BK_COMPONENT_API_URL = + +// cookie domian +BKPAAS_BK_DOMAIN = + // itsm 地址 BK_ITSM_URL = diff --git a/.bk.production.env b/.bk.production.env index 728dddcdb..72eb7b4de 100644 --- a/.bk.production.env +++ b/.bk.production.env @@ -18,6 +18,12 @@ BK_USER_MANAGE_HOST = ${BK_USER_MANAGE_URL} // lesscode部署时环境区分(prod/stag) BK_LESSCODE_ENVIRONMENT = ${BKPAAS_ENVIRONMENT} +/ paas 相关url前缀， 如用户管理相关接口 +BK_COMPONENT_API_URL = {{ BK_COMPONENT_API_URL }} + +// cookie domian +BKPAAS_BK_DOMAIN = {{ BKPAAS_BK_DOMAIN }} + // apigateway 地址 BK_API_GATEWAY_ORIGIN = ${BK_API_URL_TMPL} diff --git a/bk.config.js b/bk.config.js index 21f6a769f..98475e05c 100644 --- a/bk.config.js +++ b/bk.config.js @@ -67,6 +67,9 @@ module.exports = { { from: /^\/$/, to: '/index.html' }, { from: /^\/preview\//, to: '/preview.html' } ] + }, + client: { + overlay: false } }, optimization: { @@ -137,6 +140,10 @@ module.exports = { .loader(require.resolve('vue-markdown-loader/lib/markdown-compiler')) .options(mdLoaderOption) + config.module.rule('txt') + .test(/\.txt/) + .set('type', 'asset/source') + config.plugin('Buffer') .use( webpack.ProvidePlugin, diff --git a/lib/client/index.html b/lib/client/index.html index 6a0a2da89..8e0680e2f 100644 --- a/lib/client/index.html +++ b/lib/client/index.html @@ -29,6 +29,8 @@ + + + diff --git a/lib/client/src/components/api/create-api-sideslider/header.vue b/lib/client/src/components/api/create-api-sideslider/header.vue new file mode 100644 index 000000000..224d49cc4 --- /dev/null +++ b/lib/client/src/components/api/create-api-sideslider/header.vue @@ -0,0 +1,83 @@ + + + diff --git a/lib/client/src/components/api/create-api-sideslider/index.vue b/lib/client/src/components/api/create-api-sideslider/index.vue index 53426ad91..0ad8f8798 100644 --- a/lib/client/src/components/api/create-api-sideslider/index.vue +++ b/lib/client/src/components/api/create-api-sideslider/index.vue @@ -17,30 +17,45 @@ :form-data="formData" @update="handleUpdate" /> +

{{ $t('默认请求头') }}

+

{{ $t('默认请求参数') }}

-

- {{ $t('默认请求响应') }} - {{ $t('获取请求响应') }} -

+

{{ $t('默认请求响应') }}

+ > + {{ $t('获取请求响应') }} +
import RenderBasic from './basic.vue' + import RenderHeader from './header.vue' import RenderParam from './param.vue' import RenderResponse from './response.vue' import { @@ -82,10 +98,12 @@ import { leaveConfirm } from '@/common/leave-confirm' + // import useResource from '@/hooks/use-resource' export default defineComponent({ components: { RenderBasic, + RenderHeader, RenderParam, RenderResponse }, @@ -107,14 +125,24 @@ }, setup (props, { emit }) { + // const { + // getApiList, + // getFunctionList, + // getProjectVariableList + // } = useResource() // 状态 const isSubmitting = ref(false) const isLoadingResponse = ref(false) + const variableList = ref([]) + const functionList = ref([]) + const apiList = ref([]) const formData = ref({}) const response = ref() const basicRef = ref(null) + const headerRef = ref(null) const paramRef = ref(null) const responseRef = ref(null) + // use data const store = useStore() const route = useRoute() @@ -144,6 +172,7 @@ Promise .all([ basicRef.value?.validate(), + headerRef.value?.validate(), paramRef.value?.validate(), responseRef.value?.validate() ]) @@ -162,12 +191,14 @@ validate() .then(([ basicData, + headerData, paramData, responseData ]) => { const form = { projectId: route.params.projectId, ...basicData, + ...headerData, ...paramData, ...responseData } @@ -215,21 +246,33 @@ validate() .then(([ basicData, + headerData, paramData ]) => { + // http data let apiData = {} if (paramKey.value === 'query') { paramData.query.forEach((queryItem) => { - apiData[queryItem.name] = parseScheme2Value(queryItem) + if (queryItem.name) { + apiData[queryItem.name] = parseScheme2Value(queryItem) + } }) } else { apiData = parseScheme2Value(paramData.body) } + // http header + const header = headerData.header?.reduce?.((acc, cur) => { + if (cur.name) { + acc[cur.name] = parseScheme2Value(cur) + } + return acc + }, {}) || {} const httpData = { url: basicData.url, type: basicData.method, apiData, - withToken: basicData.withToken + withToken: basicData.withToken, + header } isLoadingResponse.value = true return store @@ -256,12 +299,28 @@ } ) + // onBeforeMount(() => { + // Promise.all([ + // getApiList(), + // getFunctionList(), + // getProjectVariableList() + // ]).then(([api, fun, vars]) => { + // apiList.value = api + // functionList.value = fun + // variableList.value = vars + // }) + // }) + return { isSubmitting, isLoadingResponse, + variableList, + functionList, + apiList, formData, response, basicRef, + headerRef, paramRef, responseRef, paramKey, @@ -297,7 +356,4 @@ .api-footer { padding-left: 30px; } - .api-response-button { - font-weight: normal; - } diff --git a/lib/client/src/components/api/create-api-sideslider/param.vue b/lib/client/src/components/api/create-api-sideslider/param.vue index bea53f340..49d60ccb4 100644 --- a/lib/client/src/components/api/create-api-sideslider/param.vue +++ b/lib/client/src/components/api/create-api-sideslider/param.vue @@ -3,6 +3,9 @@ ref="editObjectRef" :params="renderParams" :is="renderComponent" + :variable-list="variableList" + :function-list="functionList" + :api-list="apiList" @change="handleParamsChange" /> @@ -30,7 +33,10 @@ }, props: { - formData: Object + formData: Object, + variableList: Array, + functionList: Array, + apiList: Array }, setup (props, { emit }) { diff --git a/lib/client/src/components/api/create-api-sideslider/response.vue b/lib/client/src/components/api/create-api-sideslider/response.vue index 4a16cd31a..a5a7e3591 100644 --- a/lib/client/src/components/api/create-api-sideslider/response.vue +++ b/lib/client/src/components/api/create-api-sideslider/response.vue @@ -3,8 +3,15 @@ ref="editObjectRef" :params="formData.response" :response="response" + :variable-list="variableList" + :function-list="functionList" + :api-list="apiList" @change="handleResponseChange" - /> + > + + diff --git a/lib/client/src/components/api/edit-scheme/post.vue b/lib/client/src/components/api/edit-scheme/post.vue index 1098a39d1..f0ff05b93 100644 --- a/lib/client/src/components/api/edit-scheme/post.vue +++ b/lib/client/src/components/api/edit-scheme/post.vue @@ -3,6 +3,9 @@ :tabs="tabs" :active.sync="activeTab" > +
@@ -46,7 +53,10 @@ }, props: { - params: Object + params: Object, + variableList: Array, + functionList: Array, + apiList: Array }, setup (props, { emit }) { diff --git a/lib/client/src/components/api/edit-scheme/response.vue b/lib/client/src/components/api/edit-scheme/response.vue index 7cf3f768c..d1c6fdc8f 100644 --- a/lib/client/src/components/api/edit-scheme/response.vue +++ b/lib/client/src/components/api/edit-scheme/response.vue @@ -3,12 +3,19 @@ :tabs="tabs" :active.sync="activeTab" > +
@@ -49,7 +56,10 @@ props: { params: Object, - response: [Object, Array, String, Number] + response: [Object, Array, String, Number], + variableList: Array, + functionList: Array, + apiList: Array }, setup (props, { emit }) { diff --git a/lib/client/src/components/api/use-scheme/get.vue b/lib/client/src/components/api/use-scheme/get.vue index e7efcc513..06dac5b9c 100644 --- a/lib/client/src/components/api/use-scheme/get.vue +++ b/lib/client/src/components/api/use-scheme/get.vue @@ -3,8 +3,11 @@ :tabs="tabs" :active.sync="activeTab" > +
- + { renderQueryParams.value.splice(index + 1, 0, getDefaultApiUseScheme()) - triggleChange() + triggerChange() } const handleMinusNode = (index) => { renderQueryParams.value.splice(index, 1) - triggleChange() + triggerChange() } const handleUpdate = (index, param) => { renderQueryParams.value[index] = param - triggleChange() + triggerChange() } - const triggleChange = () => { + const triggerChange = () => { emit('change', renderQueryParams.value) } diff --git a/lib/client/src/components/api/use-scheme/header.vue b/lib/client/src/components/api/use-scheme/header.vue new file mode 100644 index 000000000..e2b29b574 --- /dev/null +++ b/lib/client/src/components/api/use-scheme/header.vue @@ -0,0 +1,140 @@ + + + diff --git a/lib/client/src/components/api/use-scheme/post.vue b/lib/client/src/components/api/use-scheme/post.vue index ed4cd2778..9d736871b 100644 --- a/lib/client/src/components/api/use-scheme/post.vue +++ b/lib/client/src/components/api/use-scheme/post.vue @@ -3,8 +3,11 @@ :tabs="tabs" :active.sync="activeTab" > +
- + @@ -54,7 +62,14 @@ renderSlot: Function, getParamVal: Function, disabled: Boolean, - nameOptions: Array + nameOptions: Array, + variableList: Array, + functionList: Array, + apiList: Array, + showRule: { + type: Boolean, + default: true + } }, setup (props, { emit }) { diff --git a/lib/client/src/components/api/use-scheme/response.vue b/lib/client/src/components/api/use-scheme/response.vue index 4836f316d..4a0f4d93f 100644 --- a/lib/client/src/components/api/use-scheme/response.vue +++ b/lib/client/src/components/api/use-scheme/response.vue @@ -1,12 +1,17 @@ - + \ No newline at end of file diff --git a/lib/client/src/components/flow/nodeConfig/nodes/api-node/index.vue b/lib/client/src/components/flow/nodeConfig/nodes/api-node/index.vue index 2b60a719a..897eb7cba 100644 --- a/lib/client/src/components/flow/nodeConfig/nodes/api-node/index.vue +++ b/lib/client/src/components/flow/nodeConfig/nodes/api-node/index.vue @@ -48,7 +48,7 @@

{{`1.${$t('非蓝鲸网关API，请先接入')}【${$t('蓝鲸网关')}】`}}

{{`2.${$t('确保选择的蓝鲸网关API给蓝鲸应用ID')}【${BKPAAS_ENGINE_REGION === 'default' ? 'bk-itsm' : 'bkc-itsm'}】${$t('已授权并设置了用户免认证策略')}`}}

-

{{`3.${$t('请求地址可使用{{变量名}}引用流程上下文变量，比如')}http://host/${id}`}} +

{{`3.${$t('请求地址可使用\{\{变量名\}\}引用流程上下文变量，比如')}http://host/\$\{id\}`}} + +

+ +
+ -
@@ -107,6 +116,7 @@ style="margin-top: 16px;">
@@ -126,6 +136,7 @@ import BodyParams from './body-params.vue' import ResponseVariable from './response-variable.vue' import { API_METHOD, METHODS_WITHOUT_DATA, parseScheme2UseScheme } from 'shared/api' + import { transformItsmHeader2Scheme } from 'shared/no-code' import { messageError } from '@/common/bkmagic' export default { @@ -222,7 +233,7 @@ if (apiInfo.url) { const { selectedApi, url, method, headers, query, body, response } = apiInfo this.formData = { ...this.formData, selectedApi, url, method } - this.apiHeaders = headers || [] + this.apiHeaders = this.transOldHeaderData(headers || []) this.apiQuery = query this.apiBody = body this.apiResponse = response @@ -271,6 +282,14 @@ this.lesscodeApiUrlToUpdate = apiData.url } }, + // 兼容旧数据 + // 旧版本header配置未使用统一组件，数据以itsm格式保存 + transOldHeaderData (headers) { + if (headers.length > 0 && headers[0].hasOwnProperty('key') && !headers[0].hasOwnProperty('id')) { + return transformItsmHeader2Scheme(headers) + } + return headers + }, handleNameChange (val) { this.$store.commit('nocode/nodeConfig/setNodeName', val) }, @@ -304,12 +323,18 @@ this.handleParamsChange('apiResponse', scheme) }, validate () { + const paramsRef = METHODS_WITHOUT_DATA.includes(this.formData.method) ? this.$refs.queryRef : this.$refs.bodyRef return Promise.all([ this.$refs.basicForm.validate(), - this.$refs.processorsForm.validate() + this.$refs.processorsForm.validate(), + this.$refs.headerRef.validate(), + paramsRef.validate(), + this.$refs.responseRef.validate() ]).then((result) => { + console.log('validate result: ', result) return result.every(item => item === true) }).catch((e) => { + console.log('validate error: ', e) return false }) }, diff --git a/lib/client/src/components/flow/nodeConfig/nodes/api-node/query-params.vue b/lib/client/src/components/flow/nodeConfig/nodes/api-node/query-params.vue index 6652531d8..9a7c98f99 100644 --- a/lib/client/src/components/flow/nodeConfig/nodes/api-node/query-params.vue +++ b/lib/client/src/components/flow/nodeConfig/nodes/api-node/query-params.vue @@ -1,6 +1,8 @@ diff --git a/lib/client/src/components/render-nocode/form/index.vue b/lib/client/src/components/render-nocode/form/index.vue index 8682b3bbd..a27308674 100644 --- a/lib/client/src/components/render-nocode/form/index.vue +++ b/lib/client/src/components/render-nocode/form/index.vue @@ -81,7 +81,7 @@ formId, pageCode: pageCode + 'manage', pageName: pageName + '_' + this.$t('表单数据管理页'), - content: JSON.stringify({ filters: [], tableConfig: ['createUser', 'createTime'] }) + content: JSON.stringify({ filters: [], tableColsExclude: ['updateUser', 'updateTime'] }) } } }, diff --git a/lib/client/src/components/render-nocode/markdown/index.vue b/lib/client/src/components/render-nocode/markdown/index.vue index aacc97869..00986d8a9 100644 --- a/lib/client/src/components/render-nocode/markdown/index.vue +++ b/lib/client/src/components/render-nocode/markdown/index.vue @@ -1,11 +1,12 @@ - - -
- {{ $t('公共') }} -
- +
@@ -73,6 +76,7 @@ import GroupBox from '../../common/group-box' import SearchBox from '../../common/search-box' import RenderCustomComponent from '../../common/group-box/render-custom-component' + import { CUSTOM_COMPS_TYPE } from '@/common/constant' export default { name: '', @@ -85,7 +89,7 @@ return { isLoading: false, favoriteComponentList: [], - publicComponentList: [], + publicComponentMap: {}, groupComponentMap: {}, renderGroupComponentMap: {}, searchList: [], @@ -112,9 +116,10 @@ return result }, {}) const favoriteComponentList = [] - const publicComponentList = [] + const publicComponentMap = {} const groupComponentMap = {} const searchList = [] + const customCompsType = CUSTOM_COMPS_TYPE window.customCompontensPlugin.forEach(registerCallback => { const [ config,, @@ -133,7 +138,11 @@ return } if (baseInfo.isPublic) { - publicComponentList.push(realConfig) + const type = customCompsType.find(item => item.id === baseInfo.publicType) + if (!publicComponentMap[type?.name]) { + publicComponentMap[type?.name] = [] + } + publicComponentMap[type.name].push(realConfig) return } if (!groupComponentMap[baseInfo.category]) { @@ -142,12 +151,12 @@ groupComponentMap[baseInfo.category].push(realConfig) }) this.favoriteComponentList = Object.freeze(favoriteComponentList) - this.publicComponentList = Object.freeze(publicComponentList) + this.publicComponentMap = Object.freeze(publicComponentMap) this.groupComponentMap = Object.freeze(groupComponentMap) this.renderGroupComponentMap = Object.freeze({ '我的收藏': this.favoriteComponentList, - '其他应用公开的组件': this.publicComponentList, - ...this.groupComponentMap + ...this.groupComponentMap, + ...this.publicComponentMap }) this.searchList = Object.freeze(searchList) } finally { @@ -177,8 +186,8 @@ this.isSearch = false this.renderGroupComponentMap = Object.freeze({ '我的收藏': this.favoriteComponentList, - '其他应用公开的组件': this.publicComponentList, - ...this.groupComponentMap + ...this.groupComponentMap, + ...this.publicComponentMap }) return } diff --git a/lib/client/src/views/index/components/material-panel/components/panel-component/components/select-base-component.vue b/lib/client/src/views/index/components/material-panel/components/panel-component/components/select-base-component.vue index b432f38fd..e2b1cb249 100644 --- a/lib/client/src/views/index/components/material-panel/components/panel-component/components/select-base-component.vue +++ b/lib/client/src/views/index/components/material-panel/components/panel-component/components/select-base-component.vue @@ -1,46 +1,48 @@ diff --git a/lib/client/src/views/index/components/material-panel/components/panel-component/index.vue b/lib/client/src/views/index/components/material-panel/components/panel-component/index.vue index 47310d988..421a530ec 100644 --- a/lib/client/src/views/index/components/material-panel/components/panel-component/index.vue +++ b/lib/client/src/views/index/components/material-panel/components/panel-component/index.vue @@ -11,7 +11,7 @@ class="tab-item" :class="{ active: tab === 'customComponent' }" @click="handleChangeTab('customComponent')"> - {{ $t('自定义组件') }} + {{ $t('自定义组件') }}
@@ -106,9 +106,9 @@ @mixin ellipsis 110px; } .toggle-icon { - line-height: 42px; overflow: hidden; display: inline-block; + padding-top: 1px; } } } diff --git a/lib/client/src/views/index/components/material-panel/components/select-panel/index.vue b/lib/client/src/views/index/components/material-panel/components/select-panel/index.vue index e1149121b..df4fac2c9 100644 --- a/lib/client/src/views/index/components/material-panel/components/select-panel/index.vue +++ b/lib/client/src/views/index/components/material-panel/components/select-panel/index.vue @@ -9,19 +9,25 @@ v-bk-tooltips.right="panel.tips" :role="`${panel.key}-panel-tab`" @click="handleChange(panel.key)"> - + +
- - diff --git a/lib/client/src/views/system/components/create-empty-project-dialog.vue b/lib/client/src/views/system/components/create-empty-project-dialog.vue index 76d2ef957..ef82d7a0d 100644 --- a/lib/client/src/views/system/components/create-empty-project-dialog.vue +++ b/lib/client/src/views/system/components/create-empty-project-dialog.vue @@ -15,6 +15,7 @@ v-bk-tooltips.top="{ content: $t('创建Lesscode应用时，会同步在PaaS平台-开发者中心创建应用的default模块'), maxWidth: 400 }"> +
{{ $t('已选模板：{0}', [selectTemplateName]) }}
diff --git a/lib/client/src/views/system/components/project-form.vue b/lib/client/src/views/system/components/project-form.vue index f4da37c05..67e74ba0d 100644 --- a/lib/client/src/views/system/components/project-form.vue +++ b/lib/client/src/views/system/components/project-form.vue @@ -1,7 +1,7 @@