vue2-client 1.9.118 → 1.9.120

package/package.json

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

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

@@ -6,9 +6,21 @@ export default {
   name: 'Demo',
   components: { XAddNativeForm },
   mounted () {
-    getConfigByNameAsync('formtestForm', 'af-system').then(res => {
+    getConfigByNameAsync('updateSaleOrderCarForm', 'af-gaslink').then(res => {
       console.log('===res', res)
-      this.$refs.xAddFrom.init(res)
+      this.$refs.xAddFrom.init({
+        formItems: res.formJson,
+        modifyModelData: {
+          data: {
+            f_plate_number: '陕C45C3A2',
+            f_trailer_number: '陕C45C3A2挂',
+          }
+        },
+        title: '修改销售订单',
+        businessType: '修改',
+        layout: 'inline',
+        ...res
+      })
     })
   },
   methods: {

package/src/base-client/components/common/XReport/XReportDemo.vue

@@ -4,10 +4,9 @@
       @updateImg="updateImg"
       ref="main"
       :use-oss-for-img="false"
-      config-name="RegistrationForm"
-      :local-config="test"
+      config-name="CheckForm"
       :config-data="test_data"
-      server-name="af-apply"
+      server-name="af-his"
       :show-img-in-cell="true"
       :display-only="displayOnly"
       :edit-mode="false"
@@ -33,6 +32,7 @@ export default {
   },
   data () {
     return {
+      configName: 'CheckForm',
       test: {
         title: {
           type: 'titleKey',

package/src/base-client/components/common/XReport/XReportDesign.vue

@@ -54,6 +54,7 @@
                 :server-name="serverName"
                 :use-oss-for-img="useOssForImg"
                 :key="rowIndex"
+                :row-key="rowIndex"
                 :columns="row"
                 :no-top-border="noTopBorder"
                 :config-data="activatedConfig.data"
@@ -71,6 +72,7 @@
                 :use-oss-for-img="useOssForImg"
                 :config="activatedConfig"
                 :key="rowIndex + listIndex"
+                :row-key="rowIndex"
                 :columns="row"
                 :no-top-border="noTopBorder"
                 :config-data="activatedConfig.data"
@@ -93,6 +95,7 @@
                   v-for="(item, definitionIndex) in activatedConfig.data[row[0].dataIndex]"
                   :input-columns-definition-index="definitionIndex"
                   :display="forDisplay"
+                  :row-key="rowIndex"
                   :key="row[0].dataIndex + definitionIndex + rowIndex"></x-report-tr-group>
                 <template v-if="!forDisplay">
                   <!--  动态行交互按钮  -->
@@ -104,6 +107,7 @@
                     :use-oss-for-img="useOssForImg"
                     :config="activatedConfig"
                     :key="rowIndex"
+                    :row-key="rowIndex"
                     :columns="row"
                     :no-top-border="noTopBorder"
                     :config-data="activatedConfig.data"
@@ -310,7 +314,7 @@ export default {
 }
 
 .reportMain {
-  text-align: center;
+  text-align: left;
   margin: 0 auto;
   font-size: 16px;
   color: #000;

package/src/base-client/components/common/XReport/XReportTrGroup.vue

@@ -1,5 +1,5 @@
 <template>
-  <tr>
+  <tr :style="calculateTrStyle(rowKey, config)">
     <!--  预览页展示  -->
     <template v-if="display">
       <template v-if="!inputColumns">
@@ -442,7 +442,12 @@ export default {
     imgPrefix: {
       type: String,
       default: undefined
-    }
+    },
+    // 接收父组件传递的 row-key
+    rowKey: {
+      type: Number,
+      default: null
+    },
   },
   data () {
     return {
@@ -517,13 +522,13 @@ export default {
       // 普通带边框单元格
       const withBorder = {
         border: borderWidth + ' solid ' + color,
-        padding: '8px'
+        padding: '4px, 2px'
       }
       // 只有左右边框的单元格
       const noBorder = {
         borderLeft: borderWidth + ' solid ' + color,
         borderRight: borderWidth + ' solid ' + color,
-        padding: '8px'
+        padding: '4px, 2px'
       }
       // 只没有上边框的单元格
       const NoTopBorder = {
@@ -531,7 +536,7 @@ export default {
         borderLeft: borderWidth + ' solid ' + color,
         borderRight: borderWidth + ' solid ' + color,
         borderBottom: borderWidth + ' solid ' + color,
-        padding: '8px'
+        padding: '4px, 2px'
       }
       let result = {}
       // 如果表格也声明了样式，用表格样式将样式覆盖
@@ -760,6 +765,26 @@ export default {
 
       return result
     },
+    calculateTrStyle (key, config) {
+      console.log('行样式配置', config.trStyle, key)
+      // 初始化行样式
+      let trStyle = {}
+
+      // 如果 config.trStyle 存在且是数组
+      if (Array.isArray(config.trStyle)) {
+          // 遍历 trStyle 数组，匹配 originalRowIndex 的值
+          const styleConfig = config.trStyle.find(item => item.originalRowIndex === key)
+
+          // 如果找到匹配项，获取其 style
+          if (styleConfig && styleConfig.style) {
+              trStyle = styleConfig.style
+          }
+      }
+
+      return {
+          ...trStyle, // 返回找到的样式对象
+      }
+    },
   },
   beforeMount () {
     if (this.useOssForImg) {
@@ -790,12 +815,12 @@ export default {
 .tdNoBorder {
   border-left: 1px solid #000;
   border-right: 1px solid #000;
-  padding: 8px;
+  padding: 4px, 2px;
 }
 
 .tdWithBorder {
   border: 1px solid #000;
-  padding: 8px;
+  padding: 4px, 2px;
 }
 
 .tdWithNoTopBorder {

package/src/base-client/components/common/XReportGrid/XReport.vue

@@ -298,7 +298,6 @@ export default {
 
     // 把设计的table布局转换成可显示的珊格布局
     transformArray (inputList) {
-      console.warn('开始转换', JSON.stringify(inputList))
       let operationIndex = 0
       let operationList = []
       const outputList = []
@@ -370,7 +369,6 @@ export default {
           maxMergeRow += 1
       }
 
-      console.warn('转换完成了', outputList)
       return this.transformArray(outputList)
     },
 

package/src/base-client/components/common/XReportGrid/XReportDemo.vue

@@ -5,7 +5,7 @@
         ref="main"
         :use-oss-for-img="false"
         :config-name="configName"
-        server-name="af-system"
+        server-name="af-his"
         :show-img-in-cell="true"
         :display-only="true"
         :edit-mode="false"
@@ -28,17 +28,22 @@ export default {
   },
   provide () {
     return {
-      getSelectedId: () => 10
+      getSelectedId: () => 10,
     }
   },
   mounted () {
-      // this.$refs.main.openDialog('surgerySchedCover', -1, {})
+    // this.$refs.main.openDialog('surgerySchedCover', -1, {})
+  },
+  beforeCreate () {
+    this.$store.commit('account/setUser', {
+      id: '374870707835895810'
+    })
   },
   data () {
     return {
-      // configName: 'medicalRecordCover'
+      configName: 'medicalRecordCover'
       // configName: 'physicianOrderEntryCover'
-      configName: '测试栅格配置'
+      // configName: 'threeHealthCenterCover'
       // configName: 'medOrderManaActCover'
     }
   },

package/src/base-client/components/common/XReportGrid/XReportDesign.vue

@@ -129,6 +129,7 @@
                 <template v-for="(num, listIndex) in row[0].listLength + 1">
                   <template v-if="!forDisplay">
                     <x-report-tr-group
+                      @slotRendered="slotRendered"
                       @updateImg="updateImg"
                       @selectRow="selectRow"
                       :show-img-in-cell="showImgInCell"
@@ -146,6 +147,7 @@
                   </template>
                   <template v-else>
                     <x-report-tr-group
+                      @slotRendered="slotRendered"
                       @updateImg="updateImg"
                       @selectRow="selectRow"
                       :show-img-in-cell="showImgInCell"
@@ -168,6 +170,7 @@
               <template v-else-if="row[0].type === 'inputColumns'">
                 <template v-if="forDisplay">
                   <x-report-tr-group
+                    @slotRendered="slotRendered"
                     @updateImg="updateImg"
                     @selectRow="selectRow"
                     :show-img-in-cell="showImgInCell"
@@ -187,6 +190,7 @@
                 </template>
                 <template v-if="!forDisplay">
                   <x-report-tr-group
+                    @slotRendered="slotRendered"
                     @updateImg="updateImg"
                     @selectRow="selectRow"
                     :show-img-in-cell="showImgInCell"
@@ -204,6 +208,7 @@
                     :key="row[0].dataIndex + definitionIndex + rowIndex"></x-report-tr-group>
                   <!--  动态行交互按钮  -->
                   <x-report-tr-group
+                    @slotRendered="slotRendered"
                     @updateImg="updateImg"
                     @selectRow="selectRow"
                     :show-img-in-cell="showImgInCell"
@@ -225,6 +230,7 @@
               <template v-else>
                 <template v-if="!forDisplay">
                   <x-report-tr-group
+                    @slotRendered="slotRendered"
                     @updateImg="updateImg"
                     @selectRow="selectRow"
                     :show-img-in-cell="showImgInCell"
@@ -241,6 +247,7 @@
                 </template>
                 <template v-else>
                   <x-report-tr-group
+                    @slotRendered="slotRendered"
                     @updateImg="updateImg"
                     @selectRow="selectRow"
                     :show-img-in-cell="showImgInCell"

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

@@ -86,10 +86,10 @@ routerResource.example = {
           // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
-          // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
-          component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),
           // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XConversation/XConversationDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),