vue2-client 1.15.7 → 1.15.8

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

@@ -1,167 +1,174 @@
-<template>
-  <a-modal
-    title="数据导入"
-    :visible="open"
-    :zIndex="1001"
-    :confirm-loading="uploading"
-    @cancel="importExcelHandleCancel"
-  >
-    <a-spin tip="上传中..." :spinning="uploading">
-      <a-upload-dragger
-        name="file"
-        accept=".xlsx, .xls"
-        :file-list="fileList"
-        :multiple="false"
-        :remove="handleRemove"
-        :before-upload="beforeUpload"
-      >
-        <p class="ant-upload-drag-icon">
-          <a-icon type="inbox" />
-        </p>
-        <p class="ant-upload-text">
-          请将文件拖拽到此处上传
-        </p>
-        <p class="ant-upload-hint">
-          支持单个上传，也可以点击后选择文件上传
-        </p>
-      </a-upload-dragger>
-      <a-divider v-if="$slots.importExcelSlot"/>
-      <a-collapse :bordered="false" v-if="$slots.importExcelSlot">
-        <a-collapse-panel key="0" header="查看导入说明">
-          <slot name="importExcelSlot"></slot>
-        </a-collapse-panel>
-      </a-collapse>
-    </a-spin>
-    <template slot="footer">
-      <a-row>
-        <a-button type="link" icon="download" v-if="queryParamsName !== 'none'" @click="importTemplate">
-          下载导入模板
-        </a-button>
-        <a-button key="back" @click="importExcelHandleCancel">
-          取消
-        </a-button>
-        <a-button key="submit" type="primary" :loading="uploading" @click="importExcelHandleChange">
-          导入
-        </a-button>
-      </a-row>
-    </template>
-  </a-modal>
-</template>
-
-<script>
-
-import { importData, downloadImportExcel } from '@vue2-client/services/api/common'
-import { mapState } from 'vuex'
-
-export default {
-  name: 'XImportExcel',
-  props: {
-    serviceName: {
-      type: String,
-      default: undefined
-    },
-    env: {
-      type: String,
-      default: 'prod'
-    },
-    queryParamsName: {
-      type: String,
-      default: 'none'
-    },
-    // 业务名称
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  components: {
-  },
-  data () {
-    return {
-      open: false,
-      uploadStatus: '',
-      fileList: [],
-      // 是否禁用上传
-      uploading: false
-    }
-  },
-  filters: {
-  },
-  created () {
-  },
-  computed: {
-    ...mapState('account', { currUser: 'user' })
-  },
-  watch: {
-  },
-  methods: {
-    /** 导入excel窗体关闭 */
-    importExcelHandleCancel (e) {
-      this.open = false
-      this.fileList = []
-      // 关闭后刷新列表
-      this.$emit('ok')
-    },
-    /** 下载模板操作 */
-    importTemplate () {
-      downloadImportExcel({
-        queryParamsName: this.queryParamsName
-      }, this.serviceName, this.env === 'dev').then(res => {
-        if (!res || !res.value) {
-          this.$message.warn('导入模板不存在，请检查配置')
-           return
-        }
-        window.open(res.value)
-      })
-    },
-    /** 导入excel窗体开启 */
-    importExcelHandleOpen (e) {
-      this.open = true
-    },
-    beforeUpload (file) {
-      this.fileList = [file]
-      return false
-    },
-    /** 导入excel */
-    importExcelHandleChange () {
-      const { fileList } = this
-      const formData = new FormData()
-      if (!fileList[0]) {
-        this.$message.warn('请选择需要上传的文件')
-        return
-      }
-      this.uploading = true
-      const userData = {
-        currUserName: this.currUser.name,
-        currUserId: this.currUser.id,
-        orgId: this.currUser.orgid,
-        orgName: this.currUser.orgs,
-        depId: this.currUser.depids,
-        depName: this.currUser.deps
-      }
-      formData.append('file', fileList[0])
-      formData.append('queryParamsName', this.queryParamsName)
-      formData.append('userData', JSON.stringify(userData))
-      importData(formData, this.serviceName, this.env === 'dev').then(res => {
-        this.fileList = []
-        const msg = res.msg || '导入成功'
-        if (res?.successLen && !res?.msg) {
-          this.$message.success(`${msg}，成功导入${res.successLen}条数据`)
-        } else {
-          this.$message.success(msg)
-        }
-        this.open = false
-        this.$emit('ok', res)
-      }).catch(e => {
-        this.$message.error(e)
-      }).finally(() => {
-        this.uploading = false
-      })
-    },
-    handleRemove () {
-      this.fileList = []
-      this.uploading = false
-    }
-  }
-}
-</script>
+<template>
+  <a-modal
+    title="数据导入"
+    :visible="open"
+    :zIndex="1001"
+    :confirm-loading="uploading"
+    @cancel="importExcelHandleCancel"
+  >
+    <a-spin tip="上传中..." :spinning="uploading">
+      <a-upload-dragger
+        name="file"
+        accept=".xlsx, .xls"
+        :file-list="fileList"
+        :multiple="false"
+        :remove="handleRemove"
+        :before-upload="beforeUpload"
+      >
+        <p class="ant-upload-drag-icon">
+          <a-icon type="inbox" />
+        </p>
+        <p class="ant-upload-text">
+          请将文件拖拽到此处上传
+        </p>
+        <p class="ant-upload-hint">
+          支持单个上传，也可以点击后选择文件上传
+        </p>
+      </a-upload-dragger>
+      <a-divider v-if="$slots.importExcelSlot"/>
+      <a-collapse :bordered="false" v-if="$slots.importExcelSlot">
+        <a-collapse-panel key="0" header="查看导入说明">
+          <slot name="importExcelSlot"></slot>
+        </a-collapse-panel>
+      </a-collapse>
+    </a-spin>
+    <template slot="footer">
+      <a-row>
+        <a-button type="link" icon="download" v-if="queryParamsName !== 'none'" @click="importTemplate">
+          下载导入模板
+        </a-button>
+        <a-button key="back" @click="importExcelHandleCancel">
+          取消
+        </a-button>
+        <a-button key="submit" type="primary" :loading="uploading" @click="importExcelHandleChange">
+          导入
+        </a-button>
+      </a-row>
+    </template>
+  </a-modal>
+</template>
+
+<script>
+
+import { importData, downloadImportExcel } from '@vue2-client/services/api/common'
+import { mapState } from 'vuex'
+
+export default {
+  name: 'XImportExcel',
+  props: {
+    serviceName: {
+      type: String,
+      default: undefined
+    },
+    env: {
+      type: String,
+      default: 'prod'
+    },
+    queryParamsName: {
+      type: String,
+      default: 'none'
+    },
+    // 业务名称
+    title: {
+      type: String,
+      default: ''
+    },
+    extraData: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  components: {
+  },
+  data () {
+    return {
+      open: false,
+      uploadStatus: '',
+      fileList: [],
+      // 是否禁用上传
+      uploading: false
+    }
+  },
+  filters: {
+  },
+  created () {
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' })
+  },
+  watch: {
+  },
+  methods: {
+    /** 导入excel窗体关闭 */
+    importExcelHandleCancel (e) {
+      this.open = false
+      this.fileList = []
+      // 关闭后刷新列表
+      this.$emit('ok')
+    },
+    /** 下载模板操作 */
+    importTemplate () {
+      downloadImportExcel({
+        queryParamsName: this.queryParamsName
+      }, this.serviceName, this.env === 'dev').then(res => {
+        if (!res || !res.value) {
+          this.$message.warn('导入模板不存在，请检查配置')
+           return
+        }
+        window.open(res.value)
+      })
+    },
+    /** 导入excel窗体开启 */
+    importExcelHandleOpen (e) {
+      this.open = true
+    },
+    beforeUpload (file) {
+      this.fileList = [file]
+      return false
+    },
+    /** 导入excel */
+    importExcelHandleChange () {
+      const { fileList } = this
+      const formData = new FormData()
+      if (!fileList[0]) {
+        this.$message.warn('请选择需要上传的文件')
+        return
+      }
+      this.uploading = true
+      const userData = {
+        currUserName: this.currUser.name,
+        currUserId: this.currUser.id,
+        orgId: this.currUser.orgid,
+        orgName: this.currUser.orgs,
+        depId: this.currUser.depids,
+        depName: this.currUser.deps
+      }
+      formData.append('file', fileList[0])
+      formData.append('queryParamsName', this.queryParamsName)
+      formData.append('userData', JSON.stringify(userData))
+      formData.append('otherParams', JSON.stringify(this.extraData))
+      importData(formData, this.serviceName, this.env === 'dev').then(res => {
+        this.fileList = []
+        const msg = res.msg || '导入成功'
+        if (res?.successLen && !res?.msg) {
+          this.$message.success(`${msg}，成功导入${res.successLen}条数据`)
+        } else {
+          this.$message.success(msg)
+        }
+        this.open = false
+        this.$emit('ok', res)
+      }).catch(e => {
+        this.$message.error(e)
+      }).finally(() => {
+        this.uploading = false
+      })
+    },
+    handleRemove () {
+      this.fileList = []
+      this.uploading = false
+    }
+  }
+}
+</script>

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

@@ -1,110 +1,110 @@
-<template>
-  <div class="tag-container">
-    <div class="tags-wrapper">
-      <a-tag
-        v-for="type in types"
-        :key="type.value"
-        @click="selectType(type.value)"
-        class="label-tag"
-        :class="{ 'active-tag': selectedType === type.value }"
-      >
-        {{ type.label }}
-      </a-tag>
-    </div>
-    <div class="underline" :style="underlineStyle"></div>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    value: {
-      type: String,
-      default: null,
-    },
-  },
-  data () {
-    return {
-      selectedType: this.value,
-      types: null,
-      underlineStyle: {
-        width: '0',
-        left: '0',
-      },
-    }
-  },
-  watch: {
-    selectedType (newValue) {
-      this.$emit('input', newValue)
-      this.updateUnderline()
-    },
-  },
-  mounted () {
-    this.updateUnderline()
-  },
-  methods: {
-    init (params) {
-      const {
-        // 配置内容
-        options
-      } = params
-      this.types = options
-    },
-    selectType (value) {
-      this.selectedType = value
-      if (this.selectedType) { // 检查选中内容是否不为空
-        this.$emit('selected', this.selectedType) // 发送选中事件
-      }
-    },
-    updateUnderline () {
-      // 动态更新下划线位置和宽度
-      this.$nextTick(() => {
-        const activeTag = this.$el.querySelector('.active-tag')
-        if (activeTag) {
-          const { offsetWidth, offsetLeft } = activeTag
-          this.underlineStyle.width = `${offsetWidth}px`
-          this.underlineStyle.left = `${offsetLeft}px`
-        }
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-/* 容器样式 */
-.tag-container {
-  position: relative;
-  display: inline-block;
-  width: 100%;
-}
-
-.tags-wrapper {
-  display: inline-flex; /* 标签紧邻排列 */
-  gap: 0; /* 去掉选项之间的空隙 */
-}
-
-.label-tag {
-  padding: 5px 15px;
-  font-size: 16px;
-  color: #333;
-  background: none;
-  cursor: pointer;
-  border: none;
-  display: inline-block;
-}
-
-.label-tag.active-tag {
-  color: #333; /* 不变色 */
-  font-weight: bold;
-}
-
-.underline {
-  position: absolute;
-  bottom: 0;
-  left: 0;
-  height: 2px;
-  background-color: #1890ff;
-  transition: all 0.3s ease; /* 平滑过渡效果 */
-}
-</style>
+<template>
+  <div class="tag-container">
+    <div class="tags-wrapper">
+      <a-tag
+        v-for="type in types"
+        :key="type.value"
+        @click="selectType(type.value)"
+        class="label-tag"
+        :class="{ 'active-tag': selectedType === type.value }"
+      >
+        {{ type.label }}
+      </a-tag>
+    </div>
+    <div class="underline" :style="underlineStyle"></div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    value: {
+      type: String,
+      default: null,
+    },
+  },
+  data () {
+    return {
+      selectedType: this.value,
+      types: null,
+      underlineStyle: {
+        width: '0',
+        left: '0',
+      },
+    }
+  },
+  watch: {
+    selectedType (newValue) {
+      this.$emit('input', newValue)
+      this.updateUnderline()
+    },
+  },
+  mounted () {
+    this.updateUnderline()
+  },
+  methods: {
+    init (params) {
+      const {
+        // 配置内容
+        options
+      } = params
+      this.types = options
+    },
+    selectType (value) {
+      this.selectedType = value
+      if (this.selectedType) { // 检查选中内容是否不为空
+        this.$emit('selected', this.selectedType) // 发送选中事件
+      }
+    },
+    updateUnderline () {
+      // 动态更新下划线位置和宽度
+      this.$nextTick(() => {
+        const activeTag = this.$el.querySelector('.active-tag')
+        if (activeTag) {
+          const { offsetWidth, offsetLeft } = activeTag
+          this.underlineStyle.width = `${offsetWidth}px`
+          this.underlineStyle.left = `${offsetLeft}px`
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+/* 容器样式 */
+.tag-container {
+  position: relative;
+  display: inline-block;
+  width: 100%;
+}
+
+.tags-wrapper {
+  display: inline-flex; /* 标签紧邻排列 */
+  gap: 0; /* 去掉选项之间的空隙 */
+}
+
+.label-tag {
+  padding: 5px 15px;
+  font-size: 16px;
+  color: #333;
+  background: none;
+  cursor: pointer;
+  border: none;
+  display: inline-block;
+}
+
+.label-tag.active-tag {
+  color: #333; /* 不变色 */
+  font-weight: bold;
+}
+
+.underline {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  height: 2px;
+  background-color: #1890ff;
+  transition: all 0.3s ease; /* 平滑过渡效果 */
+}
+</style>

package/src/base-client/components/common/XLabelSelect/XLabelSelectDemo.vue

@@ -1,35 +1,35 @@
-<template>
-  <div>
-    <h1>选择标签示例</h1>
-    <XLabelSelect
-      :options="options"
-      v-model="selectedOption"
-      label="请选择一个选项"
-    />
-    <p>选中的选项: {{ selectedOption }}</p>
-  </div>
-</template>
-
-<script>
-import XLabelSelect from '@vue2-client/base-client/components/common/XLabelSelect/XLabelSelect.vue'
-
-export default {
-  components: {
-    XLabelSelect,
-  },
-  data () {
-    return {
-      selectedOption: null,
-      options: [
-        { value: 'option1', label: '选项 1' },
-        { value: 'option2', label: '选项 2' },
-        { value: 'option3', label: '选项 3' },
-      ],
-    }
-  },
-}
-</script>
-
-<style scoped>
-/* 添加样式 */
-</style>
+<template>
+  <div>
+    <h1>选择标签示例</h1>
+    <XLabelSelect
+      :options="options"
+      v-model="selectedOption"
+      label="请选择一个选项"
+    />
+    <p>选中的选项: {{ selectedOption }}</p>
+  </div>
+</template>
+
+<script>
+import XLabelSelect from '@vue2-client/base-client/components/common/XLabelSelect/XLabelSelect.vue'
+
+export default {
+  components: {
+    XLabelSelect,
+  },
+  data () {
+    return {
+      selectedOption: null,
+      options: [
+        { value: 'option1', label: '选项 1' },
+        { value: 'option2', label: '选项 2' },
+        { value: 'option3', label: '选项 3' },
+      ],
+    }
+  },
+}
+</script>
+
+<style scoped>
+/* 添加样式 */
+</style>