vue2-client 1.16.91 → 1.16.94

package/package.json

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

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

@@ -25,6 +25,7 @@ const wrapperClassObject = computed(() => {
     'width173',
     'button_refresh',
     'border', 'no-style',
+    'fill-container',
     'one-button-style' // 一个按钮样式，占满整个宽度
   ]
   for (const key of booleanStyleKeys) {

package/src/base-client/components/common/XDatePicker/index.vue

@@ -40,6 +40,11 @@ export default {
       type: Boolean,
       default: false,
     },
+    // 是否启用时间弹出到最外层
+    enablePopupToBody: {
+      type: Boolean,
+      default: false
+    },
     getCalendarContainer: {
       type: Function,
       default: (triggerNode) => triggerNode.parentNode,
@@ -187,6 +192,9 @@ export default {
         moment(value[1]).format(this.formatType),
       ]
     },
+    getBodyContainer (triggerNode) {
+      return document.body
+    }
   },
 }
 </script>
@@ -199,7 +207,8 @@ export default {
         (attr?.queryType !== 'BETWEEN' || mode !== '查询')) ||
         (['rangePicker'].includes(attr.type) && mode !== '查询')
     "
-    :getCalendarContainer="getCalendarContainer"
+    :getCalendarContainer="enablePopupToBody? undefined :getCalendarContainer"
+    :getPopupContainer="enablePopupToBody? getBodyContainer : undefined"
     v-model="localValue"
     :disabled="disabled || readOnly"
     style="width: 100%"
@@ -215,7 +224,8 @@ export default {
       attr.type === 'monthPicker' ||
         (attr.type === 'monthRangePicker' && mode !== '查询')
     "
-    :getCalendarContainer="(triggerNode) => triggerNode.parentNode"
+    :getCalendarContainer="enablePopupToBody? undefined :getCalendarContainer"
+    :getPopupContainer="enablePopupToBody? getBodyContainer : undefined"
     v-model="localValue"
     :disabled="disabled || readOnly"
     :show-time="true"
@@ -229,7 +239,8 @@ export default {
       attr.type === 'yearPicker' ||
         (attr.type === 'yearRangePicker' && mode !== '查询')
     "
-    :getCalendarContainer="(triggerNode) => triggerNode.parentNode"
+    :getCalendarContainer="enablePopupToBody? undefined :getCalendarContainer"
+    :getPopupContainer="enablePopupToBody? getBodyContainer : undefined"
     v-model="localValue"
     :disabled="disabled || readOnly"
     format="YYYY"
@@ -254,7 +265,8 @@ export default {
         (attr.type === 'rangePicker' && mode === '查询') ||
         ['yearRangePicker', 'monthRangePicker'].includes(attr.type)
     "
-    :getCalendarContainer="(triggerNode) => triggerNode.parentNode"
+    :getCalendarContainer="enablePopupToBody? undefined :getCalendarContainer"
+    :getPopupContainer="enablePopupToBody? getBodyContainer : undefined"
     v-model="localValue"
     :disabled="disabled"
     :placeholder="placeholder"

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

@@ -381,6 +381,7 @@
       <XFormDatePicker
         :attr="attr"
         :mode="mode"
+        :enablePopupToBody="enablePopupToBody"
         :getCalendarContainer="getPopupContainer"
         :disabled="disabled"
         :readOnly="readOnly"
@@ -1487,7 +1488,7 @@ export default {
     },
     getPopupContainer (triggerNode) {
       // 行编辑模式特殊处理
-      if (this.$vnode?.key.startsWith('editRow')) {
+      if (typeof this.$vnode?.key === 'string' && this.$vnode.key.startsWith('editRow')) {
         // 限制最多向上查找5层
         let parent = triggerNode.parentNode
         let depth = 0

package/src/base-client/components/common/XTable/XTableWrapper.vue

@@ -71,7 +71,7 @@
       <span v-else-if="item.slotType === 'gotoUserDetail'" :key="'gotoUserDetail-' + c_index">
         <a @click="tableContext.gotoUserDetail(item.dataIndex,text,record)">{{ text }}</a>
       </span>
-      <span v-else-if="item.slotType === 'ellipsis'" :key="'ellipsis-' + c_index">
+      <span v-else-if="['ellipsis','fixed'].includes(item.slotType)" :key="'ellipsis-' + c_index">
         <span>{{ text === '' ? '--' : text }}</span>
       </span>
       <span v-else-if="item.slotType === 'badge'" :key="'badge-' + c_index">
@@ -208,7 +208,7 @@
       <span v-else-if="item.slotType === 'gotoUserDetail'" :key="'gotoUserDetail-' + c_index">
         <a @click="tableContext.gotoUserDetail(item.dataIndex,text,record)">{{ text }}</a>
       </span>
-      <span v-else-if="item.slotType === 'ellipsis'" :key="'ellipsis-' + c_index">
+      <span v-else-if="['ellipsis','fixed'].includes(item.slotType)" :key="'ellipsis-' + c_index">
         <!-- <ellipsis :length="item.slotValue" tooltip>{{ text === '' ? '--' : text }}</ellipsis> -->
         <span>{{ text === '' ? '--' : text }}</span>
       </span>
@@ -321,6 +321,7 @@ export default {
       return this.tableContext.expandedGrid ? this.$refs.expandableTable : this.$refs.simpleTable
     },
     realTableColumns () {
+      console.warn('====', this.tableContext.tableColumns)
       return this.tableContext.tableColumns.filter(item => item.slotType !== 'action' || !this.disableAction).map((item) => {
         // todo delete 后台现在也是200 不过要清楚配置缓存 这里是为了让不清缓存也能达到争取的效果
         // if (item.slotType === 'date' || item.slotType === 'dateTime') {

package/src/base-client/components/his/XImportExcelButton/XFrontImportExcel.vue

@@ -50,7 +50,7 @@
 
 <script>
 
-import { importData, downloadImportExcel, getNativeConfig } from '@vue2-client/services/api/common'
+import { importData, downloadImportExcel, getConfigByName } from '@vue2-client/services/api/common'
 import { excleParseArrays } from '@vue2-client/utils/excel/Export2Excel'
 import { mapState } from 'vuex'
 
@@ -135,18 +135,43 @@ export default {
         this.readTemplateConfig()
       }
     },
-    /** 读取excle导入模板 */
-   async readTemplateConfig () {
+    /** 读取Excel导入模板配置 */
+    async readTemplateConfig () {
       try {
-        const isProd = process.env.NODE_ENV === 'production'
-        const config = await getNativeConfig(this.queryParamsName, 'af-his', !isProd)
-        if (config != null && config != undefined) {
-          this.excelImportTemplate = config.column.filter(item =>
-            item.dataModeArray && item.dataModeArray.includes('excelImportItem')
-          ).map(item => item.key.replace('.', '_'))
+        // const isProd = process.env.NODE_ENV === 'production'
+        await getConfigByName(
+          this.queryParamsName,
+          'af-his',
+          (config) => {
+            // 更严格的空值检查
+            if (config?.tableAliasName && config?.excelImportTemplate?.[0]?.column) {
+              const { tableAliasName } = config
+              const columns = config.excelImportTemplate[0].column
+              // 生成Excel导入模板列
+              this.excelImportTemplate = columns.map(item =>
+                `${tableAliasName}_${item}`
+              )
+              console.log('Excel模板列配置加载成功', this.excelImportTemplate)
+              // 可以将中文字段名称也拿出来，解析数据的时候可以和表头对比
+            } else {
+              console.warn('配置信息不完整，无法生成Excel模板列')
+              this.excelImportTemplate = []
+            }
+          }
+        )
+      } catch (error) {
+        // 更完善的错误处理
+        console.error('读取Excel模板配置失败：', error.message || error.msg || error)
+        // 可以根据错误类型进行不同的处理
+        if (error.code === 'CONFIG_NOT_FOUND') {
+          // 处理配置不存在的情况
+          this.excelImportTemplate = []
+        } else if (error.code === 'NETWORK_ERROR') {
+          // 处理网络错误
+          console.error('网络连接失败，请检查网络设置')
         }
-      } catch (e) {
-        console.error('读取excle模板列报错：', e.msg)
+        // 可以选择抛出错误或返回默认值
+        throw new Error(`读取Excel模板配置失败: ${error.message}`)
       }
     },
     beforeUpload (file) {

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

@@ -790,7 +790,9 @@ export default {
 
             this.$emit('refresh')
             this.$emit('preClick', {
-              notes: notes
+              notes: notes,
+              fromStepId: this.currentStepId,
+              toStepId: this.preBtnTo
             })
             this.onClose()
             this.init()

package/src/pages/userInfoDetailManage/uploadFilesHistory/index.vue

@@ -17,12 +17,12 @@
           <h4>{{ item.days }}</h4>
           <div class="file-items">
             <div v-for="file in item.arrays" :key="file.id" class="file-card">
-              <img :src="file.f_downloadpath" class="file-image" v-if="file.f_filetype.includes('jpg') || file.f_filetype.includes('png')" @click="openPreview(file.f_downloadpath)" style="cursor:pointer" />
+              <img :src="getFileUrl(file.f_downloadpath)" class="file-image" v-if="file.f_filetype.includes('jpg') || file.f_filetype.includes('png')" @click="openPreview(file.f_downloadpath)" style="cursor:pointer" />
               <p>上传时间: {{ file.f_uploaddate }}</p>
               <p>操作员: {{ file.f_username }}</p>
               <p>分类: {{ file.fusetype }}</p>
               <p>说明: {{ file.fremarks }}</p>
-              <a :href="file.f_downloadpath" target="_blank">预览</a>
+              <a :href="getFileUrl(file.f_downloadpath)" target="_blank">预览</a>
               <a-button v-if="isDelete === '1'" @click="delet(file.id)">删除</a-button>
             </div>
           </div>
@@ -86,8 +86,38 @@ export default {
       this.getFiles()
     },
     openPreview (src) {
-      this.previewImg = src
+      this.previewImg = this.getFileUrl(src)
       this.previewVisible = true
+    },
+    getFileUrl (path) {
+      if (!path) return ''
+
+      console.log('原始路径:', path)
+
+      // 获取当前域名和端口
+      const baseUrl = `${window.location.protocol}//${window.location.host}`
+
+      // 如果是本地文件路径，转换为新的转发路径
+      if (path.match(/^[A-Za-z]:[\/\\]/)) {
+        // 提取文件名
+        const fileName = path.split(/[/\\]/).pop()
+        const newUrl = `${baseUrl}/rs/image/file/${fileName}`
+        console.log('转换后路径:', newUrl)
+        return newUrl
+      }
+      // 如果已经是HTTP路径，直接返回
+      if (path.startsWith('http')) {
+        console.log('HTTP路径，直接返回:', path)
+        return path
+      }
+      // 如果是相对路径，添加域名前缀
+      if (path.startsWith('/resource/')) {
+        const newUrl = `${baseUrl}${path}`
+        console.log('相对路径转换:', newUrl)
+        return newUrl
+      }
+      console.log('其他路径，直接返回:', path)
+      return path
     }
   },
   mounted () {