vue2-client 1.20.5 → 1.20.7

package/logs/afgit.config.log

@@ -0,0 +1,7 @@
+2026-02-27 09:24:44 - afgit.config - INFO - 开始拉取最新配置
+2026-02-27 09:24:44 - afgit.config - INFO - 创建本地目录: ./config_files
+2026-02-27 09:24:44 - afgit.config - INFO - 开始下载配置文件到: ./config_files
+2026-02-27 09:24:44 - afgit.config - DEBUG - 开始认证，URL: http://192.168.50.67:31467/api/af-auth/login, 用户名: 1
+2026-02-27 09:24:44 - afgit.config - ERROR - 解析认证响应失败: {"code":400,"data":null,"error":true,"msg":"用户不存在/密码错误","success":false}, 用户名: 1, 密码: Class123!@!
+2026-02-27 09:24:44 - afgit.config - ERROR - 认证失败，下载终止
+2026-02-27 09:24:44 - afgit.config - ERROR - 拉取配置失败

package/logs/afgit.config_error.log

@@ -0,0 +1,3 @@
+2026-02-27 09:24:44 - afgit.config - ERROR - 解析认证响应失败: {"code":400,"data":null,"error":true,"msg":"用户不存在/密码错误","success":false}, 用户名: 1, 密码: Class123!@!
+2026-02-27 09:24:44 - afgit.config - ERROR - 认证失败，下载终止
+2026-02-27 09:24:44 - afgit.config - ERROR - 拉取配置失败

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.20.5",
+  "version": "1.20.7",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/HIS/HFormTable/HFormTable.vue

@@ -111,7 +111,13 @@ const wrapperClassObject = computed(() => {
 
 const wrapperStyleObject = computed(() => {
   const rowHeight = attrs['row-height'] || attrs.rowHeight || ROW_HEIGHT_DEFAULT
-  return { '--row-height': rowHeight }
+  const tableMinHeight = attrs['table-min-height'] || attrs.tableMinHeight || null
+  // 表格高度偏移量（分页器+边距等固定部分），配置600显示550，偏移50
+  const tableMinHeightOffset = 50
+  return {
+    '--row-height': rowHeight,
+    '--table-min-height': tableMinHeight ? `calc(${tableMinHeight} - ${tableMinHeightOffset}px)` : undefined
+  }
 })
 
 const xFormTableRef = ref()
@@ -481,18 +487,13 @@ defineExpose({
     }
   }
 
-  // 修复数据量少时下拉框被挡住的问题：为表格内容区域设置最小高度
-  // 当表格有数据时，确保表格内容区域有足够高度，避免下拉框被挡住
-  // 注意：只在表格有数据时应用，避免空表格时显示问题
+  // 自定义表格固定高度（通过 table-min-height 属性设置）
+  // 只在表格有数据时应用
   :deep(.table-wrapper) {
     .ant-table:not(.ant-table-empty) {
       .ant-table-content {
-        // 设置最小高度，确保即使数据少时也有足够空间显示下拉框
-        // 这个高度应该足够显示下拉框选项（通常下拉框高度约200-300px）
-        min-height: 300px;
         .ant-table-body {
-          // 确保表格体也有最小高度，保证滚动容器有足够空间
-          min-height: 250px;
+          height: calc(var(--table-min-height, 300px) - 50px);
         }
       }
     }

package/src/base-client/components/common/XAddNativeForm/XAddNativeForm.vue

@@ -531,6 +531,7 @@ export default {
         btnPlace = 'end',
         simpleInline = null,
         paramLogicName,
+        paramLogicServiceName,
         paramLogicNameParam
       } = params
       this.loaded = false
@@ -575,7 +576,8 @@ export default {
       // 设置普通表单项的相关参数
       const formData = Object.assign({}, fixedAddForm)
       if (paramLogicName) {
-        runLogic(paramLogicName, paramLogicNameParam, this.serviceName).then(res => {
+        // console.warn('2paramLogicServiceName', paramLogicServiceName)
+        runLogic(paramLogicName, paramLogicNameParam, (typeof paramLogicServiceName === 'string' && paramLogicServiceName.trim()) || this.serviceName).then(res => {
           Object.assign(formData, res)
         })
       }

package/src/pages/WorkflowDetail/WorkFlowDemo.vue

@@ -6,7 +6,7 @@ export default {
   components: { WorkflowDetail },
   mounted () {
     this.$refs.workFlow.init({
-      workflowId: 4640
+      workflowId: 6255
     })
   },
   methods: {

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue

@@ -1194,7 +1194,13 @@ export default {
         const currentStepDefine = this.stepsDefine.find(item => item.id === stepId)
         const isKeyHandle = currentStepDefine?.properties?.form?.isKeyHandle || false
         if (!!currentStepDefine.properties.form?.paramLogicName) {
-          const data = await postByServiceName(`/logic/${currentStepDefine.properties.form.paramLogicName}`, { workflowId: this.workflowId, stepId: stepId, data: formCompletedDataPreview })
+          // 确保 serviceName 是一个非空字符串
+          const serviceName =
+            (typeof currentStepDefine.properties.form?.paramLogicServiceName === 'string' &&
+              currentStepDefine.properties.form.paramLogicServiceName.trim()) || process.env.VUE_APP_SYSTEM_NAME
+          // console.warn('serviceName', serviceName)
+          const data = await postByServiceName(`/logic/${currentStepDefine.properties.form.paramLogicName}`, { workflowId: this.workflowId, stepId: stepId, data: formCompletedDataPreview }, serviceName)
+          // const data = await postByServiceName(`/logic/${currentStepDefine.properties.form.paramLogicName}`, { workflowId: this.workflowId, stepId: stepId, data: formCompletedDataPreview })
           formCompletedDataPreview = this.mergeFormData(formCompletedDataPreview, data)
         }
         // 使用字段定义中内容，将回显数据的列名，替换为定义的中文名

package/src/router/async/router.map.js

@@ -55,8 +55,8 @@ routerResource.example = {
   // component: () => import('@vue2-client/pages/LayoutTest/index.vue')
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue')
   // component: () => import('@vue2-client/base-client/components/his/HChart/demo.vue'),
-  // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
+  component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue')
   // component: () => import('@vue2-client/base-client/components/common/AfMap/demo.vue')
   // component: () => import('@vue2-client/base-client/components/common/ImagePreviewModal/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XImagePreview/demo.vue'),