vue2-client 1.6.38 → 1.6.40

package/CHANGELOG.md

@@ -1,6 +1,12 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.6.40 -2023-06-14 @江超**
+- 解决弹出框显示在抽屉下面的问题
+
+**1.6.39 -2023-06-07 @江超**
+- Login增加V2系统版本的兼容
+
 **1.6.38 -2023-05-30 @江超**
 - V3登录加密
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.6.38",
+  "version": "1.6.40",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

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

@@ -1,278 +1,279 @@
-<template>
-  <div class="table-page-search-wrapper">
-    <a-form-model
-      v-if="loaded"
-      ref="selectForm"
-      :model="form"
-      :rules="rules">
-      <a-row :gutter="16">
-        <x-form-item
-          v-for="(item, index) in realJsonData"
-          :key="index"
-          :attr="item"
-          :disabled="itemDisabled(item)"
-          :files="files"
-          :form="form"
-          :images="images"
-          :service-name="serviceName"
-          :xl="12"
-          :xxl="8"
-          mode="新增/修改"
-        />
-      </a-row>
-    </a-form-model>
-  </div>
-</template>
-<script>
-import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
-import { formatDate } from '@vue2-client/utils/util'
-import { mapState } from 'vuex'
-import { post } from '@vue2-client/services/api'
-
-export default {
-    name: 'XAddNativeForm',
-    components: {
-      XFormItem
-    },
-    data () {
-      return {
-        // 内容加载是否完成
-        loaded: false,
-        // 表单Model
-        form: {},
-        // 修改有文件得表单时使用
-        files: [],
-        images: [],
-        // 校验
-        rules: {}
-      }
-    },
-    computed: {
-      // 过滤出用于新增/修改场景的表单项
-      realJsonData: function () {
-        return this.jsonData.filter(function (item) {
-          return item.addOrEdit && item.addOrEdit !== 'no' && item.addOrEdit !== 'silenceAdd' && item.addOrEdit !== 'version'
-        })
-      },
-      // 过滤出用于静默新增场景的表单项
-      silenceAddJsonData: function () {
-        return this.jsonData.filter(function (item) {
-          return item.addOrEdit === 'silenceAdd'
-        })
-      },
-      // 过滤出版本号表单项
-      versionJsonData: function () {
-        return this.jsonData.filter(function (item) {
-          return item.addOrEdit === 'version'
-        })
-      },
-      ...mapState('account', { currUser: 'user' })
-    },
-    props: {
-      jsonData: {
-        type: Array,
-        default: () => {
-          return []
-        }
-      },
-      serviceName: {
-        type: String,
-        default: 'af-system'
-      },
-      // 业务类型
-      businessType: {
-        type: String,
-        default: ''
-      },
-      // 修改操作前查询出的业务数据
-      modifyModelData: {
-        type: Object,
-        default: () => {
-          return {}
-        }
-      },
-      // 新增或修改业务是否执行中
-      loading: {
-        type: Boolean,
-        default: () => {
-          return false
-        }
-      },
-      // 固定新增表单
-      fixedAddForm: {
-        type: Object,
-        default: () => {
-          return {}
-        }
-      }
-    },
-    watch: {
-      visible (rel) {
-        if (rel) {
-          this.formItemLoad()
-        }
-      }
-    },
-    mounted () {
-      this.formItemLoad()
-    },
-    methods: {
-      formItemLoad () {
-        const formData = Object.assign({}, this.fixedAddForm)
-        for (let i = 0; i < this.realJsonData.length; i++) {
-          const item = this.realJsonData[i]
-          formData[item.model] = undefined
-          // 处理表单校验情况
-          if (item.rule) {
-            this.rules[item.model] = []
-            const required = item.rule.required ? item.rule.required === true || item.rule.required === 'true' : false
-            let trigger
-            let message
-            if (required) {
-              switch (item.type) {
-                case 'select':
-                  message = '请选择' + item.name
-                  trigger = 'change'
-                  break
-                default:
-                  message = '请输入' + item.name
-                  trigger = 'blur'
-              }
-              this.rules[item.model].push({
-                required: true,
-                message: message,
-                trigger: trigger
-              })
-            }
-
-            switch (item.rule.type) {
-              case 'number':
-              case 'integer':
-              case 'float':
-                let defaultValue
-                let message
-                switch (item.rule.type) {
-                  case 'number':
-                    message = '数字'
-                    defaultValue = 0
-                    break
-                  case 'integer':
-                    message = '整数'
-                    defaultValue = 0
-                    break
-                  case 'float':
-                    message = '小数'
-                    defaultValue = 0.0
-                    break
-                }
-                this.rules[item.model].push({
-                  type: item.rule.type,
-                  message: item.name + '必须为' + message,
-                  transform: (value) => {
-                    if (value && value.length !== 0) {
-                      return Number(value)
-                    } else {
-                      return defaultValue
-                    }
-                  },
-                  trigger: 'blur'
-                })
-                break
-            }
-          }
-        }
-        this.form = formData
-        if (this.modifyModelData.data) {
-          this.files = this.modifyModelData.files
-          this.images = this.modifyModelData.images
-          if (Object.keys(this.modifyModelData.data).length > 0) {
-            this.getModifyModelData()
-          }
-        }
-        this.loaded = true
-      },
-      itemDisabled (value) {
-        return (this.businessType === '新增' && value.addOrEdit === 'edit') ||
-          (this.businessType === '修改' && value.addOrEdit === 'add')
-      },
-      async onSubmit () {
-        this.$refs.selectForm.validate(async valid => {
-          for (const key of Object.keys(this.form)) {
-            if (this.form[key] === null || this.form[key] === '') {
-              this.form[key] = undefined
-            }
-          }
-          const requestForm = Object.assign({}, this.form)
-          // 追加静默新增字段
-          if (this.businessType === '新增') {
-            for (const item of this.silenceAddJsonData) {
-              switch (item.silencePurpose) {
-                case 'createTime':
-                  requestForm[item.model] = formatDate('now')
-                  break
-                case 'operator':
-                  requestForm[item.model] = this.currUser.name
-                  break
-                case 'orgId':
-                  requestForm[item.model] = this.currUser.orgid
-                  break
-              }
-            }
-            // 通过请求追加静默新增：自定义字段
-            for (const item of this.silenceAddJsonData.filter((item) => item.silencePurpose === 'customize')) {
-              requestForm[item.model] = await this.getSilenceSource(item.silenceSource, requestForm)
-            }
-          }
-          const data = {
-            valid: valid,
-            form: requestForm
-          }
-          this.$emit('onSubmit', data)
-        })
-      },
-      /**
-       * 获取通过logic静默新增的字段
-       * @param logicName logic名称
-       * @param requestParameters 请求参数
-       */
-      async getSilenceSource (logicName, requestParameters) {
-        const result = await post('/api/' + this.serviceName + '/logic/' + logicName, requestParameters)
-        return result
-      },
-      /**
-       * 获取被修改记录数据
-       * @param modifyModelData 被修改记录的数据
-       */
-      getModifyModelData () {
-        for (let i = 0; i < this.realJsonData.length; i++) {
-          if (['FilesId', 'Images'].includes(this.realJsonData[i])) {
-            // 附件需要跳过 因为会通过 modifyModelData中的files,images属性给upload赋值
-            // 新增修改表单每次提交时只会提交最新添加的文件
-            continue
-          }
-          const item = this.realJsonData[i]
-          if (this.modifyModelData.data[item.model] || this.modifyModelData.data[item.model] === 0) {
-            if (this.modifyModelData.data[item.model] instanceof Array) {
-              this.form[item.model] = this.modifyModelData.data[item.model]
-            } else {
-              this.form[item.model] = this.modifyModelData.data[item.model] + ''
-            }
-          } else {
-            this.form[item.model] = undefined
-          }
-        }
-        // 追加版本号信息
-        for (const item of this.versionJsonData) {
-          if (!this.modifyModelData.data[item.model]) {
-            this.form[item.model] = 0
-          } else {
-            this.form[item.model] = this.modifyModelData.data[item.model] + ''
-          }
-        }
-      },
-      onClose () {
-        this.$emit('update:visible', false)
-      }
-    }
-  }
-</script>
+<template>
+  <div class="table-page-search-wrapper">
+    <a-form-model
+      v-if="loaded"
+      ref="selectForm"
+      :zIndex="1001"
+      :model="form"
+      :rules="rules">
+      <a-row :gutter="16">
+        <x-form-item
+          v-for="(item, index) in realJsonData"
+          :key="index"
+          :attr="item"
+          :disabled="itemDisabled(item)"
+          :files="files"
+          :form="form"
+          :images="images"
+          :service-name="serviceName"
+          :xl="12"
+          :xxl="8"
+          mode="新增/修改"
+        />
+      </a-row>
+    </a-form-model>
+  </div>
+</template>
+<script>
+import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
+import { formatDate } from '@vue2-client/utils/util'
+import { mapState } from 'vuex'
+import { post } from '@vue2-client/services/api'
+
+export default {
+    name: 'XAddNativeForm',
+    components: {
+      XFormItem
+    },
+    data () {
+      return {
+        // 内容加载是否完成
+        loaded: false,
+        // 表单Model
+        form: {},
+        // 修改有文件得表单时使用
+        files: [],
+        images: [],
+        // 校验
+        rules: {}
+      }
+    },
+    computed: {
+      // 过滤出用于新增/修改场景的表单项
+      realJsonData: function () {
+        return this.jsonData.filter(function (item) {
+          return item.addOrEdit && item.addOrEdit !== 'no' && item.addOrEdit !== 'silenceAdd' && item.addOrEdit !== 'version'
+        })
+      },
+      // 过滤出用于静默新增场景的表单项
+      silenceAddJsonData: function () {
+        return this.jsonData.filter(function (item) {
+          return item.addOrEdit === 'silenceAdd'
+        })
+      },
+      // 过滤出版本号表单项
+      versionJsonData: function () {
+        return this.jsonData.filter(function (item) {
+          return item.addOrEdit === 'version'
+        })
+      },
+      ...mapState('account', { currUser: 'user' })
+    },
+    props: {
+      jsonData: {
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      serviceName: {
+        type: String,
+        default: 'af-system'
+      },
+      // 业务类型
+      businessType: {
+        type: String,
+        default: ''
+      },
+      // 修改操作前查询出的业务数据
+      modifyModelData: {
+        type: Object,
+        default: () => {
+          return {}
+        }
+      },
+      // 新增或修改业务是否执行中
+      loading: {
+        type: Boolean,
+        default: () => {
+          return false
+        }
+      },
+      // 固定新增表单
+      fixedAddForm: {
+        type: Object,
+        default: () => {
+          return {}
+        }
+      }
+    },
+    watch: {
+      visible (rel) {
+        if (rel) {
+          this.formItemLoad()
+        }
+      }
+    },
+    mounted () {
+      this.formItemLoad()
+    },
+    methods: {
+      formItemLoad () {
+        const formData = Object.assign({}, this.fixedAddForm)
+        for (let i = 0; i < this.realJsonData.length; i++) {
+          const item = this.realJsonData[i]
+          formData[item.model] = undefined
+          // 处理表单校验情况
+          if (item.rule) {
+            this.rules[item.model] = []
+            const required = item.rule.required ? item.rule.required === true || item.rule.required === 'true' : false
+            let trigger
+            let message
+            if (required) {
+              switch (item.type) {
+                case 'select':
+                  message = '请选择' + item.name
+                  trigger = 'change'
+                  break
+                default:
+                  message = '请输入' + item.name
+                  trigger = 'blur'
+              }
+              this.rules[item.model].push({
+                required: true,
+                message: message,
+                trigger: trigger
+              })
+            }
+
+            switch (item.rule.type) {
+              case 'number':
+              case 'integer':
+              case 'float':
+                let defaultValue
+                let message
+                switch (item.rule.type) {
+                  case 'number':
+                    message = '数字'
+                    defaultValue = 0
+                    break
+                  case 'integer':
+                    message = '整数'
+                    defaultValue = 0
+                    break
+                  case 'float':
+                    message = '小数'
+                    defaultValue = 0.0
+                    break
+                }
+                this.rules[item.model].push({
+                  type: item.rule.type,
+                  message: item.name + '必须为' + message,
+                  transform: (value) => {
+                    if (value && value.length !== 0) {
+                      return Number(value)
+                    } else {
+                      return defaultValue
+                    }
+                  },
+                  trigger: 'blur'
+                })
+                break
+            }
+          }
+        }
+        this.form = formData
+        if (this.modifyModelData.data) {
+          this.files = this.modifyModelData.files
+          this.images = this.modifyModelData.images
+          if (Object.keys(this.modifyModelData.data).length > 0) {
+            this.getModifyModelData()
+          }
+        }
+        this.loaded = true
+      },
+      itemDisabled (value) {
+        return (this.businessType === '新增' && value.addOrEdit === 'edit') ||
+          (this.businessType === '修改' && value.addOrEdit === 'add')
+      },
+      async onSubmit () {
+        this.$refs.selectForm.validate(async valid => {
+          for (const key of Object.keys(this.form)) {
+            if (this.form[key] === null || this.form[key] === '') {
+              this.form[key] = undefined
+            }
+          }
+          const requestForm = Object.assign({}, this.form)
+          // 追加静默新增字段
+          if (this.businessType === '新增') {
+            for (const item of this.silenceAddJsonData) {
+              switch (item.silencePurpose) {
+                case 'createTime':
+                  requestForm[item.model] = formatDate('now')
+                  break
+                case 'operator':
+                  requestForm[item.model] = this.currUser.name
+                  break
+                case 'orgId':
+                  requestForm[item.model] = this.currUser.orgid
+                  break
+              }
+            }
+            // 通过请求追加静默新增：自定义字段
+            for (const item of this.silenceAddJsonData.filter((item) => item.silencePurpose === 'customize')) {
+              requestForm[item.model] = await this.getSilenceSource(item.silenceSource, requestForm)
+            }
+          }
+          const data = {
+            valid: valid,
+            form: requestForm
+          }
+          this.$emit('onSubmit', data)
+        })
+      },
+      /**
+       * 获取通过logic静默新增的字段
+       * @param logicName logic名称
+       * @param requestParameters 请求参数
+       */
+      async getSilenceSource (logicName, requestParameters) {
+        const result = await post('/api/' + this.serviceName + '/logic/' + logicName, requestParameters)
+        return result
+      },
+      /**
+       * 获取被修改记录数据
+       * @param modifyModelData 被修改记录的数据
+       */
+      getModifyModelData () {
+        for (let i = 0; i < this.realJsonData.length; i++) {
+          if (['FilesId', 'Images'].includes(this.realJsonData[i])) {
+            // 附件需要跳过 因为会通过 modifyModelData中的files,images属性给upload赋值
+            // 新增修改表单每次提交时只会提交最新添加的文件
+            continue
+          }
+          const item = this.realJsonData[i]
+          if (this.modifyModelData.data[item.model] || this.modifyModelData.data[item.model] === 0) {
+            if (this.modifyModelData.data[item.model] instanceof Array) {
+              this.form[item.model] = this.modifyModelData.data[item.model]
+            } else {
+              this.form[item.model] = this.modifyModelData.data[item.model] + ''
+            }
+          } else {
+            this.form[item.model] = undefined
+          }
+        }
+        // 追加版本号信息
+        for (const item of this.versionJsonData) {
+          if (!this.modifyModelData.data[item.model]) {
+            this.form[item.model] = 0
+          } else {
+            this.form[item.model] = this.modifyModelData.data[item.model] + ''
+          }
+        }
+      },
+      onClose () {
+        this.$emit('update:visible', false)
+      }
+    }
+  }
+</script>

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

@@ -1,131 +1,132 @@
-<template>
-  <a-modal
-    title="数据导入"
-    :visible="open"
-    :confirm-loading="uploading"
-    @cancel="importExcelHandleCancel"
-    @ok="importExcelHandleChange"
-  >
-    <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/>
-      <a-checkbox @change="handleCheckedUpdateSupport" :checked="updateSupport !== 0">
-        是否更新已经存在的数据
-      </a-checkbox>
-      <a v-if="queryParamsName !== 'none'" @click="importTemplate">下载导入模板</a>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-
-import { importData, download } from '@vue2-client/services/api/common'
-
-export default {
-  name: 'XImportExcel',
-  props: {
-    serviceName: {
-      type: String,
-      default: 'af-system'
-    },
-    queryParamsName: {
-      type: String,
-      default: 'none'
-    },
-    // 业务名称
-    title: {
-      type: String,
-      default: ''
-    }
-  },
-  components: {
-  },
-  data () {
-    return {
-      open: false,
-      uploadStatus: '',
-      fileList: [],
-      // 是否禁用上传
-      uploading: false,
-      updateSupport: 0
-    }
-  },
-  filters: {
-  },
-  created () {
-  },
-  computed: {
-  },
-  watch: {
-  },
-  methods: {
-    /** 导入excel窗体关闭 */
-    importExcelHandleCancel (e) {
-      this.open = false
-      this.fileList = []
-      // 关闭后刷新列表
-      this.$emit('ok')
-    },
-    /** 下载模板操作 */
-    importTemplate () {
-      const params = {
-        queryParamsName: this.queryParamsName,
-        type: 'template'
-      }
-      download(params, this.title + `数据模板_${new Date().toLocaleString()}.xlsx`, this.serviceName)
-    },
-    /** 导入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
-      formData.append('file', fileList[0])
-      formData.append('updateSupport', this.updateSupport)
-      importData(formData).then(response => {
-        this.fileList = []
-        this.$message.success(response.msg)
-        this.open = false
-        this.$emit('ok')
-      }).finally(() => {
-        this.uploading = false
-      })
-    },
-    handleCheckedUpdateSupport () {
-      this.updateSupport = this.updateSupport === 0 ? 1 : 0
-    },
-    handleRemove () {
-      this.fileList = []
-      this.uploading = false
-    }
-  }
-}
-</script>
+<template>
+  <a-modal
+    title="数据导入"
+    :visible="open"
+    :zIndex="1001"
+    :confirm-loading="uploading"
+    @cancel="importExcelHandleCancel"
+    @ok="importExcelHandleChange"
+  >
+    <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/>
+      <a-checkbox @change="handleCheckedUpdateSupport" :checked="updateSupport !== 0">
+        是否更新已经存在的数据
+      </a-checkbox>
+      <a v-if="queryParamsName !== 'none'" @click="importTemplate">下载导入模板</a>
+    </a-spin>
+  </a-modal>
+</template>
+
+<script>
+
+import { importData, download } from '@vue2-client/services/api/common'
+
+export default {
+  name: 'XImportExcel',
+  props: {
+    serviceName: {
+      type: String,
+      default: 'af-system'
+    },
+    queryParamsName: {
+      type: String,
+      default: 'none'
+    },
+    // 业务名称
+    title: {
+      type: String,
+      default: ''
+    }
+  },
+  components: {
+  },
+  data () {
+    return {
+      open: false,
+      uploadStatus: '',
+      fileList: [],
+      // 是否禁用上传
+      uploading: false,
+      updateSupport: 0
+    }
+  },
+  filters: {
+  },
+  created () {
+  },
+  computed: {
+  },
+  watch: {
+  },
+  methods: {
+    /** 导入excel窗体关闭 */
+    importExcelHandleCancel (e) {
+      this.open = false
+      this.fileList = []
+      // 关闭后刷新列表
+      this.$emit('ok')
+    },
+    /** 下载模板操作 */
+    importTemplate () {
+      const params = {
+        queryParamsName: this.queryParamsName,
+        type: 'template'
+      }
+      download(params, this.title + `数据模板_${new Date().toLocaleString()}.xlsx`, this.serviceName)
+    },
+    /** 导入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
+      formData.append('file', fileList[0])
+      formData.append('updateSupport', this.updateSupport)
+      importData(formData).then(response => {
+        this.fileList = []
+        this.$message.success(response.msg)
+        this.open = false
+        this.$emit('ok')
+      }).finally(() => {
+        this.uploading = false
+      })
+    },
+    handleCheckedUpdateSupport () {
+      this.updateSupport = this.updateSupport === 0 ? 1 : 0
+    },
+    handleRemove () {
+      this.fileList = []
+      this.uploading = false
+    }
+  }
+}
+</script>

package/src/pages/login/Login.vue

@@ -88,6 +88,7 @@ export default {
           const name = this.form.getFieldValue('name')
           const password = this.form.getFieldValue('password')
           switch (this.compatible) {
+            case 'V2':
             case 'V3': {
               login(name, password).then(this.afterLogin).catch(msg => {
                 this.error = msg