kuaikuai 发布系统代码 [后台服务，演示应用]

app_Web/public/assets/json/view-config.json

@@ -856,7 +856,7 @@
         "viewtag": "7d37165f2f535b4a6d2116188fe83d18"
     },
     "ibizorderdashboardview": {
-        "title": "订单数据看板视图",
+        "title": "数据看板",
         "caption": "订单",
         "viewtype": "DEPORTALVIEW",
         "viewmodule": "Sample",

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_en_US_base.ts

@@ -582,9 +582,17 @@ function getLocaleResourceBase(){
 		},
 		exporandimportgrid_grid: {
 			columns: {
+				ibizbookid: commonLogic.appcommonhandle("图书标识",null),
 				ibizbookname: commonLogic.appcommonhandle("图书名称",null),
-				updateman: commonLogic.appcommonhandle("更新人",null),
-				updatedate: commonLogic.appcommonhandle("更新时间",null),
+				author: commonLogic.appcommonhandle("图书作者",null),
+				type: commonLogic.appcommonhandle("图书类型",null),
+				press: commonLogic.appcommonhandle("图书出版社",null),
+				price: commonLogic.appcommonhandle("图书价格",null),
+				subtext: commonLogic.appcommonhandle("图书描述",null),
+				booknumber: commonLogic.appcommonhandle("图书数量",null),
+				tag: commonLogic.appcommonhandle("标签",null),
+				borrowway: commonLogic.appcommonhandle("借阅方式",null),
+				sailstate: commonLogic.appcommonhandle("图书销售状态",null),
 			},
 			nodata:commonLogic.appcommonhandle("",null),
 			uiactions: {

app_Web/src/locale/lanres/entities/ibizbook/ibizbook_zh_CN_base.ts

@@ -582,9 +582,17 @@ function getLocaleResourceBase(){
 		},
 		exporandimportgrid_grid: {
 			columns: {
+				ibizbookid: commonLogic.appcommonhandle("图书标识",null),
 				ibizbookname: commonLogic.appcommonhandle("图书名称",null),
-				updateman: commonLogic.appcommonhandle("更新人",null),
-				updatedate: commonLogic.appcommonhandle("更新时间",null),
+				author: commonLogic.appcommonhandle("图书作者",null),
+				type: commonLogic.appcommonhandle("图书类型",null),
+				press: commonLogic.appcommonhandle("图书出版社",null),
+				price: commonLogic.appcommonhandle("图书价格",null),
+				subtext: commonLogic.appcommonhandle("图书描述",null),
+				booknumber: commonLogic.appcommonhandle("图书数量",null),
+				tag: commonLogic.appcommonhandle("标签",null),
+				borrowway: commonLogic.appcommonhandle("借阅方式",null),
+				sailstate: commonLogic.appcommonhandle("图书销售状态",null),
 			},
 			nodata:commonLogic.appcommonhandle("",null),
 			uiactions: {

app_Web/src/locale/lanres/entities/ibizorder/ibizorder_en_US_base.ts

@@ -141,7 +141,7 @@ function getLocaleResourceBase(){
 			},
 			dashboardview: {
 				caption: commonLogic.appcommonhandle("订单",null),
-				title: commonLogic.appcommonhandle("订单数据看板视图",null),
+				title: commonLogic.appcommonhandle("数据看板",null),
 			},
 			sf1editview: {
 				caption: commonLogic.appcommonhandle("编辑表单新建默认值",null),

app_Web/src/locale/lanres/entities/ibizorder/ibizorder_zh_CN_base.ts

@@ -141,7 +141,7 @@ function getLocaleResourceBase(){
 			},
 			dashboardview: {
 				caption: commonLogic.appcommonhandle("订单",null),
-				title: commonLogic.appcommonhandle("订单数据看板视图",null),
+				title: commonLogic.appcommonhandle("数据看板",null),
 			},
 			sf1editview: {
 				caption: commonLogic.appcommonhandle("编辑表单新建默认值",null),

app_Web/src/mock/viewconfig/viewconfig.ts

@@ -864,7 +864,7 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewtag": "7d37165f2f535b4a6d2116188fe83d18"
         },
         "ibizorderdashboardview": {
-            "title": "订单数据看板视图",
+            "title": "数据看板",
             "caption": "订单",
             "viewtype": "DEPORTALVIEW",
             "viewmodule": "Sample",

app_Web/src/pages/sample/micro-component-edit-view/micro-component-edit-view-base.vue

 <template>
 <div class="view-container deeditview micro-component-edit-view">
     <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="microcomponenteditview"></app-studioaction>
-    <card class='view-card ' :disHover="true" :bordered="false">
+    <card class='view-card view-no-caption ' :disHover="true" :bordered="false">
 
 <div slot='title' class="header-container">
-    <span class='caption-info'>{{$t(model.srfCaption)}}</span>
     <div class='toolbar-container'>
         <tooltip :transfer="true" :max-width="600">
                 <i-button v-show="toolBarModels.tbitem3.visabled" :disabled="toolBarModels.tbitem3.disabled" class=' deepskyblueToolBar' v-loading:i-button @click="toolbar_click({ tag: 'tbitem3' }, $event)">

app_Web/src/widgets/ibizbook/expor-and-import-grid-grid/expor-and-import-grid-grid-model.ts

@@ -27,24 +27,34 @@ export default class ExporAndImportGridModel {
     }else{
 		  return [
         {
-          name: 'ibizbookname',
-          prop: 'ibizbookname',
+          name: 'subtext',
+          prop: 'subtext',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'press',
+          prop: 'press',
           dataType: 'TEXT',
         },
+        {
+          name: 'tag',
+          prop: 'tag',
+          dataType: 'LONGTEXT',
+        },
         {
           name: 'ibizbookid',
           prop: 'ibizbookid',
           dataType: 'GUID',
         },
         {
-          name: 'updateman',
-          prop: 'updateman',
+          name: 'sailstate',
+          prop: 'sailstate',
           dataType: 'TEXT',
         },
         {
-          name: 'updatedate',
-          prop: 'updatedate',
-          dataType: 'DATETIME',
+          name: 'type',
+          prop: 'type',
+          dataType: 'TEXT',
         },
         {
           name: 'srfmstag',
@@ -65,6 +75,31 @@ export default class ExporAndImportGridModel {
           dataType: 'GUID',
           isEditable:true
         },
+        {
+          name: 'author',
+          prop: 'author',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'ibizbookname',
+          prop: 'ibizbookname',
+          dataType: 'TEXT',
+        },
+        {
+          name: 'price',
+          prop: 'price',
+          dataType: 'FLOAT',
+        },
+        {
+          name: 'booknumber',
+          prop: 'booknumber',
+          dataType: 'INT',
+        },
+        {
+          name: 'borrowway',
+          prop: 'borrowway',
+          dataType: 'SSCODELIST',
+        },
         {
           name: 'ibizbook',
           prop: 'ibizbookid',

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 demosys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd demosys/
-      mvn clean package -Pweb
-      cd demo-app/demo-app-web
-      mvn -Pweb docker:build
-      mvn -Pweb docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/demo-app-web.yaml iBizDemo --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

demo-app/demo-app-web/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-app-web.jar
 
-EXPOSE 51001
+EXPOSE 8080
 
 ADD demo-app-web.jar /demo-app-web.jar

demo-app/demo-app-web/src/main/docker/demo-app-web.yaml

@@ -3,24 +3,9 @@ services:
   demo-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-app-web:latest
     ports:
-      - "51001:51001"
+      - "8080:8080"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
-      - SERVER_PORT=51001
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
-      - SPRING_REDIS_HOST=172.16.240.110
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_df847bdfd
-      - SPRING_DATASOURCE_PASSWORD=3d6@460A
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_df847bdfd
-      - NACOS=172.16.240.110:8848
-      - SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
-      - SEATA_ENABLED=true
     deploy:
       resources:
            limits: