Merge branch 'main' of http://121.37.111.42:3000/ThbTech/gis-bi

core/core-backend/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>core</artifactId>
+        <artifactId>gisbi</artifactId>
         <groupId>io.gisbi</groupId>
         <version>1.0.0</version>
     </parent>

core/core-frontend/src/pages/index/main.ts

@@ -6,6 +6,7 @@ import App from './App.vue'
 import FcDesigner  from '@/fcDesignerPro/index.es.js'
 
 import ElementPlus from 'element-plus';
+import zhCn from 'element-plus/dist/locale/zh-cn.mjs' 
 import 'element-plus/theme-chalk/index.css';
 import { setupI18n } from '@/plugins/vue-i18n'
 import { setupStore } from '@/store'
@@ -27,7 +28,9 @@ const setupAll = async () => {
   setupElementPlus(app)
   setupCustomComponent(app)
   setupElementPlusIcons(app)
-  app.use(WebSocketPlugin).use(FcDesigner).use(ElementPlus)
+  app.use(WebSocketPlugin).use(FcDesigner).use(ElementPlus, {
+    locale: zhCn,
+  })
   app.mount('#app')
 }
 

core/core-frontend/src/viewsnew/common/FormCreate.vue

@@ -11,9 +11,9 @@
 
 <script lang="ts" setup>
 import {onMounted,ref,watch} from "vue";
-import formCreate from "@form-create/element-ui";
+// import formCreate from "@form-create/element-ui";
 import { moduleById } from '@/api/application/module'
-
+import formCreate  from '@/fcDesignerPro/render/element-plus/form-create.es.js'
 const moduleInfo:any = ref({})
 const props:any = defineProps({
   moduleInfo: {

core/core-frontend/src/viewsnew/common/FormCreateDesigner.vue

@@ -13,7 +13,7 @@
 import { onMounted, ref } from 'vue';
 import { ElMessage } from 'element-plus-secondary'
 
-import formCreate from "@form-create/element-ui";
+import formCreate  from '@/fcDesignerPro/render/element-plus/form-create.es.js'
 import { useRoute } from 'vue-router'
 import { moduleById,moduleUpdate } from '@/api/application/module'
 const basePath = import.meta.env.VITE_API_BASEPATH