vue2-client 1.12.99 → 1.12.101

package/package.json

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

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

@@ -175,6 +175,9 @@ export default {
       this.yearShowOne = status
     },
     RangePanelChange (value, mode) {
+      if (value.length === 0) {
+        return
+      }
       this.localValue = [
         moment(value[0]).format(this.formatType),
         moment(value[1]).format(this.formatType),

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

@@ -1,39 +1,40 @@
 <template>
   <!-- 时间轴主容器 -->
-  <div class='x-timeline'>
+  <div class="x-timeline">
     <!-- 时间轴导航栏 -->
-    <div class='x-timeline-nav'>
+    <div class="x-timeline-nav">
       <!-- 导航按钮：前一周、前一天 -->
-      <a-button type="link" @click='goToPrevWeek'>
+      <a-button type="link" @click="goToPrevWeek">
         <a-icon type="double-left" />
         {{ config?.prevWeekText || '前一周' }}
       </a-button>
-      <a-button type="link" @click='goToPrevDay'>
+      <a-button type="link" @click="goToPrevDay">
         <a-icon type="left" />
         {{ config?.prevDayText || '前一天' }}
       </a-button>
       <!-- 日期显示区域 -->
-      <div class='timeline-dates'>
-        <div v-for='(date, index) in displayDates'
-             :key='index'
-          class='date-item'
-          :class='{
-            "ant-btn-primary": isCurrentDate(date),
-            "date-weekend": isWeekend(date),
-            "ant-btn-disabled": isDisabled(date)
-          }'
-          @click='selectDate(date)'
+      <div class="timeline-dates">
+        <div
+          v-for="(date, index) in displayDates"
+          :key="index"
+          class="date-item"
+          :class="{
+            &quot;ant-btn-primary&quot;: isCurrentDate(date),
+            &quot;date-weekend&quot;: isWeekend(date),
+            &quot;ant-btn-disabled&quot;: isDisabled(date)
+          }"
+          @click="selectDate(date)"
         >
-          <div class='weekday'>{{ getWeekDay(date) }}</div>
-          <div class='date'>{{ formatDate(date) }}</div>
+          <div class="weekday">{{ getWeekDay(date) }}</div>
+          <div class="date">{{ formatDate(date) }}</div>
         </div>
       </div>
       <!-- 导航按钮：后一天、后一周 -->
-      <a-button type="link" @click='goToNextDay'>
+      <a-button type="link" @click="goToNextDay">
         {{ config?.nextDayText || '后一天' }}
         <a-icon type="right" />
       </a-button>
-      <a-button type="link" @click='goToNextWeek'>
+      <a-button type="link" @click="goToNextWeek">
         {{ config?.nextWeekText || '后一周' }}
         <a-icon type="double-right" />
       </a-button>

package/src/base-client/components/his/XRadio/XRadio.vue

@@ -30,6 +30,7 @@ export default {
       type: Object,
       default: null
     },
+    // eslint-disable-next-line vue/require-default-prop
     value: [String, Number]
   },
   data () {

package/src/base-client/components/his/XSidebar/XSidebar.vue

@@ -10,7 +10,7 @@
         {{ isOpen ? '›' : '‹' }}
       </div>
     </div>
-    <div class="drawer-content" v-if="isOpen">
+    <div class="drawer-content" v-show="isOpen">
       <x-report
         ref="x_report"
         :configName="queryParamsName"
@@ -56,12 +56,38 @@ export default {
   mounted () {
     // 在挂载后调整父元素宽度
     this.updateLayout(this.isOpen)
+    // 如果抽屉初始状态为打开，设置padding
+    if (this.isOpen) {
+      this.updateCardBodyPadding()
+    }
   },
   methods: {
     toggleDrawer () {
       this.isOpen = !this.isOpen
       this.$emit('on-drawer-change', this.isOpen)
       this.updateLayout(this.isOpen)
+      if (this.isOpen) {
+        this.$nextTick(() => {
+          this.updateCardBodyPadding()
+        })
+      }
+    },
+    // 更新card-body的padding
+    updateCardBodyPadding () {
+      this.$nextTick(() => {
+        const cardBody = this.$el.querySelector('.ant-card-body')
+        if (cardBody) {
+          cardBody.style.padding = '3%'
+        } else {
+          // 如果找不到元素，可能需要等待XReport完全渲染
+          setTimeout(() => {
+            const cardBody = this.$el.querySelector('.ant-card-body')
+            if (cardBody) {
+              cardBody.style.padding = '3%'
+            }
+          }, 500)
+        }
+      })
     },
     // 获取同级的其他所有a-col元素
     getSiblingCols () {
@@ -101,14 +127,14 @@ export default {
               currentCol = currentCol.parentNode
             }
             if (currentCol) {
-              // 更新当前列的宽度
+              //  更新当前列的宽度
               const drawerWidth = isOpen ? 33.3 : 2
               // 强制更新样式
               currentCol.style.cssText = `
             flex: 0 0 ${drawerWidth}% !important;
             max-width: ${drawerWidth}% !important;
             transition: all 0.3s;`
-              // 触发XTab组件重新计算宽度
+              //  触发XTab组件重新计算宽度
               this.$nextTick(() => {
                 const tabComponent = this.$el.querySelector('.ant-tabs')
                 if (tabComponent) {
@@ -116,7 +142,7 @@ export default {
                   window.dispatchEvent(new Event('resize'))
                 }
               })
-              // 更新其他列宽度
+              //  更新其他列宽度
               otherCols.forEach((col, index) => {
                 if (index < this.mainWithData.length) {
                   const widthValue = isOpen ? this.mainWithData[index].min : this.mainWithData[index].max
@@ -138,7 +164,6 @@ export default {
     configData: {
       handler (newValue) {
         console.log('configData changed:', newValue)
-        this.renderingComponent(newValue)
       },
       immediate: true
     }

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

@@ -1,130 +1,130 @@
-<template>
-  <div>
-    <div class="filter-bar">
-      <a-date-picker v-model="upload_date" placeholder="上传日期" @change="selfSearch" />
-      <a-select
-        style="width: 200px;"
-        v-model="fusetype"
-        :options="fusetypes"
-        placeholder="分类"
-        @change="selfSearch"
-        allow-clear />
-      <a-button type="primary" @click="selfSearch">查询</a-button>
-    </div>
-    <a-list bordered>
-      <a-list-item v-for="item in files" :key="item.days">
-        <div class="file-group">
-          <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')" />
-              <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-button v-if="isDelete === '1'" @click="delet(file.id)">删除</a-button>
-            </div>
-          </div>
-        </div>
-      </a-list-item>
-    </a-list>
-  </div>
-</template>
-
-<script>
-import { post } from '@vue2-client/services/api'
-export default {
-  props: {
-    currUserInfo: {
-      type: Object,
-      default: () => undefined
-    }
-  },
-  data () {
-    return {
-      upload_date: null,
-      fusetype: null,
-      files: [],
-      fusetypes: [],
-      isDelete: '0'
-    }
-  },
-  methods: {
-    async getfusetypes () {
-      this.fusetypes = [{ label: '全部', value: '' }]
-      const res = await post('/api/af-revenue/sql/singleTable_OrderBy', {
-        data: {
-          items: 'fusetype',
-          tablename: 't_files',
-          condition: `fusetype is not null GROUP BY fusetype`,
-          orderitem: 'fusetype'
-        }
-      })
-      this.fusetypes.push(...res.map(item => ({ label: item.fusetype, value: item.fusetype })))
-      console.log('123456', this.fusetypes)
-    },
-    async getFiles () {
-      console.log('999', this.currUserInfo)
-      if (!this.currUserInfo) return
-      this.files = []
-      let condition = `CONVERT(varchar(200),f_blobid) = '${this.currUserInfo.f_userinfo_id}'`
-      if (this.upload_date) {
-        condition += ` and CONVERT(VARCHAR(100), f_uploaddate, 23) = '${this.upload_date}'`
-      }
-      if (this.fusetype) {
-        condition += ` and fusetype = '${this.fusetype}'`
-      }
-      const res = await post('/api/af-revenue/logic/getAllFiles', { data: { condition } })
-      console.log('7777', res)
-      console.log('7777', res.days)
-      this.files = res.days.map(day => ({
-        days: day.uploadday,
-        arrays: res.array.filter(file => file.uploadday === day.uploadday)
-      }))
-    },
-    async delet (fileId) {
-      await this.$resetdelete('rs/entity/t_files', { id: fileId }, { resolveMsg: '删除成功', rejectMsg: '删除失败' })
-      this.getFiles()
-    },
-    selfSearch () {
-      this.getFiles()
-    }
-  },
-  mounted () {
-    if (this.$login.r.includes('上传附件删除')) {
-      this.isDelete = '1'
-    }
-    this.getFiles()
-    this.getfusetypes()
-  }
-}
-</script>
-
-<style scoped>
-.filter-bar {
-  display: flex;
-  gap: 10px;
-  margin-bottom: 15px;
-}
-.file-group {
-  margin-bottom: 15px;
-}
-.file-items {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 10px;
-}
-.file-card {
-  border: 1px solid #ddd;
-  padding: 10px;
-  border-radius: 5px;
-  width: 200px;
-}
-.file-image {
-  width: 100%; /* 让图片填充整个容器 */
-  height: 150px; /* 调整高度 */
-  object-fit: cover; /* 保持图片比例，填充整个区域 */
-  border-radius: 5px; /* 圆角边框 */
-}
-</style>
+<template>
+  <div>
+    <div class="filter-bar">
+      <a-date-picker v-model="upload_date" placeholder="上传日期" @change="selfSearch" />
+      <a-select
+        style="width: 200px;"
+        v-model="fusetype"
+        :options="fusetypes"
+        placeholder="分类"
+        @change="selfSearch"
+        allow-clear />
+      <a-button type="primary" @click="selfSearch">查询</a-button>
+    </div>
+    <a-list bordered>
+      <a-list-item v-for="item in files" :key="item.days">
+        <div class="file-group">
+          <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')" />
+              <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-button v-if="isDelete === '1'" @click="delet(file.id)">删除</a-button>
+            </div>
+          </div>
+        </div>
+      </a-list-item>
+    </a-list>
+  </div>
+</template>
+
+<script>
+import { post } from '@vue2-client/services/api'
+export default {
+  props: {
+    currUserInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  },
+  data () {
+    return {
+      upload_date: null,
+      fusetype: null,
+      files: [],
+      fusetypes: [],
+      isDelete: '0'
+    }
+  },
+  methods: {
+    async getfusetypes () {
+      this.fusetypes = [{ label: '全部', value: '' }]
+      const res = await post('/api/af-revenue/sql/singleTable_OrderBy', {
+        data: {
+          items: 'fusetype',
+          tablename: 't_files',
+          condition: `fusetype is not null GROUP BY fusetype`,
+          orderitem: 'fusetype'
+        }
+      })
+      this.fusetypes.push(...res.map(item => ({ label: item.fusetype, value: item.fusetype })))
+      console.log('123456', this.fusetypes)
+    },
+    async getFiles () {
+      console.log('999', this.currUserInfo)
+      if (!this.currUserInfo) return
+      this.files = []
+      let condition = `CONVERT(varchar(200),f_blobid) = '${this.currUserInfo.f_userinfo_id}'`
+      if (this.upload_date) {
+        condition += ` and CONVERT(VARCHAR(100), f_uploaddate, 23) = '${this.upload_date}'`
+      }
+      if (this.fusetype) {
+        condition += ` and fusetype = '${this.fusetype}'`
+      }
+      const res = await post('/api/af-revenue/logic/getAllFiles', { data: { condition } })
+      console.log('7777', res)
+      console.log('7777', res.days)
+      this.files = res.days.map(day => ({
+        days: day.uploadday,
+        arrays: res.array.filter(file => file.uploadday === day.uploadday)
+      }))
+    },
+    async delet (fileId) {
+      await this.$resetdelete('rs/entity/t_files', { id: fileId }, { resolveMsg: '删除成功', rejectMsg: '删除失败' })
+      this.getFiles()
+    },
+    selfSearch () {
+      this.getFiles()
+    }
+  },
+  mounted () {
+    if (this.$login.r.includes('上传附件删除')) {
+      this.isDelete = '1'
+    }
+    this.getFiles()
+    this.getfusetypes()
+  }
+}
+</script>
+
+<style scoped>
+.filter-bar {
+  display: flex;
+  gap: 10px;
+  margin-bottom: 15px;
+}
+.file-group {
+  margin-bottom: 15px;
+}
+.file-items {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+}
+.file-card {
+  border: 1px solid #ddd;
+  padding: 10px;
+  border-radius: 5px;
+  width: 200px;
+}
+.file-image {
+  width: 100%; /* 让图片填充整个容器 */
+  height: 150px; /* 调整高度 */
+  object-fit: cover; /* 保持图片比例，填充整个区域 */
+  border-radius: 5px; /* 圆角边框 */
+}
+</style>

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

@@ -56,7 +56,7 @@ 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/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/XRate/demo.vue'),
@@ -71,7 +71,7 @@ routerResource.example = {
   // component: () => import('@vue2-client/components/g2Charts/demo.vue'),
   // component: () => import('@vue2-client/pages/LogicCallExample/index.vue'),
   // component: () => import('@vue2-client/components/FilePreview/FilePreviewDemo.vue'),
-  // component: () => import('@vue2-client/pages/ReportGrid/index.vue'),
+  component: () => import('@vue2-client/pages/ReportGrid/index.vue'),
 }
 // routerResource.example = () =>
 //    import('@vue2-client/pages/Example')