lxm1993 发布系统代码 [TrainSys，网页端]

app_Web/package.json

@@ -12,14 +12,14 @@
   },
   "dependencies": {
     "@floating-ui/dom": "^1.0.11",
-    "@ibiz-template/command": "^0.0.1-beta.45",
-    "@ibiz-template/controller": "^0.0.1-beta.45",
-    "@ibiz-template/core": "^0.0.1-beta.45",
-    "@ibiz-template/model": "^0.0.1-beta.45",
-    "@ibiz-template/runtime": "^0.0.1-beta.45",
-    "@ibiz-template/service": "^0.0.1-beta.45",
-    "@ibiz-template/theme": "^0.0.1-beta.45",
-    "@ibiz-template/vue-util": "^0.0.1-beta.45",
+    "@ibiz-template/command": "^0.0.1-beta.46",
+    "@ibiz-template/controller": "^0.0.1-beta.46",
+    "@ibiz-template/core": "^0.0.1-beta.46",
+    "@ibiz-template/model": "^0.0.1-beta.46",
+    "@ibiz-template/runtime": "^0.0.1-beta.46",
+    "@ibiz-template/service": "^0.0.1-beta.46",
+    "@ibiz-template/theme": "^0.0.1-beta.46",
+    "@ibiz-template/vue-util": "^0.0.1-beta.46",
     "@ibiz/dynamic-model-api": "^2.1.11",
     "dayjs": "^1.11.7",
     "lodash-es": "^4.17.21",

app_Web/src/components/common/view-toolbar/view-toolbar.tsx

@@ -55,7 +55,7 @@ export const ViewToolbar = defineComponent({
     });
 
     // 点击事件
-    const handleClick = async (item: IPSDEToolbarItem, _event: MouseEvent) => {
+    const _handleClick = async (item: IPSDEToolbarItem, _event: MouseEvent) => {
       props.toolbarState.setLoading(item.id);
       try {
         await neuron.evt.asyncEmit(
@@ -68,6 +68,13 @@ export const ViewToolbar = defineComponent({
       }
     };
 
+    // 按钮点击加延时。解决子界面行编辑没有失焦的情况下先触发了按钮的行为。
+    const handleClick = async (item: IPSDEToolbarItem, event: MouseEvent) => {
+      setTimeout(() => {
+        _handleClick(item, event);
+      }, 30);
+    };
+
     return { ns, doingToolbarItem, handleClick, btnSize };
   },
   render() {

app_Web/src/components/common/wf-toolbar/wf-toolbar.tsx

@@ -15,10 +15,17 @@ export const WFToolbar = defineComponent({
     const ns = useNamespace('wf-toolbar');
 
     // 点击事件抛给表格执行
-    const handleClick = async (link: WFLink, event: MouseEvent) => {
+    const _handleClick = async (link: WFLink, event: MouseEvent) => {
       emit('wf-link-click', link, event);
     };
 
+    // 按钮点击加延时。解决子界面行编辑没有失焦的情况下先触发了按钮的行为。
+    const handleClick = async (link: WFLink, event: MouseEvent) => {
+      setTimeout(() => {
+        _handleClick(link, event);
+      }, 30);
+    };
+
     return { ns, handleClick };
   },
   render() {

app_Web/src/util/error-handler/error-handler.ts

@@ -24,7 +24,11 @@ export class ErrorHandler {
       err instanceof DefectModelError ||
       err instanceof UnsupportedModelError
     ) {
+      if (ibiz.env.dev) {
         ibiz.message.error(err.message, 10, true);
+      } else {
+        ibiz.log.error(err.message);
+      }
     } else if (err instanceof HttpError) {
       if (err.status === 401) {
         UnauthorizedHandler.handle();

app_Web/yarn.lock

@@ -637,61 +637,61 @@
   resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-"@ibiz-template/command@^0.0.1-beta.45":
-  version "0.0.1-beta.45"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fcommand/-/command-0.0.1-beta.45.tgz#3fcdf95f60416d9398cffacef9abbf50540f8a2d"
-  integrity sha512-o/LTY7RiU/pn+vClhoSJLMdaO+l8lECT9UEyPCdrqwYdLo0/xbBiIPhYqHiCrmNpABIbsOEUlRo2i+aZb2R42Q==
+"@ibiz-template/command@^0.0.1-beta.46":
+  version "0.0.1-beta.46"
+  resolved "http://npm.zhr.icu/@ibiz-template/command/-/command-0.0.1-beta.46.tgz#abb30e69438f212ce197f28b212b4ece58a89a54"
+  integrity sha512-iM7aOGrOHfkQpHMeEKn4RARfzWEqpX05iR76Yw4JvqOxT5TmsI2ouRnKaCbylpOv5SBjjrxrxgJtK5erW8CCow==
   dependencies:
     qx-util "^0.4.4"
 
-"@ibiz-template/controller@^0.0.1-beta.45":
-  version "0.0.1-beta.45"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fcontroller/-/controller-0.0.1-beta.45.tgz#499ab4325b0632ee83d48a6b3e7351641ff427f1"
-  integrity sha512-Bc0oJgvH2QoAM3b/BLkxeVea1yZv5+oFIQAnkuDfFGoJ/4P52cYGXJhHjOGJB40w1zlPJOM32Wj2mLNVc8C2bA==
+"@ibiz-template/controller@^0.0.1-beta.46":
+  version "0.0.1-beta.46"
+  resolved "http://npm.zhr.icu/@ibiz-template/controller/-/controller-0.0.1-beta.46.tgz#e8e8bf941ccb9de83bce1eb3294f9937df7eeafc"
+  integrity sha512-6iJVrRDhhS0OFOK+oAj2QaGSCKJ8M+tysYJgVX2yXW2K2gwOhMw78TOEIZ17Gs/5Qiwk14lb4GJoYKPBZj5Dcw==
   dependencies:
     async-validator "^4.2.5"
     dayjs "^1.11.5"
 
-"@ibiz-template/core@^0.0.1-beta.45":
-  version "0.0.1-beta.45"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fcore/-/core-0.0.1-beta.45.tgz#a7886e2b27cfdee14cdc6814e444357091a344bf"
-  integrity sha512-unVWmpQPuA0hUuweZjS0+vOkErtRYAt4fV8DSLVTESIyHFBKvA56fYLA2Qa750vV1dDELwntvijRYEhRGcPuCA==
+"@ibiz-template/core@^0.0.1-beta.46":
+  version "0.0.1-beta.46"
+  resolved "http://npm.zhr.icu/@ibiz-template/core/-/core-0.0.1-beta.46.tgz#0a9ec5478e0b810a835faffe5cc87442d855328d"
+  integrity sha512-mkyjamjNjF3zVmUyfDo1MDAlgz2dwH5QF7J/5YVnMrY7E1OAF0G+YoHJalAELZl7cIUiab2HBUEzJ33Bpfi7FQ==
   dependencies:
     axios "^1.2.1"
     loglevel "^1.8.0"
     pluralize "^8.0.0"
     qs "^6.11.0"
 
-"@ibiz-template/model@^0.0.1-beta.45":
-  version "0.0.1-beta.45"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fmodel/-/model-0.0.1-beta.45.tgz#4dd27c4c4dfdd9ae3c9cbaa4a20dace8ff79f882"
-  integrity sha512-OQXFSeCLCAxNeaLGeFuoTGYIRhxnv4dLMGmjwL6c0vJTY8SPWU537ILSsCHsaTyEWNBm5BajpnRzYJYZQUKj2Q==
+"@ibiz-template/model@^0.0.1-beta.46":
+  version "0.0.1-beta.46"
+  resolved "http://npm.zhr.icu/@ibiz-template/model/-/model-0.0.1-beta.46.tgz#a37726dcf07e3e6d67fdc81166e06f03ed0b27c9"
+  integrity sha512-RRcEHWeYHsdKrklw2ElfJEvMQnS8vS3k+GalG6Kr/oyOxOFtCoLjWgi7iUWYQ7eSl9d+G7K7h9Yhg+UeDLQgnQ==
   dependencies:
     "@ibiz/dynamic-model-api" "^2.1.11"
     pluralize "^8.0.0"
 
-"@ibiz-template/runtime@^0.0.1-beta.45":
-  version "0.0.1-beta.45"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fruntime/-/runtime-0.0.1-beta.45.tgz#340c85ef916c70274b87c7ed0378fc42799a651f"
-  integrity sha512-zke/3sHy4E2ikC3x5yrq13zZac9BzmRr0tOjPckLmcmZhNqkURXu+ob2E1r8T0pwouXh3RLsMe7R4ilDDm7kOw==
+"@ibiz-template/runtime@^0.0.1-beta.46":
+  version "0.0.1-beta.46"
+  resolved "http://npm.zhr.icu/@ibiz-template/runtime/-/runtime-0.0.1-beta.46.tgz#433d4cceda2c295ff37f0308031161ae61a7f9be"
+  integrity sha512-4ttc1O5jksd+SVSWEB3R32tQr7QSJLXoo6YXMYdpP6ewnhsIFakqa3fAVk3xk1V5Oo80Vu721S8npoYhNbTX2A==
   dependencies:
-    "@ibiz-template/command" "^0.0.1-beta.45"
+    "@ibiz-template/command" "^0.0.1-beta.46"
     qs "^6.11.0"
 
-"@ibiz-template/service@^0.0.1-beta.45":
-  version "0.0.1-beta.45"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fservice/-/service-0.0.1-beta.45.tgz#a973a0def6fdb1d1abc52cb2137d6e018cb4a94d"
-  integrity sha512-xFYABBbrJJMInwQvDTTX8tlDGVbJiB/Fj5pa9JPWIwy97NcODObeoJkFk1BQy2HnTwJiOATbRL+s4E2adRSdnw==
+"@ibiz-template/service@^0.0.1-beta.46":
+  version "0.0.1-beta.46"
+  resolved "http://npm.zhr.icu/@ibiz-template/service/-/service-0.0.1-beta.46.tgz#2876d62e75b8a65a0c1b5799beacc21b62de10ad"
+  integrity sha512-yK6Y8u45N+7mRhIsUEht+X2+RYV0GridUlu8gj0Qdo54pTSdTo5NG6dhl0bdVn1HO1A681Cv2A0ccR51lYQvcA==
 
-"@ibiz-template/theme@^0.0.1-beta.45":
-  version "0.0.1-beta.45"
-  resolved "http://npm.zhr.icu/@ibiz-template%2ftheme/-/theme-0.0.1-beta.45.tgz#a4998f93d01e5c6e93daf3f8d4103a373630ea97"
-  integrity sha512-lsgfyUqFUOIZWd34qKd2pubpzmfeaSRe81IQEkcdOBWhd5UdBzDfY4ChQhs9AQohMZXct1l+OBk2pDGi7TJNTQ==
+"@ibiz-template/theme@^0.0.1-beta.46":
+  version "0.0.1-beta.46"
+  resolved "http://npm.zhr.icu/@ibiz-template/theme/-/theme-0.0.1-beta.46.tgz#d1f410bad673bd78549fba37b2e8b4690aa9bc6b"
+  integrity sha512-SByWF8Zy6Xsl9it4ia7VAw20K1WL6f7T4XohFg/dhOl0WtrbQJudzVl83gTjsB2hwZv6w0nFqq7IkzNnDV5dkA==
 
-"@ibiz-template/vue-util@^0.0.1-beta.45":
-  version "0.0.1-beta.45"
-  resolved "http://npm.zhr.icu/@ibiz-template%2fvue-util/-/vue-util-0.0.1-beta.45.tgz#f4bb6b6abc1e5bb9af4740ce69a0fbefbc697108"
-  integrity sha512-rvmLnQxLQJQBxXV3KwAy7w39RgN3wm1rE9B1R6csGWB8hyou0z9OwJygIz9afAPd1rVmK3LHMi7OVKVPOVfBkA==
+"@ibiz-template/vue-util@^0.0.1-beta.46":
+  version "0.0.1-beta.46"
+  resolved "http://npm.zhr.icu/@ibiz-template/vue-util/-/vue-util-0.0.1-beta.46.tgz#feb1e1d8cec7eeb1bdccfa2f1ce6f36ab665791e"
+  integrity sha512-pzNu3DiY7eyKiLPRkBj54B59Up3jRng5utFrXOu1ANL62rleRUc7u72Zycgutr9QCoJPCp3XDDxP1Gr7IWn5Bg==
 
 "@ibiz/dynamic-model-api@^2.1.11":
   version "2.1.11"

config.xml

@@ -55,12 +55,6 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
-      mvn clean package -Ptrainsys
-      mvn install -Ptrainsys
-      cd trainsys-provider
-      mvn -Ptrainsys docker:build
-      mvn -Ptrainsys docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

trainsys-provider/pom.xml

@@ -33,7 +33,7 @@
 
     <profiles>
         <profile>
-            <id>trainsys</id>
+            <id>runtime</id>
             <build>
                 <resources>
                     <resource>

trainsys-provider/src/main/docker/Dockerfile

@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
 
-EXPOSE 50000
+EXPOSE 8081
 
 ADD trainsys-provider.jar /trainsys-provider.jar

trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml

@@ -22,32 +22,7 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 50000
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.240.140"      
-        - name: SERVER_PORT
-          value: "50000"
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
-          value: "172.16.240.140:8848"
-        - name: SPRING_REDIS_HOST
-          value: "127.0.0.1"
-        - name: SPRING_REDIS_PORT
-          value: "6379"
-        - name: SPRING_REDIS_DATABASE
-          value: "0"
-        - name: SPRING_DATASOURCE_USERNAME
-          value: "a_LAB01_d23cc850e"
-        - name: SPRING_DATASOURCE_PASSWORD
-          value: "f9Df4556"
-        - name: SPRING_DATASOURCE_URL
-          value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
-        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
-          value: "com.mysql.jdbc.Driver"
-        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
-          value: "a_LAB01_d23cc850e"
-        - name: NACOS
-          value: "172.16.240.140:8848"      
+        - containerPort: 8081
 
 ---
 apiVersion: v1
@@ -60,9 +35,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 50000
-    targetPort: 50000
-    nodePort: 50000
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
     protocol: TCP
   selector:
     app: trainsys-provider

trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml

@@ -3,23 +3,9 @@ services:
   trainsys-provider:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
     ports:
-      - "50000:50000"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
-      - SERVER_PORT=50000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
-      - SPRING_DATASOURCE_PASSWORD=f9Df4556
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
-      - NACOS=172.16.240.140:8848
     deploy:
       resources:
            limits: