JeecgBoot2.4.3版本发布——企业级低代码平台

ant-design-vue-jeecg/src/mixins/JEditableTableModelMixin.js

@@ -0,0 +1,190 @@
+import JEditableTable from '@/components/jeecg/JEditableTable'
+import { VALIDATE_NO_PASSED, getRefPromise,validateFormModelAndTables} from '@/utils/JEditableTableUtil'
+import { httpAction, getAction } from '@/api/manage'
+
+export const JEditableTableModelMixin = {
+  components: {
+    JEditableTable
+  },
+  data() {
+    return {
+      title: '操作',
+      visible: false,
+      confirmLoading: false,
+      model:{},
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 6 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 18 }
+      }
+    }
+  },
+  methods: {
+
+    /** 获取所有的editableTable实例 */
+    getAllTable() {
+      if (!(this.refKeys instanceof Array)) {
+        throw this.throwNotArray('refKeys')
+      }
+      let values = this.refKeys.map(key => getRefPromise(this, key))
+      return Promise.all(values)
+    },
+
+    /** 遍历所有的JEditableTable实例 */
+    eachAllTable(callback) {
+      // 开始遍历
+      this.getAllTable().then(tables => {
+        tables.forEach((item, index) => {
+          if (typeof callback === 'function') {
+            callback(item, index)
+          }
+        })
+      })
+    },
+    /** 当点击新增按钮时调用此方法 */
+    add() {
+      //update-begin-author:lvdandan date:20201113 for:LOWCOD-1049 JEditaTable,子表默认添加一条数据，addDefaultRowNum设置无效 #1930
+      return new Promise((resolve) => {
+        this.tableReset();
+        resolve();
+      }).then(() => {
+        // 默认新增空数据
+        let rowNum = this.addDefaultRowNum
+        if (typeof rowNum !== 'number') {
+          rowNum = 1
+          console.warn('由于你没有在 data 中定义 addDefaultRowNum 或 addDefaultRowNum 不是数字，所以默认添加一条空数据，如果不想默认添加空数据，请将定义 addDefaultRowNum 为 0')
+        }
+        this.eachAllTable((item) => {
+          item.add(rowNum)
+        })
+        if (typeof this.addAfter === 'function') this.addAfter(this.model)
+        this.edit(this.model)
+      })
+      //update-end-author:lvdandan date:20201113 for:LOWCOD-1049 JEditaTable,子表默认添加一条数据，addDefaultRowNum设置无效 #1930
+    },
+    /** 当点击了编辑（修改）按钮时调用此方法 */
+    edit(record) {
+      if(record && '{}'!=JSON.stringify(record)&&record.id){
+        this.tableReset();
+      }
+      if (typeof this.editBefore === 'function') this.editBefore(record)
+      this.visible = true
+      this.activeKey = this.refKeys[0]
+      this.$refs.form.resetFields()
+      this.model = Object.assign({}, record)
+      if (typeof this.editAfter === 'function') this.editAfter(this.model)
+    },
+    /** 关闭弹窗，并将所有JEditableTable实例回归到初始状态 */
+    close() {
+      this.visible = false
+      this.$emit('close')
+    },
+    //清空子表table的数据
+    tableReset(){
+      this.eachAllTable((item) => {
+        item.clearRow()
+      })
+    },
+    /** 查询某个tab的数据 */
+    requestSubTableData(url, params, tab, success) {
+      tab.loading = true
+      getAction(url, params).then(res => {
+        let { result } = res
+        let dataSource = []
+        if (result) {
+          if (Array.isArray(result)) {
+            dataSource = result
+          } else if (Array.isArray(result.records)) {
+            dataSource = result.records
+          }
+        }
+        tab.dataSource = dataSource
+        typeof success === 'function' ? success(res) : ''
+      }).finally(() => {
+        tab.loading = false
+      })
+    },
+    /** 发起请求，自动判断是执行新增还是修改操作 */
+    request(formData) {
+      let url = this.url.add, method = 'post'
+      if (this.model.id) {
+        url = this.url.edit
+        method = 'put'
+      }
+      this.confirmLoading = true
+      httpAction(url, formData, method).then((res) => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.$emit('ok')
+          this.close()
+        } else {
+          this.$message.warning(res.message)
+        }
+      }).finally(() => {
+        this.confirmLoading = false
+      })
+    },
+
+    /* --- handle 事件 --- */
+
+    /** ATab 选项卡切换事件 */
+    handleChangeTabs(key) {
+      // 自动重置scrollTop状态，防止出现白屏
+      getRefPromise(this, key).then(editableTable => {
+        editableTable.resetScrollTop()
+      })
+    },
+    /** 关闭按钮点击事件 */
+    handleCancel() {
+      this.close()
+    },
+    /** 确定按钮点击事件 */
+    handleOk() {
+      /** 触发表单验证 */
+      this.getAllTable().then(tables => {
+        /** 一次性验证主表和所有的次表 */
+        return validateFormModelAndTables(this.$refs.form,this.model, tables)
+      }).then(allValues => {
+        /** 一次性验证一对一的所有子表 */
+        return this.validateSubForm(allValues)
+      }).then(allValues => {
+        if (typeof this.classifyIntoFormData !== 'function') {
+          throw this.throwNotFunction('classifyIntoFormData')
+        }
+        let formData = this.classifyIntoFormData(allValues)
+        // 发起请求
+        return this.request(formData)
+      }).catch(e => {
+        if (e.error === VALIDATE_NO_PASSED) {
+          // 如果有未通过表单验证的子表，就自动跳转到它所在的tab
+          //update--begin--autor:liusq-----date:20210316------for：未通过表单验证跳转tab问题------
+          this.activeKey = e.index == null ? this.activeKey : (e.paneKey?e.paneKey:this.refKeys[e.index])
+          //update--end--autor:liusq-----date:20210316------for：未通过表单验证跳转tab问题------
+        } else {
+          console.error(e)
+        }
+      })
+    },
+    //校验所有子表表单
+    validateSubForm(allValues){
+      return new Promise((resolve) => {
+        resolve(allValues)
+      })
+    },
+    /* --- throw --- */
+
+    /** not a function */
+    throwNotFunction(name) {
+      return `${name} 未定义或不是一个函数`
+    },
+
+    /** not a array */
+    throwNotArray(name) {
+      return `${name} 未定义或不是一个数组`
+    }
+
+  }
+}

ant-design-vue-jeecg/src/mixins/JVxeTableMixin.js

@@ -52,10 +52,13 @@ export const JVxeTableMixin = {
         rowNum = 1
         console.warn('由于你没有在 data 中定义 addDefaultRowNum 或 addDefaultRowNum 不是数字，所以默认添加一条空数据，如果不想默认添加空数据，请将定义 addDefaultRowNum 为 0')
       }
+      //update-begin-author:taoyan date:20210315 for: 一对多jvex 默认几行不好使了 LOWCOD-1349
       this.eachAllTable((item) => {
-        item.addRows()
-        //item.add(rowNum)
+        setTimeout(()=>{
+          item.addRows()
+        }, 30)
       })
+       //update-end-author:taoyan date:20210315 for: 一对多jvex 默认几行不好使了 LOWCOD-1349
       if (typeof this.addAfter === 'function') this.addAfter(this.model)
       this.edit({})
     },

ant-design-vue-jeecg/src/mixins/JVxeTableModelMixin.js

@@ -0,0 +1,181 @@
+import { VALIDATE_FAILED, getRefPromise, validateFormAndTables,validateFormModelAndTables} from '@/components/jeecg/JVxeTable/utils/vxeUtils.js'
+import { httpAction, getAction } from '@/api/manage'
+
+export const JVxeTableModelMixin = {
+  data() {
+    return {
+      title: '操作',
+      visible: false,
+      confirmLoading: false,
+      scrolling: true,
+      model: {},
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 6 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 18 }
+      }
+    }
+  },
+  methods: {
+
+    /** 获取所有的JVxeTable实例 */
+    getAllTable() {
+      if (!(this.refKeys instanceof Array)) {
+        throw this.throwNotArray('refKeys')
+      }
+      let values = this.refKeys.map(key => getRefPromise(this, key))
+      return Promise.all(values)
+    },
+
+    /** 遍历所有的JVxeTable实例 */
+    eachAllTable(callback) {
+      // 开始遍历
+      this.getAllTable().then(tables => {
+        console.log("tables",tables)
+        tables.forEach((item, index) => {
+          if (typeof callback === 'function') {
+            callback(item, index)
+          }
+        })
+      })
+    },
+
+    /** 当点击新增按钮时调用此方法 */
+    add() {
+      if (typeof this.addBefore === 'function') this.addBefore()
+      // 默认新增空数据
+      let rowNum = this.addDefaultRowNum
+      if (typeof rowNum !== 'number') {
+        rowNum = 1
+        console.warn('由于你没有在 data 中定义 addDefaultRowNum 或 addDefaultRowNum 不是数字，所以默认添加一条空数据，如果不想默认添加空数据，请将定义 addDefaultRowNum 为 0')
+      }
+      this.eachAllTable((item) => {
+        //update-begin-author:taoyan date:20210315 for: 一对多jvex 默认几行不好使了 LOWCOD-1349
+        setTimeout(()=>{
+          item.addRows()
+        }, 30)
+        //update-end-author:taoyan date:20210315 for: 一对多jvex 默认几行不好使了 LOWCOD-1349
+      })
+      if (typeof this.addAfter === 'function') this.addAfter(this.model)
+      this.edit(this.model)
+    },
+    /** 当点击了编辑（修改）按钮时调用此方法 */
+    edit(record) {
+      if (typeof this.editBefore === 'function') this.editBefore(record)
+      this.visible = true
+      this.activeKey = this.refKeys[0]
+      this.$refs.form.resetFields()
+      this.model = Object.assign({}, record)
+      if (typeof this.editAfter === 'function') this.editAfter(this.model)
+    },
+    /** 关闭弹窗，并将所有JVxeTable实例回归到初始状态 */
+    close() {
+      this.visible = false
+      this.eachAllTable((item) => {
+        item._remove()
+      })
+      this.$emit('close')
+    },
+
+    /** 查询某个tab的数据 */
+    requestSubTableData(url, params, tab, success) {
+      tab.loading = true
+      getAction(url, params).then(res => {
+        let { result } = res
+        let dataSource = []
+        if (result) {
+          if (Array.isArray(result)) {
+            dataSource = result
+          } else if (Array.isArray(result.records)) {
+            dataSource = result.records
+          }
+        }
+        tab.dataSource = dataSource
+        typeof success === 'function' ? success(res) : ''
+      }).finally(() => {
+        tab.loading = false
+      })
+    },
+    /** 发起请求，自动判断是执行新增还是修改操作 */
+    request(formData) {
+      let url = this.url.add, method = 'post'
+      if (this.model.id) {
+        url = this.url.edit
+        method = 'put'
+      }
+      this.confirmLoading = true
+      console.log("formData===>",formData);
+      httpAction(url, formData, method).then((res) => {
+        if (res.success) {
+          this.$message.success(res.message)
+          this.$emit('ok')
+          this.close()
+        } else {
+          this.$message.warning(res.message)
+        }
+      }).finally(() => {
+        this.confirmLoading = false
+      })
+    },
+
+    /* --- handle 事件 --- */
+
+    /** ATab 选项卡切换事件 */
+    handleChangeTabs(key) {
+      // 自动重置scrollTop状态，防止出现白屏
+      getRefPromise(this, key).then(vxeTable => {
+        vxeTable.resetScrollTop()
+      })
+    },
+    /** 关闭按钮点击事件 */
+    handleCancel() {
+      this.close()
+    },
+    /** 确定按钮点击事件 */
+    handleOk() {
+      /** 触发表单验证 */
+      this.getAllTable().then(tables => {
+        /** 一次性验证主表和所有的次表 */
+        return validateFormModelAndTables(this.$refs.form,this.model, tables)
+      }).then(allValues => {
+        /** 一次性验证一对一的所有子表 */
+        return this.validateSubForm(allValues)
+      }).then(allValues => {
+        if (typeof this.classifyIntoFormData !== 'function') {
+          throw this.throwNotFunction('classifyIntoFormData')
+        }
+        let formData = this.classifyIntoFormData(allValues)
+        // 发起请求
+        return this.request(formData)
+      }).catch(e => {
+        if (e.error === VALIDATE_FAILED) {
+          // 如果有未通过表单验证的子表，就自动跳转到它所在的tab
+          this.activeKey = e.index == null ? this.activeKey : this.refKeys[e.index]
+        } else {
+          console.error(e)
+        }
+      })
+    },
+//校验所有子表表单
+    validateSubForm(allValues){
+      return new Promise((resolve) => {
+        resolve(allValues)
+      })
+    },
+    /* --- throw --- */
+
+    /** not a function */
+    throwNotFunction(name) {
+      return `${name} 未定义或不是一个函数`
+    },
+
+    /** not a array */
+    throwNotArray(name) {
+      return `${name} 未定义或不是一个数组`
+    }
+
+  }
+}

ant-design-vue-jeecg/src/mixins/JeecgListMixin.js

@@ -66,7 +66,7 @@ export const JeecgListMixin = {
       let head = {'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)}
       let tenantid = Vue.ls.get(TENANT_ID)
       if(tenantid){
-        head['tenant_id'] = tenantid
+        head['tenant-id'] = tenantid
       }
       return head;
     }
@@ -177,6 +177,8 @@ export const JeecgListMixin = {
             that.loading = true;
             deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
               if (res.success) {
+                //重新计算分页问题
+                that.reCalculatePage(that.selectedRowKeys.length)
                 that.$message.success(res.message);
                 that.loadData();
                 that.onClearSelected();
@@ -198,6 +200,8 @@ export const JeecgListMixin = {
       var that = this;
       deleteAction(that.url.delete, {id: id}).then((res) => {
         if (res.success) {
+          //重新计算分页问题
+          that.reCalculatePage(1)
           that.$message.success(res.message);
           that.loadData();
         } else {
@@ -205,6 +209,17 @@ export const JeecgListMixin = {
         }
       });
     },
+    reCalculatePage(count){
+      //总数量-count
+      let total=this.ipagination.total-count;
+      //获取删除后的分页数
+      let currentIndex=Math.ceil(total/this.ipagination.pageSize);
+      //删除后的分页数<所在当前页
+      if(currentIndex<this.ipagination.current){
+        this.ipagination.current=currentIndex;
+      }
+      console.log('currentIndex',currentIndex)
+    },
     handleEdit: function (record) {
       this.$refs.modalForm.edit(record);
       this.$refs.modalForm.title = "编辑";
@@ -218,6 +233,7 @@ export const JeecgListMixin = {
     handleTableChange(pagination, filters, sorter) {
       //分页、排序、筛选变化时触发
       //TODO 筛选
+      console.log(pagination)
       if (Object.keys(sorter).length > 0) {
         this.isorter.column = sorter.field;
         this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"