Merge remote-tracking branch 'open-tiny-engine/develop' into fix/auth-refresh

Author: lichunn

designer-demo/public/mock/bundle.json

@@ -0,0 +1,2 @@
+{"id":16,"createdBy":"6","lastUpdatedBy":"6","tenantId":"1","renterId":null,"siteId":null,"name":"dashboard","appWebsite":null,"platformHistoryId":"1","publishUrl":null,"editorUrl":null,"visitUrl":null,"assetsUrl":"template-cover-1","state":null,"homePage":null,"css":null,"config":{},"constants":null,"dataHandler":{},"description":"数据看板","latest":null,"gitGroup":null,"projectName":null,"branch":null,"isDemo":null,"isDefault":null,"templateType":null,"isTemplate":null,"industryId":null,"sceneId":null,"setTemplateTime":null,"setTemplateBy":null,"setDefaultBy":null,"framework":"Vue","defaultLang":null,"extendConfig":{},"dataHash":null,"canAssociate":null,"industry":[],"scene":[],"created_at":"2026-01-15 02:35:32","updated_at":"2026-01-15 02:35:32","platform":1,"image_url":null,"published":false,"global_state":[],"data_source_global":{},"_id":"epHKwpqjCPamtee4"}
+{"id":1,"createdBy":"1","lastUpdatedBy":"1","tenantId":"1","renterId":null,"siteId":"1","name":"portal-app","appWebsite":null,"platformHistoryId":"1","publishUrl":null,"editorUrl":null,"visitUrl":null,"assetsUrl":null,"state":null,"homePage":0,"css":null,"config":{},"constants":null,"dataHandler":{"type":"JSFunction","value":"function dataHanlder(res){\n return res;\n}"},"description":"demo应用","latest":"22","gitGroup":null,"projectName":null,"branch":"develop","isDemo":null,"isDefault":null,"templateType":"serviceDevelop","isTemplate":null,"industryId":null,"sceneId":null,"setTemplateTime":"2023-11-19T18:14:37","setTemplateBy":"1","setDefaultBy":"1","framework":"Vue","defaultLang":null,"extendConfig":{"business":{"serviceName":"","endpointName":"cce","endpointId":"ee","serviceId":"ee","router":"ee"},"env":{"alpha":{"regions":[{"name":"","baseUrl":"","isDefault":false}],"isDefault":true}},"type":"console"},"dataHash":"8b0eba6ad055532a586f9f669108fabb","canAssociate":"1","industry":[],"scene":[],"created_at":"2024-10-16 23:27:10","updated_at":"2024-10-16 23:27:10","platform":1,"image_url":null,"published":false,"global_state":[{"id":"test2","state":{"name1":"xxx1"},"getters":{"count":{"type":"JSFunction","value":"function count() {}"}},"actions":{"actions":{"type":"JSFunction","value":"function actions() {}"}}},{"id":"test3","state":{"name1":"xxx"},"getters":{"count":{"type":"JSFunction","value":"function count() {}"}},"actions":{"actions":{"type":"JSFunction","value":"function actions() {}"}}},{"id":"test4","state":{"region":"","scenario":"all","productId":"","planId":"","addEvs":false,"addHss":false,"addCbr":false,"period":{"value":1,"unit":"month"},"amount":1},"getters":{},"actions":{}},{"id":"test1","state":{"name1":"xxx"},"getters":{"count":{"type":"JSFunction","value":"function count() {}"}},"actions":{"actions":{"type":"JSFunction","value":"function actions() {}"}}}],"data_source_global":{"dataHandler":{"type":"JSFunction","value":"function dataHanlder(res){\n return res;\n}"}},"_id":"fBJD5wIbfFVsUdiQ"}

mockServer/src/database/apps.db

@@ -225,8 +225,8 @@ router.post('block-history/create', async (ctx) => {
 })
 
 router.get('/app-center/api/apps/page', async (ctx) => {
-  const { appId } = ctx.params
-  ctx.body = await mockService.appsService.list(appId)
+  const { name, orderBy, createdBy } = ctx.query
+  ctx.body = await mockService.appsService.list(name, orderBy, createdBy)
 })
 
 router.post('/app-center/api/apps/create', async (ctx) => {
@@ -238,6 +238,18 @@ router.get('/app-center/api/apps/delete/:id', async (ctx) => {
   ctx.body = await mockService.appsService.delete(id)
 })
 
+// 获取app详情
+router.get('/app-center/api/apps/detail/:id', async (ctx) => {
+  const { id } = ctx.params
+  ctx.body = await mockService.appsService.find(id)
+})
+
+// 获取appSchema
+router.get('/app-center/v1/api/apps/schema/:id', async (ctx) => {
+  const { id } = ctx.params
+  ctx.body = await mockService.appsService.findSchema(id)
+})
+
 router.get('/app-center/api/app-template/list', async (ctx) => {
   ctx.body = await mockService.templateService.list(ctx.request.body)
 })

mockServer/src/database/appsSchema.db

@@ -10,8 +10,9 @@
  *
  */
 
-import { getResponseData } from '../tool/Common'
-import list from '../assets/json/apps.json'
+import DateStore from '@seald-io/nedb'
+import { getDatabasePath, getResponseData } from '../tool/Common'
+import defaultAppSchema from '../mock/get/app-center/v1/apps/schema/16.json'
 
 const defaultApp = {
   createdBy: '86',
@@ -62,41 +63,105 @@ const defaultApp = {
 
 export default class AppsService {
   constructor() {
-    this.appList = { ...list }
+    this.db = new DateStore({
+      filename: getDatabasePath('apps.db'),
+      autoload: true
+    })
+
+    this.db.ensureIndex({
+      fieldName: '_id',
+      unique: true
+    })
+
+    this.schemaDb = new DateStore({
+      filename: getDatabasePath('appsSchema.db'),
+      autoload: true
+    })
+
+    this.schemaDb.ensureIndex({
+      fieldName: '_id',
+      unique: true
+    })
+
+    this.appList = []
   }
 
   async create(params) {
-    let mockId = this.appList.apps.length > 0 ? Math.max(...this.appList.apps.map((item) => item.id)) + 1 : 3
+    let mockId = this.appList.length > 0 ? Math.max(...this.appList.map((item) => item.id)) + 1 : 3
     const newApp = {
       ...defaultApp,
+      created_at: new Date().toISOString(),
+      updated_at: new Date().toISOString(),
       id: mockId++,
       ...params
     }
-    this.appList.apps.push(newApp)
+    this.db.insert(newApp)
+
+    let resultStr = JSON.stringify(defaultAppSchema.data)
+    resultStr = resultStr.replace(/"lowcode./g, '"lowcode_')
+    const modifiedResult = JSON.parse(resultStr)
+    const newAppSchema = {
+      ...modifiedResult,
+      meta: {
+        ...modifiedResult.meta,
+        name: params.name,
+        description: params.description,
+        appId: String(newApp.id),
+        gmt_create: newApp.created_at,
+        gmt_modified: newApp.updated_at
+      },
+      id: newApp.id
+    }
+    this.schemaDb.insert(newAppSchema)
     return getResponseData(newApp)
   }
 
   async delete(id) {
-    this.appList.apps = this.appList.apps.filter((item) => Number(item.id) !== Number(id))
-   
-    return getResponseData(this.appList)
-  }
+    const result = await this.db.findOneAsync({ id: Number(id) })
+    await this.db.removeAsync({ id: Number(id) })
 
-  async list() {
-    return getResponseData(this.appList)
+    await this.schemaDb.removeAsync({ id: Number(id) })
+    return getResponseData(result)
   }
 
-  async update(id, params) {
-    const index = this.appList.apps.findIndex((item) => Number(item.id) === Number(id))
-    if (index === -1) {
-      return getResponseData({ success: false, message: '未找到应用' })
+  async list(name, orderBy, createdBy) {
+    let query = {}
+
+    if (name) {
+      query.name = { $regex: new RegExp(name, 'i') }
     }
 
-    this.appList.apps[index] = {
-      ...this.appList.apps[index],
-      ...params
+    const result = await this.db.findAsync(query)
+    this.appList = result.sort((a, b) => new Date(a.created_at) - new Date(b.created_at))
+
+    if (createdBy) {
+      this.appList = this.appList.filter((item) => item.createdBy === '86')
     }
 
-    return getResponseData(this.appList.apps[index])
+    if (orderBy === 'last_updated_time') {
+      this.appList.sort((a, b) => new Date(a.updated_at) - new Date(b.updated_at))
+    }
+
+    return getResponseData({ apps: this.appList })
+  }
+
+  async update(id, params) {
+    await this.db.updateAsync({ id: Number(id) }, { $set: params })
+    const result = await this.db.findOneAsync({ id: Number(id) })
+    return getResponseData(result)
+  }
+
+  async find(id) {
+    const result = await this.db.findOneAsync({ id: Number(id) })
+    return getResponseData(result)
+  }
+
+  async findSchema(id) {
+    const result = await this.schemaDb.findOneAsync({ id: Number(id) })
+    let resultStr = JSON.stringify(result)
+    resultStr = resultStr.replace(/"lowcode_/g, '"lowcode.')
+    const modifiedResult = JSON.parse(resultStr)
+
+    return { data: modifiedResult, locale: 'zh-cn' }
   }
 }

mockServer/src/mock/get/app-center/v1/apps/schema/16.json

@@ -22,7 +22,7 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "axios": "^0.28.0",
+    "@opentiny/tiny-engine-meta-register": "workspace:*",
     "vite-plugin-css-injected-by-js": "^3.3.1"
   },
   "devDependencies": {

mockServer/src/routes/main-routes.js

@@ -62,7 +62,7 @@ import {
   Row as TinyRow,
   Col as TinyCol
 } from '@opentiny/vue'
-import axios from 'axios'
+import { getMetaApi, META_SERVICE } from '@opentiny/tiny-engine-meta-register'
 
 const props = defineProps({
   style: {
@@ -115,14 +115,8 @@ const insertApi = (data = modelData.value) => {
   if (!apiInfo) {
     return undefined
   }
-  return axios[apiInfo.method](apiInfo.url, data)
-    .then((res) => {
-      if (res.status === 200) {
-        return res.data
-      } else {
-        throw new Error('request fail')
-      }
-    })
+  return getMetaApi(META_SERVICE.Http)
+    .post(apiInfo.url, { nameEn: formModel.value.nameEn, params: data })
     .catch((err) => {
       throw new Error(err)
     })
@@ -133,13 +127,13 @@ const updateApi = (data = modelData.value) => {
   if (!apiInfo) {
     return undefined
   }
-  return axios[apiInfo.method](apiInfo.url, data)
-    .then((res) => {
-      if (res.status === 200) {
-        return res.data
-      } else {
-        throw new Error('request fail')
-      }
+  const id = data.id
+  delete data.id
+  return getMetaApi(META_SERVICE.Http)
+    .post(apiInfo.url, {
+      nameEn: formModel.value.nameEn,
+      data: data,
+      params: { id }
     })
     .catch((err) => {
       throw new Error(err)
@@ -151,33 +145,31 @@ const queryApi = ({ currentPage, pageSize, data } = {}) => {
   if (!apiInfo) {
     return undefined
   }
-  return axios[apiInfo.method](`${apiInfo.url}?currentPage=${currentPage || 1}&pageSize=${pageSize || 10}`, {
-    params: data || modelData.value
-  })
-    .then((res) => {
-      if (res.status === 200) {
-        return res.data
+  // 处理查询参数
+  const params = Object.fromEntries(formModel.value.parameters.map((item) => [item.prop, null]))
+  return getMetaApi(META_SERVICE.Http)
+    .post(apiInfo.url, {
+      currentPage: currentPage || 1,
+      pageSize: pageSize || 10,
+      nameEn: formModel.value.nameEn,
+      nameCn: formModel.value.nameCn,
+      params: {
+        ...params,
+        ...(data || modelData.value)
       }
-      throw new Error('request fail')
     })
     .catch((err) => {
       throw new Error(err)
     })
 }
 
-const deleteApi = (evidence = { id: modelData.value?.id }) => {
+const deleteApi = () => {
   const apiInfo = props.modelApis.find((api) => api.nameEn === 'deleteApi')
   if (!apiInfo) {
     return undefined
   }
-  return axios[apiInfo.method](apiInfo.url, { params: evidence })
-    .then((res) => {
-      if (res.status === 200) {
-        return res.data
-      } else {
-        throw new Error('request fail')
-      }
-    })
+  return getMetaApi(META_SERVICE.Http)
+    .post(apiInfo.url, { id: modelData.value?.id, nameEn: formModel.value.nameEn })
     .catch((err) => {
       throw new Error(err)
     })