vue2-client 1.10.5 → 1.10.7

package/package.json

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

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

@@ -46,6 +46,7 @@
               :disabled="itemDisabled(item)"
               :read-only="readonly(item)"
               :files="files"
+              v-bind="formItemLayoutGen"
               :style="layout === 'inline' ? { marginTop:'5px' } : undefined"
               :form="form"
               :images="images"
@@ -70,6 +71,7 @@
             :disabled="itemDisabled(item)"
             :readonly="readonly(item)"
             :files="files"
+            v-bind="formItemLayoutGen"
             :style="layout ==='inline'?{marginTop:'5px'}:undefined"
             :form="form[groupItem.model]"
             :images="images"
@@ -99,6 +101,7 @@
             :disabled="itemDisabled(formItem)"
             :readonly="readonly(formItem)"
             :files="files"
+            v-bind="formItemLayoutGen"
             :style="layout ==='inline'?{marginTop:'5px'}:undefined"
             :form="form[groupItem.model]"
             :images="images"

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

@@ -6,13 +6,14 @@ export default {
   name: 'Demo',
   components: { XAddNativeForm },
   mounted () {
-    getConfigByNameAsync('formtestForm', 'af-system').then(res => {
+    getConfigByNameAsync('bedManageCRUD', 'af-his').then(res => {
       this.$refs.xAddFrom.init(Object.assign(res, {
         modifyModelData: {
           data: {
             f_f_type: 2
           }
-        }
+        },
+        layout: 'horizontal'
       }))
     })
   },

package/src/base-client/components/common/XForm/XFormItem.vue

@@ -3,6 +3,7 @@
   <x-form-col
     v-if="attr.type === 'input' && show"
     :occupyCol="attr.occupyCol"
+    :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
       :ref="attr.model"
@@ -77,6 +78,7 @@
   <!-- 下拉框 -->
   <x-form-col
     v-else-if="(attr.type === 'select' || (attr.type === 'rate' && mode==='查询')) && show"
+    :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
       v-if="!attr.showMode || mode === '查询' || attr.showMode === 'select' "
@@ -206,6 +208,7 @@
   <!-- 多选框 -->
   <x-form-col
     v-else-if="attr.type === 'checkbox' && show"
+    :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
       v-if="!attr.showMode || mode === '查询' || attr.showMode === 'select' "
@@ -291,6 +294,7 @@
   <!-- 单选框 -->
   <x-form-col
     v-else-if="attr.type === 'radio' && show"
+    :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
       v-if="!attr.showMode || attr.type === 'radio' "
@@ -344,6 +348,7 @@
   <!-- 时间 日期 框整合 -->
   <x-form-col
     v-else-if="['datePicker', 'rangePicker', 'yearPicker', 'monthPicker', 'yearRangePicker', 'monthRangePicker'].includes(attr.type) && show"
+    :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
       :ref="attr.model"
@@ -360,7 +365,10 @@
     </a-form-model-item>
   </x-form-col>
   <!-- 文本域 -->
-  <x-form-col v-else-if="attr.type === 'textarea' && show" :flex="attr.flex">
+  <x-form-col
+    v-else-if="attr.type === 'textarea' && show"
+    :labelCol="labelCol"
+    :flex="attr.flex">
     <!--    :style="layout === 'inline'?{width:'calc(100% - 60px)'}:{}"-->
     <a-form-model-item
       :ref="attr.model"
@@ -377,6 +385,7 @@
   <!-- 文件上传 -->
   <x-form-col
     v-else-if="(attr.type === 'file' || attr.type === 'image') && show"
+    :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
       :ref="attr.model"
@@ -394,6 +403,7 @@
   <!-- 省市区选择框 -->
   <x-form-col
     v-else-if="attr.type === 'citySelect' && show"
+    :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
       :ref="attr.model"
@@ -411,6 +421,7 @@
   <!-- 地点搜索框 -->
   <x-form-col
     v-else-if="attr.type === 'addressSearch' && show"
+    :labelCol="labelCol"
     :occupyCol="attr.occupyCol"
     :flex="attr.flex">
     <a-form-model-item
@@ -433,6 +444,7 @@
   <!-- 人员选择框 -->
   <x-form-col
     v-else-if="attr.type === 'personSetting' && show"
+    :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
       :ref="attr.model"
@@ -444,6 +456,7 @@
   <!-- 树形选择框 -->
   <x-form-col
     v-else-if="attr.type === 'treeSelect' && show"
+    :labelCol="labelCol"
     :flex="attr.flex">
     <x-tree-select
       @onChange="attr.dataChangeFunc && debouncedDataChangeFunc()"
@@ -456,6 +469,7 @@
   <!-- 列表选择框 -->
   <x-form-col
     v-else-if="attr.type === 'listSelect' && show"
+    :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
       :ref="attr.model"
@@ -515,6 +529,7 @@
   <!-- 评分框 -->
   <x-form-col
     v-else-if="attr.type === 'rate' && show"
+    :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
       :ref="attr.model"
@@ -529,6 +544,7 @@
   <!--  区间选择器  -->
   <x-form-col
     v-else-if="attr.type === 'intervalPicker' && show"
+    :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
       :ref="attr.model"
@@ -565,6 +581,7 @@
   <!--  车牌号选择  -->
   <x-form-col
     v-else-if="attr.type === 'licensePlate' && show"
+    :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
       :ref="attr.model"
@@ -592,6 +609,7 @@
   <!-- 录音 -->
   <x-form-col
     v-else-if="attr.type === 'recording' && show"
+    :labelCol="labelCol"
     :flex="attr.flex">
     <recording
       ref="recording"
@@ -602,6 +620,7 @@
   <!-- 表格录入 -->
   <x-form-col
     v-else-if="attr.type === 'rowEdit' && show"
+    :labelCol="labelCol"
     :flex="attr.flex">
     <a-form-model-item
       :ref="attr.model"
@@ -766,6 +785,10 @@ export default {
         () => {
           return true
         }
+    },
+    labelCol: {
+      type: Object,
+      default: () => { return { span: 8 } }
     }
   },
   provide () {

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

@@ -55,6 +55,14 @@ export default {
       type: Number,
       default: 1,
     },
+    layout: {
+      type: String,
+      default: 'horizontal',
+    },
+    labelCol: {
+      type: Object,
+      default: () => { return { span: 8 } }
+    }
   },
   computed: {
     computedFlex () {
@@ -67,16 +75,19 @@ export default {
       const columnsCount = 24 / realFlex
       // 2. 计算基准列宽
       const baseColumnWidth = (this.parentWidth / columnsCount) - ((columnsCount - 1) * 16)
-      // console.log('调试信息:', {
-      //   parentWidth: this.parentWidth,
-      //   computedFlex: realFlex,
-      //   columnsCount,
-      //   baseColumnWidth,
-      // })
       // 3. 计算label宽度
-      const labelWidth = Math.max(baseColumnWidth / 3, 80)
+      const labelWidth = Math.max(baseColumnWidth / (24 / this.labelCol.span), 80)
+      // 计算左右偏移量
+      const offset = this.labelCol.offset ? (this.labelCol.offset / 24) * 100 : 0
+      if (this.layout === 'vertical') {
+        return {
+          '--form-label-width': '',
+          '--form-offset': '',
+        }
+      }
       return {
         '--form-label-width': `${labelWidth}px`,
+        '--form-offset': `${offset}%`,
       }
     },
     computedStyles () {
@@ -138,8 +149,8 @@ export default {
     .ant-form-item-label {
       max-width: var(--form-label-width);
     }
-    .ant-form-item-control-wrapper{
-      width: calc(100% - var(--form-label-width));
+    .ant-form-item-control-wrapper {
+      width: calc(100% - var(--form-label-width) - var(--form-offset) - var(--form-offset));
     }
   }
 }

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

@@ -6,7 +6,7 @@
       title="示例表单"
       :queryParamsName="queryParamsName"
       :fixedAddForm="fixedAddForm"
-      service-name="af-scada"
+      service-name="af-revenue"
       @action="action"
       @columnClick="columnClick"
       ref="xFormTable">
@@ -25,7 +25,7 @@ export default {
   data () {
     return {
       // 查询配置文件名
-      queryParamsName: 'flowStationReportCRUD',
+      queryParamsName: 'ChargeQueryCRUD',
       // 查询配置左侧tree
       // xTreeConfigName: 'addressType',
       // 新增表单固定值

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

@@ -9,7 +9,6 @@
       <XReportDesign
         @updateImg="updateImg"
         v-if="scanFinish"
-        id="printReady"
         :show-img-in-cell="showImgInCell"
         :img-prefix="imgPrefix"
         :use-oss-for-img="useOssForImg"
@@ -18,6 +17,7 @@
         :slot-config-name="type === 'display' ? undefined : activatedSlotName"
         :for-display="type === 'display'"
         ref="XReportDesign"
+        id="printReady"
         :server-name="serverName"
         :show-title="showTitle"
         :no-padding="noPadding"
@@ -48,9 +48,8 @@
         </a-radio-button>
         <!--   主体表格   -->
         <XReportDesign
-          @updateImg="updateImg"
           v-if="scanFinish"
-          id="printReady"
+          @updateImg="updateImg"
           :show-img-in-cell="showImgInCell"
           :img-prefix="imgPrefix"
           :use-oss-for-img="useOssForImg"
@@ -58,11 +57,12 @@
           :config="type === 'display' ? originalConfig : activeConfig"
           :slot-config-name="type === 'display' ? undefined : activatedSlotName"
           :for-display="type === 'display'"
-          ref="XReportDesign"
-          :server-name="serverName"
-          :show-title="showTitle"
           :no-padding="noPadding"
           :no-top-border="noTopBorder"
+          :show-title="showTitle"
+          ref="XReportDesign"
+          id="printReady"
+          :server-name="serverName"
           :show-images="hasImages"
           :image-list="imageList">
         </XReportDesign>
@@ -387,8 +387,7 @@ export default {
     // 打印
     printDocument () {
       // x-report
-      // const printContent = window.rawDocument.getElementById('printReady')
-      const printContent = window.document.getElementById('printReady')
+      const printContent = window.rawDocument.getElementById('printReady')
       printElement(printContent)
       this.$message.success('操作成功！')
     },

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

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

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

@@ -15,9 +15,9 @@
       <div
         :class=" noPadding ? 'reportMainNoPadding' : 'reportMain'"
         :style="activatedConfig.width > 0 ? ('width:' + activatedConfig.width + 'px') : undefined">
-        <!--      大标题
-        <h2 class="reportTitle" v-if="showTitle && activatedConfig.title" v-html="activatedConfig.title"></h2>-->
-        <!--      小标题 / 介乎于标题与表格之间的内容
+        <!--      大标题      -->
+        <h2 class="reportTitle" v-if="showTitle && activatedConfig.title" v-html="activatedConfig.title"></h2>
+        <!--      小标题 / 介乎于标题与表格之间的内容      -->
         <div class="subTitle" v-if="activatedConfig.subTitle">
           <div class="subTitleItems" v-for="(item, itemIndex) in activatedConfig.subTitle" :key="itemIndex">
             <template v-if="item.type === 'column'">
@@ -40,7 +40,7 @@
               </div>
             </template>
           </div>
-        </div>  -->
+        </div>
         <!--      主体表格      -->
         <table class="reportTable" v-if="render" :style="activatedConfig.style ? activatedConfig.style : undefined">
           <tbody class="reportTable">
@@ -54,7 +54,6 @@
                 :server-name="serverName"
                 :use-oss-for-img="useOssForImg"
                 :key="rowIndex"
-                :row-key="rowIndex"
                 :columns="row"
                 :no-top-border="noTopBorder"
                 :config-data="activatedConfig.data"
@@ -72,7 +71,6 @@
                 :use-oss-for-img="useOssForImg"
                 :config="activatedConfig"
                 :key="rowIndex + listIndex"
-                :row-key="rowIndex"
                 :columns="row"
                 :no-top-border="noTopBorder"
                 :config-data="activatedConfig.data"
@@ -95,7 +93,6 @@
                   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">
                   <!--  动态行交互按钮  -->
@@ -107,7 +104,6 @@
                     :use-oss-for-img="useOssForImg"
                     :config="activatedConfig"
                     :key="rowIndex"
-                    :row-key="rowIndex"
                     :columns="row"
                     :no-top-border="noTopBorder"
                     :config-data="activatedConfig.data"
@@ -314,7 +310,7 @@ export default {
 }
 
 .reportMain {
-  text-align: left;
+  text-align: center;
   margin: 0 auto;
   font-size: 16px;
   color: #000;
@@ -342,7 +338,7 @@ export default {
 
     .inputsDivItem {
       display: flex;
-      align-items: left;
+      align-items: center;
       padding: 0 4px;
       white-space: nowrap;
 
@@ -361,7 +357,7 @@ export default {
 }
 
 .reportMainForDisplay {
-  text-align: left;
+  text-align: center;
   margin: 10% auto;
   font-size: 16px;
   color: #000;
@@ -388,7 +384,7 @@ export default {
 
     .inputsDivItem {
       display: flex;
-      align-items: left;
+      align-items: center;
       padding: 0 4px;
       white-space: nowrap;
 
@@ -407,7 +403,7 @@ export default {
 }
 
 .reportMainNoPadding {
-  text-align: left;
+  text-align: center;
   margin: 0 auto;
   font-size: 16px;
   color: #000;
@@ -433,7 +429,7 @@ export default {
 
     .inputsDivItem {
       display: flex;
-      align-items: left;
+      align-items: center;
       padding: 0 4px;
       white-space: nowrap;
 

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

@@ -1,5 +1,5 @@
 <template>
-  <tr :style="calculateTrStyle(rowKey, config)">
+  <tr>
     <!--  预览页展示  -->
     <template v-if="display">
       <template v-if="!inputColumns">
@@ -9,7 +9,6 @@
           :key="cellIndex"
           :class=" calcTDBorder(cell.noBoarder) "
           :style="determineCellStyle(cell)"
-          :rowspan="cell.rowSpan ? cell.rowSpan : undefined"
           :colspan="cell.colSpan ? cell.colSpan : undefined">
           <template v-if="cell.type === 'column'">
             <template v-if="cell.customFunction">
@@ -372,7 +371,6 @@
 import Upload from '@vue2-client/base-client/components/common/Upload'
 import { formatDate } from '@vue2-client/utils/util'
 import { nanoid } from 'nanoid'
-import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 
 export default {
   name: 'XReportTrGroup',
@@ -444,12 +442,7 @@ export default {
     imgPrefix: {
       type: String,
       default: undefined
-    },
-    // 接收父组件传递的 row-key
-    rowKey: {
-      type: Number,
-      default: null
-    },
+    }
   },
   data () {
     return {
@@ -524,13 +517,13 @@ export default {
       // 普通带边框单元格
       const withBorder = {
         border: borderWidth + ' solid ' + color,
-        padding: '4px, 2px'
+        padding: '8px'
       }
       // 只有左右边框的单元格
       const noBorder = {
         borderLeft: borderWidth + ' solid ' + color,
         borderRight: borderWidth + ' solid ' + color,
-        padding: '4px, 2px'
+        padding: '8px'
       }
       // 只没有上边框的单元格
       const NoTopBorder = {
@@ -538,52 +531,44 @@ export default {
         borderLeft: borderWidth + ' solid ' + color,
         borderRight: borderWidth + ' solid ' + color,
         borderBottom: borderWidth + ' solid ' + color,
-        padding: '4px, 2px'
+        padding: '8px'
       }
-
       let result = {}
-
-      // 先添加单元格通用样式
-      if (this.config.cellStyle) {
-        result = { ...result, ...this.config.cellStyle }
-      }
-
       // 如果表格也声明了样式，用表格样式将样式覆盖
       if (cell.style) {
         if (cell.noBorder) {
-          result = { ...noBorder, ...result, ...cell.style }
+          result = { ...noBorder, ...cell.style }
         } else {
           if (this.noTopBorder) {
-            result = { ...NoTopBorder, ...result, ...cell.style }
+            result = { ...NoTopBorder, ...cell.style }
           } else {
-            result = { ...withBorder, ...result, ...cell.style }
+            result = { ...withBorder, ...cell.style }
           }
         }
-
         return result
       }
       // 如果表头声明了样式，则用其将基础样式覆盖
       if (cell.type === 'column') {
         if (this.config.labelStyle !== undefined) {
           if (cell.noBorder) {
-            result = { ...noBorder, ...this.config.labelStyle, ...result }
+            result = { ...noBorder, ...this.config.labelStyle }
           } else {
             if (this.noTopBorder) {
-              result = { ...NoTopBorder, ...this.config.labelStyle, ...result }
+              result = { ...NoTopBorder, ...this.config.labelStyle }
             } else {
-              result = { ...withBorder, ...this.config.labelStyle, ...result }
+              result = { ...withBorder, ...this.config.labelStyle }
             }
           }
           return result
         }
       }
       if (cell.noBorder) {
-        result = { ...noBorder, ...result }
+        result = { ...noBorder }
       } else {
         if (this.noTopBorder) {
-          result = { ...NoTopBorder, ...result }
+          result = { ...NoTopBorder }
         } else {
-          result = { ...withBorder, ...result }
+          result = { ...withBorder }
         }
       }
       return result
@@ -618,10 +603,10 @@ export default {
       this.configData = Object.assign({}, this.configData)
     },
     // 反序列化函数并执行
-    deserializeFunctionAndRun (functionStr, value, config) {
+    deserializeFunctionAndRun (functionStr, value) {
       // eslint-disable-next-line no-eval
-      const result = executeStrFunctionByContext(this, functionStr, [value, config.data])
-      return result
+      const fun = eval('(' + functionStr + ')')
+      return fun(value, this.config)
     },
     // 基础上传组件，图片改动后触发
     setImages (args, type, index = undefined) {
@@ -775,25 +760,6 @@ export default {
 
       return result
     },
-    calculateTrStyle (key, config) {
-      // 初始化行样式
-      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) {
@@ -824,12 +790,12 @@ export default {
 .tdNoBorder {
   border-left: 1px solid #000;
   border-right: 1px solid #000;
-  padding: 4px, 2px;
+  padding: 8px;
 }
 
 .tdWithBorder {
   border: 1px solid #000;
-  padding: 4px, 2px;
+  padding: 8px;
 }
 
 .tdWithNoTopBorder {

package/src/bootstrap.js

@@ -20,8 +20,8 @@ async function bootstrap ({ router, store, i18n, message }) {
   if (store) {
     await getConfigByName('webConfig', undefined, res => {
       localStorage.setItem(process.env.VUE_APP_WEB_CONFIG_KEY, JSON.stringify(res))
-      if (res.setting) {
-        Vue.$store.commit('setting/setSetting', res.setting)
+      if (res?.setting) {
+        Vue.$store.commit('setting/setSetting', res?.setting)
       }
     })
   }

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

@@ -84,9 +84,9 @@ routerResource.example = {
           path: 'default',
           name: '示例页面',
           // 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/XFormTable/demo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),