vue2-client 1.9.199 → 1.9.200

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.9.199",
+  "version": "1.9.200",
   "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,7 +6,7 @@ export default {
   name: 'Demo',
   components: { XAddNativeForm },
   mounted () {
-    getConfigByNameAsync('feeCategories', 'af-his').then(res => {
+    getConfigByNameAsync('formtestForm', 'af-system').then(res => {
       this.$refs.xAddFrom.init(Object.assign(res, {
         modifyModelData: {
           data: {

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

@@ -7,8 +7,6 @@
     <a-form-model-item
       :ref="attr.model"
       :label="showLabel?attr.name:undefined"
-      :labelCol="layout === 'inline' && attr.occupyCol ? labelAndWrapperCol[attr.occupyCol].labelCol:undefined"
-      :wrapperCol="layout === 'inline'&& attr.occupyCol ? labelAndWrapperCol[attr.occupyCol].wrapperCol:undefined"
       :style="layout === 'inline'&& attr.occupyCol && attr.occupyCol > 1? {width:`calc(100% - ${attr.occupyCol * 1.533}rem)`}:{}"
       :prop="attr.prop ? attr.prop : attr.model">
       <!--  如果配置了后置按钮插槽    -->
@@ -363,11 +361,9 @@
     </a-form-model-item>
   </x-form-col>
   <!-- 文本域 -->
-  <x-form-col v-else-if="attr.type === 'textarea' && show" :flex="attr.flex" :fullWidth="layout === 'inline'">
+  <x-form-col v-else-if="attr.type === 'textarea' && show" :flex="attr.flex">
     <!--    :style="layout === 'inline'?{width:'calc(100% - 60px)'}:{}"-->
     <a-form-model-item
-      :labelCol="layout === 'inline'?{span:2}:undefined"
-      :wrapperCol="layout === 'inline'?{span:22}:undefined"
       :ref="attr.model"
       :label="showLabel?attr.name:undefined"
       :prop="attr.prop ? attr.prop : attr.model">
@@ -382,11 +378,8 @@
   <!-- 文件上传 -->
   <x-form-col
     v-else-if="(attr.type === 'file' || attr.type === 'image') && show"
-    :flex="attr.flex"
-    :fullWidth="layout === 'inline'">
+    :flex="attr.flex">
     <a-form-model-item
-      :labelCol="layout === 'inline'?{span:2}:undefined"
-      :wrapperCol="layout === 'inline'?{span:22}:undefined"
       :ref="attr.model"
       :label="showLabel?attr.name:undefined"
       :prop="attr.prop ? attr.prop : attr.model">
@@ -425,8 +418,6 @@
       :ref="attr.model"
       :label="showLabel?attr.name:undefined"
       :prop="attr.prop ? attr.prop : attr.model"
-      :labelCol="layout === 'inline' && attr.occupyCol ? labelAndWrapperCol[attr.occupyCol].labelCol:undefined"
-      :wrapperCol="layout === 'inline'&& attr.occupyCol ? labelAndWrapperCol[attr.occupyCol].wrapperCol:undefined"
       :style="layout === 'inline'&& attr.occupyCol && attr.occupyCol > 1? {width:`calc(100% - ${attr.occupyCol * 1.533}rem)`}:{}">
       <address-search-combobox
         :emitFunc="emitFunc"
@@ -471,8 +462,6 @@
     <a-form-model-item
       :ref="attr.model"
       :label="showLabel?attr.name:undefined"
-      :labelCol="layout === 'inline' && attr.occupyCol ? labelAndWrapperCol[attr.occupyCol].labelCol:undefined"
-      :wrapperCol="layout === 'inline'&& attr.occupyCol ? labelAndWrapperCol[attr.occupyCol].wrapperCol:undefined"
       :style="layout === 'inline'&& attr.occupyCol && attr.occupyCol > 1? {width:`calc(100% - ${attr.occupyCol * 1.533}rem)`}:{}"
       :prop="attr.prop ? attr.prop : attr.model">
       <a-popover
@@ -685,22 +674,6 @@ export default {
       optionForFunc: [],
       // 控制当前表单项是否展示
       show: true,
-      labelAndWrapperCol: [{
-        labelCol: undefined,
-        wrapperCol: undefined
-      },
-        {
-          labelCol: undefined,
-          wrapperCol: undefined
-        },
-        {
-          labelCol: { span: 3 },
-          wrapperCol: { span: 21 }
-        },
-        {
-          labelCol: { span: 2 },
-          wrapperCol: { span: 22 }
-        }],
       // moment
       moment,
       // 行选择器浮层是否显示
@@ -1054,7 +1027,8 @@ export default {
               md: 24,
               lg: 24,
               xl: 24,
-              xxl: 24
+              xxl: 24,
+              fullWidth: true
             }
           } else {
             // 新增修改表单 vertical 模式下默认为1列

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

@@ -1,6 +1,11 @@
 <template>
   <a-col :style="computedStyles">
-    <slot></slot>
+    <div
+      class="x-form-col-wrapper"
+      :style="computedWrapperStyles"
+    >
+      <slot></slot>
+    </div>
   </a-col>
 </template>
 
@@ -10,7 +15,16 @@ const BREAKPOINTS = {
   sm: 768,
   md: 992,
   lg: 1200,
-  xl: 1600
+  xl: 1600,
+}
+
+const defaultFlex = {
+  xs: 24,
+  sm: 24,
+  md: 8,
+  lg: 8,
+  xl: 6,
+  xxl: 6,
 }
 
 function debounce (fn, delay) {
@@ -31,56 +45,68 @@ export default {
       default: () => ({
         xs: 24,
         sm: 24,
-        md: 12,
-        lg: 8,
+        md: 8,
+        lg: 6,
         xl: 6,
         xxl: 6,
       }),
     },
     occupyCol: {
       type: Number,
-      default: 1
+      default: 1,
     },
-    fullWidth: {
-      type: Boolean,
-      default: false
-    }
   },
   computed: {
     computedFlex () {
       const parentWidth = this.parentWidth
-      if (parentWidth === 0) {
-        return this.flex.xs
+      return this.getFlex(parentWidth, this.flex)
+    },
+    computedWrapperStyles () {
+      const realFlex = this.flex.fullWidth ? this.getFlex(this.parentWidth) : this.computedFlex
+      // 1. 计算列数
+      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)
+      return {
+        '--form-label-width': `${labelWidth}px`,
       }
-      if (parentWidth < BREAKPOINTS.xs) return this.flex.xs
-      if (parentWidth < BREAKPOINTS.sm) return this.flex.sm
-      if (parentWidth < BREAKPOINTS.md) return this.flex.md
-      if (parentWidth < BREAKPOINTS.lg) return this.flex.lg
-      if (parentWidth < BREAKPOINTS.xl) return this.flex.xl
-      return this.flex.xxl
     },
     computedStyles () {
       const realFlex = Math.min(this.computedFlex * this.occupyCol, 24)
       const flexValue = (realFlex / 24) * 100
 
-      if (this.fullWidth) {
-        return {
-          flex: `0 0 calc(${flexValue}% - 60px)`,
-          maxWidth: `${flexValue}%`,
-        }
-      }
       return {
         flex: `0 0 ${flexValue}%`,
         maxWidth: `${flexValue}%`,
       }
-    }
-
+    },
   },
   data () {
     return {
       parentWidth: 0,
     }
   },
+  methods: {
+    getFlex (parentWidth, flex = defaultFlex) {
+      if (parentWidth === 0) {
+        return flex.xs
+      }
+      if (parentWidth < BREAKPOINTS.xs) return flex.xs
+      if (parentWidth < BREAKPOINTS.sm) return flex.sm
+      if (parentWidth < BREAKPOINTS.md) return flex.md
+      if (parentWidth < BREAKPOINTS.lg) return flex.lg
+      if (parentWidth < BREAKPOINTS.xl) return flex.xl
+      return flex.xxl
+    },
+  },
   mounted () {
     // 根据父容器宽度响应式
     this.$nextTick(() => {
@@ -102,6 +128,16 @@ export default {
     if (this.resizeObserver) {
       this.resizeObserver.disconnect()
     }
-  }
+  },
 }
 </script>
+
+<style lang="less" scoped>
+.x-form-col-wrapper {
+  :deep(.ant-form-item) {
+    .ant-form-item-label {
+      max-width: var(--form-label-width);
+    }
+  }
+}
+</style>

package/src/components/FilePreview/FilePreview.vue

@@ -47,12 +47,12 @@ export default {
     // 文件服务器
     fileServer: {
       type: String,
-      default: 'http://123.60.214.109:8406'
+      default: 'http://aote-office.8866.org:8406'
     },
     // 文档预览服务 API
     previewDocService: {
       type: String,
-      default: 'http://123.60.214.109:8012/onlinePreview?url='
+      default: 'http://aote-office.8866.org:32510/onlinePreview?url='
     }
   },
   data () {

package/src/layouts/header/InstitutionDetail.vue

@@ -1,181 +1,181 @@
-<template>
-  <div style="position: relative;">
-    <h2 style="text-align: center">{{ institutionData.f_title }}</h2>
-    <p>简述: {{ institutionData.f_sketch }}</p>
-    <p>时间: {{ format(institutionData.f_effective_date) }}</p>
-    <div v-if="showDocument" class="content">
-      <iframe :src="institutionDocUrl" frameborder="0" height="100%" width="100%"></iframe>
-    </div>
-    <!-- 其他附件 -->
-    <div class="other-file">
-      <div class="title">其他信息：</div>
-      <div v-for="file in otherFiles" :key="file.id">
-        <a class="file-item">
-          <span class="file-action" @click="handlePreviewDoc(file.url)">
-            <a-icon type="link" />{{ file.name }}
-          </span>
-          <span class="file-action" @click="handlePreviewDoc(file.url)">
-            <a-icon type="eye" />预览
-          </span>
-          <a class="file-action" target="_blank" @click="handlePreDowDoc(file)"><a-icon type="download" />下载</a>
-        </a>
-      </div>
-    </div>
-    <!-- 其他附件预览 -->
-    <a-modal v-model="previewDocVisible" :dialog-style="{ top: '20px' }" :footer="null" :z-index="1001" width="97%">
-      <div class="preview-doc-container">
-        <a-spin :spinning="previewDocLoading" size="large" />
-        <iframe
-          v-show="!previewDocLoading"
-          :src="previewDocUrl"
-          frameborder="0"
-          height="100%"
-          width="100%"
-          @load="previewDocLoading = false" />
-      </div>
-    </a-modal>
-    <a-button class="submit_btn" type="primary" @click="confirm_institution">确认</a-button>
-  </div>
-</template>
-
-<script>
-import { Base64 } from 'js-base64'
-import { post } from '@vue2-client/services/api/restTools'
-import { formatDate } from '@vue2-client/utils/util'
-
-export default {
-  name: 'InstitutionDetail',
-  props: {
-    institutionId: {
-      type: Number,
-      default: undefined
-    },
-    affirmInstitution: {
-      type: Number,
-      default: undefined
-    }
-  },
-  data () {
-    return {
-      institutionDocUrl: undefined,
-      showDocument: false,
-      otherFiles: [],
-      institutionData: {},
-      previewDocVisible: false,
-      previewDocUrl: undefined,
-      previewDocLoading: false
-    }
-  },
-  watch: {
-    institutionId () {
-      this.getDetailData()
-    }
-  },
-  mounted () {
-    this.getDetailData()
-  },
-  methods: {
-    // 获取详情数据
-    getDetailData () {
-      if (!this.institutionId) {
-        return
-      }
-      const otherFiles = []
-      post('/api/af-system/logic/getInstitutionDetail', {
-        id: this.institutionId
-      }).then(res => {
-        res.files.forEach(item => {
-          if (item.use_type === '制度文件') {
-            this.institutionDocUrl = previewDocService + encodeURIComponent(Base64.encode(fileServer + item.url))
-            this.showDocument = true
-          } else {
-            otherFiles.push(item)
-          }
-        })
-        this.institutionData = res.institution
-        this.otherFiles = otherFiles
-      })
-    },
-    format (dateStr) {
-      return formatDate(dateStr, 'yyyy-MM-dd')
-    },
-    // 其他附件预览
-    handlePreviewDoc (url) {
-      const previewDocUrl = previewDocService + encodeURIComponent(Base64.encode(fileServer + url))
-      if (this.previewDocUrl !== previewDocUrl) {
-        this.previewDocLoading = true
-        this.previewDocUrl = previewDocUrl
-      }
-      this.previewDocVisible = true
-    },
-    // 下载文档
-    handlePreDowDoc (file) {
-      const a = document.createElement('a')
-      a.href = file.url
-      a.download = file.name
-      a.click()
-    },
-    confirm_institution () {
-      post('/api/af-system/logic/affirmInstitution', {
-        data: {
-          tobe: [
-            {
-              id: this.affirmInstitution,
-              f_affirm_type: '系统确认'
-            }
-          ]
-        }
-      }).then(res => {
-        this.$message.success('确认成功')
-        this.$emit('get_to_be_confirmed')
-      })
-    },
-  }
-}
-// 文档预览服务 API
-const previewDocService = 'http://123.60.214.109:8012/onlinePreview?url='
-// 文件服务器地址
-const fileServer = 'http://123.60.214.109:8406'
-</script>
-
-<style lang="less" scoped>
-.submit_btn{
-  position: absolute;
-  right:0;
-  top: 0;
-}
-.content {
-  height: 80vh;
-  img {
-    max-width: 100%;
-  }
-}
-.other-file {
-  margin: 16px 0;
-  .title {
-    margin-bottom: 6px;
-  }
-}
-.file-item {
-  .file-action {
-    padding: 3px 4px;
-    color: #1890ff;
-    &:hover {
-      background: #e6f7ff;
-    }
-  }
-  .anticon {
-    margin-right: 3px;
-  }
-}
-.file-list-title {
-  color: rgba(0, 0, 0, 0.85);
-  font-weight: bold;
-  font-size: 16px;
-  margin-bottom: 8px;
-}
-.preview-doc-container {
-  height: calc(100vh - 92px);
-  padding-top: 20px;
-}
-</style>
+<template>
+  <div style="position: relative;">
+    <h2 style="text-align: center">{{ institutionData.f_title }}</h2>
+    <p>简述: {{ institutionData.f_sketch }}</p>
+    <p>时间: {{ format(institutionData.f_effective_date) }}</p>
+    <div v-if="showDocument" class="content">
+      <iframe :src="institutionDocUrl" frameborder="0" height="100%" width="100%"></iframe>
+    </div>
+    <!-- 其他附件 -->
+    <div class="other-file">
+      <div class="title">其他信息：</div>
+      <div v-for="file in otherFiles" :key="file.id">
+        <a class="file-item">
+          <span class="file-action" @click="handlePreviewDoc(file.url)">
+            <a-icon type="link" />{{ file.name }}
+          </span>
+          <span class="file-action" @click="handlePreviewDoc(file.url)">
+            <a-icon type="eye" />预览
+          </span>
+          <a class="file-action" target="_blank" @click="handlePreDowDoc(file)"><a-icon type="download" />下载</a>
+        </a>
+      </div>
+    </div>
+    <!-- 其他附件预览 -->
+    <a-modal v-model="previewDocVisible" :dialog-style="{ top: '20px' }" :footer="null" :z-index="1001" width="97%">
+      <div class="preview-doc-container">
+        <a-spin :spinning="previewDocLoading" size="large" />
+        <iframe
+          v-show="!previewDocLoading"
+          :src="previewDocUrl"
+          frameborder="0"
+          height="100%"
+          width="100%"
+          @load="previewDocLoading = false" />
+      </div>
+    </a-modal>
+    <a-button class="submit_btn" type="primary" @click="confirm_institution">确认</a-button>
+  </div>
+</template>
+
+<script>
+import { Base64 } from 'js-base64'
+import { post } from '@vue2-client/services/api/restTools'
+import { formatDate } from '@vue2-client/utils/util'
+
+export default {
+  name: 'InstitutionDetail',
+  props: {
+    institutionId: {
+      type: Number,
+      default: undefined
+    },
+    affirmInstitution: {
+      type: Number,
+      default: undefined
+    }
+  },
+  data () {
+    return {
+      institutionDocUrl: undefined,
+      showDocument: false,
+      otherFiles: [],
+      institutionData: {},
+      previewDocVisible: false,
+      previewDocUrl: undefined,
+      previewDocLoading: false
+    }
+  },
+  watch: {
+    institutionId () {
+      this.getDetailData()
+    }
+  },
+  mounted () {
+    this.getDetailData()
+  },
+  methods: {
+    // 获取详情数据
+    getDetailData () {
+      if (!this.institutionId) {
+        return
+      }
+      const otherFiles = []
+      post('/api/af-system/logic/getInstitutionDetail', {
+        id: this.institutionId
+      }).then(res => {
+        res.files.forEach(item => {
+          if (item.use_type === '制度文件') {
+            this.institutionDocUrl = previewDocService + encodeURIComponent(Base64.encode(fileServer + item.url))
+            this.showDocument = true
+          } else {
+            otherFiles.push(item)
+          }
+        })
+        this.institutionData = res.institution
+        this.otherFiles = otherFiles
+      })
+    },
+    format (dateStr) {
+      return formatDate(dateStr, 'yyyy-MM-dd')
+    },
+    // 其他附件预览
+    handlePreviewDoc (url) {
+      const previewDocUrl = previewDocService + encodeURIComponent(Base64.encode(fileServer + url))
+      if (this.previewDocUrl !== previewDocUrl) {
+        this.previewDocLoading = true
+        this.previewDocUrl = previewDocUrl
+      }
+      this.previewDocVisible = true
+    },
+    // 下载文档
+    handlePreDowDoc (file) {
+      const a = document.createElement('a')
+      a.href = file.url
+      a.download = file.name
+      a.click()
+    },
+    confirm_institution () {
+      post('/api/af-system/logic/affirmInstitution', {
+        data: {
+          tobe: [
+            {
+              id: this.affirmInstitution,
+              f_affirm_type: '系统确认'
+            }
+          ]
+        }
+      }).then(res => {
+        this.$message.success('确认成功')
+        this.$emit('get_to_be_confirmed')
+      })
+    },
+  }
+}
+// 文档预览服务 API
+const previewDocService = 'http://aote-office.8866.org:32510/onlinePreview?url='
+// 文件服务器地址
+const fileServer = 'http://aote-office.8866.org:8406'
+</script>
+
+<style lang="less" scoped>
+.submit_btn{
+  position: absolute;
+  right:0;
+  top: 0;
+}
+.content {
+  height: 80vh;
+  img {
+    max-width: 100%;
+  }
+}
+.other-file {
+  margin: 16px 0;
+  .title {
+    margin-bottom: 6px;
+  }
+}
+.file-item {
+  .file-action {
+    padding: 3px 4px;
+    color: #1890ff;
+    &:hover {
+      background: #e6f7ff;
+    }
+  }
+  .anticon {
+    margin-right: 3px;
+  }
+}
+.file-list-title {
+  color: rgba(0, 0, 0, 0.85);
+  font-weight: bold;
+  font-size: 16px;
+  margin-bottom: 8px;
+}
+.preview-doc-container {
+  height: calc(100vh - 92px);
+  padding-top: 20px;
+}
+</style>

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

@@ -84,7 +84,7 @@ 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/XDatePicker/demo.vue'),
@@ -95,7 +95,7 @@ routerResource.example = {
           // component: () => import('@vue2-client/base-client/components/common/XButtons/XButtonDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XLabelSelect/XLabelSelectDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XCheckList/XCheckList.vue'),
-          component: () => import('@vue2-client/base-client/components/common/XPrint/Demo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XPrint/Demo.vue'),
           // component: () => import('@vue2-client/base-client/components/AI/demo.vue'),
           // component: () => import('@vue2-client/components/g2Charts/demo.vue'),
           meta: {