mooho-base-admin-plus 2.9.5 → 2.10.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.9.5",
+  "version": "2.10.1",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/src/api/application.js

@@ -47,5 +47,14 @@ export default {
         id
       }
     });
+  },
+  recall(id) {
+    return request({
+      url: `api/${res}/recall`,
+      method: 'post',
+      data: {
+        id
+      }
+    });
   }
 };

package/src/api/i18nText.js

@@ -1,4 +1,6 @@
 import request from '../libs/request';
+import dateFormat from 'date-fns/format';
+import saveAs from 'file-saver';
 
 const res = 'I18nText';
 
@@ -29,5 +31,20 @@ export default {
       url: `api/${res}/getAll`,
       method: 'get'
     });
+  },
+  async exportFile(ids) {
+    const result = await request({
+      url: `api/${res}/exportFile`,
+      method: 'post',
+      responseType: 'blob',
+      data: {
+        ids
+      }
+    });
+
+    const blob = new Blob([result], {
+      type: 'application/octet-stream'
+    });
+    saveAs(blob, 'I18nText-' + dateFormat(new Date(), 'yyyyMMddHHmmss') + '.i18n');
   }
 };

package/src/api/task.js

@@ -35,6 +35,16 @@ export default {
       }
     });
   },
+  recall(id, comment) {
+    return request({
+      url: `api/${res}/recall`,
+      method: 'post',
+      data: {
+        id,
+        comment
+      }
+    });
+  },
   redirect(id, targetID, comment) {
     return request({
       url: `api/${res}/redirect`,

package/src/components/input/dialog-select.vue

@@ -139,8 +139,6 @@
           filter[this.sourceDataCode] = JSON.parse(this.modelValue).join(',');
 
           this.loadDataView(this.source).then(async view => {
-            console.log('xxx');
-
             if (view.dataView.isCustom) {
               let res = await customModelApi.query(view.dataView.model, filter, [this.sourceDataCode, this.sourceDisplayCode]);
               if (res.data.length > 0) {

package/src/components/view/modal-setting-filtering.vue

@@ -0,0 +1,197 @@
+<template>
+  <Input type="text" :readonly="true" :model-value="modelValue" @click="open()">
+    <template #prepend>
+      <Button custom-icon="fa fa-edit" @click="open()"></Button>
+    </template>
+  </Input>
+  <modal-table ref="table" view-code="TableDefaultFiltering" :static="true" :footer-enable="true" @edit="({ row, index }) => edit(row, index)">
+    <template #footer>
+      <Button type="primary" ghost custom-icon="fa fa-plus" @click="edit()">
+        {{ $t('Front_Btn_Add') }}
+      </Button>
+      <Button type="primary" custom-icon="fa fa-check" @click="saveFiltering">{{ $t('Front_Btn_OK') }}</Button>
+    </template>
+  </modal-table>
+  <modal-form ref="form" view-code="TableDefaultFilteringEdit">
+    <template #column="{ data, code }">
+      <template v-if="code == 'column'">
+        <Input type="text" readonly v-model="data[code]" @on-focus="openSelect()">
+          <template #prepend>
+            <Button custom-icon="fa fa-search" @click="openSelect()"></Button>
+          </template>
+        </Input>
+      </template>
+    </template>
+    <template #footer>
+      <Button type="primary" custom-icon="fa fa-check" @click="save()">{{ $t('Front_Btn_OK') }}</Button>
+    </template>
+  </modal-form>
+  <column-check ref="columnCheck" />
+</template>
+
+<script>
+  import mixinPage from '../../mixins/page';
+  import columnCheck from './column-check.vue';
+
+  export default {
+    mixins: [mixinPage],
+    components: { columnCheck },
+    props: {
+      /**
+       * @model
+       */
+      modelValue: {
+        type: String
+      },
+      /**
+       * 是否数据源
+       */
+      isDataSource: {
+        type: Boolean
+      },
+      /**
+       * 模型
+       */
+      model: {
+        type: String
+      },
+      /**
+       * 数据源
+       */
+      dataSource: {
+        type: String
+      }
+    },
+    data() {
+      return {
+        index: null
+      };
+    },
+    computed: {},
+    async created() {},
+    methods: {
+      open() {
+        if (this.isDataSource && !(this.dataSource || '').trim()) {
+          this.error('Front_Msg_Please_Select_Model_First');
+          return;
+        } else if (!this.isDataSource && !(this.model || '').trim()) {
+          this.error('Front_Msg_Please_Select_Model_First');
+          return;
+        }
+
+        let array = [];
+
+        if (!!(this.modelValue || '').trim()) {
+          let json = JSON.parse(this.modelValue);
+          for (let key in json) {
+            let operatorType = null;
+            let suffix = null;
+
+            let column = key.split('_')[0];
+
+            if (key.split('_').length > 1) {
+              suffix = key.split('_')[1];
+            }
+
+            if (suffix == 'g') {
+              operatorType = '大于';
+            } else if (suffix == 'l') {
+              operatorType = '小于';
+            } else if (suffix == 'ge') {
+              operatorType = '大于等于';
+            } else if (suffix == 'le') {
+              operatorType = '小于等于';
+            } else if (suffix == 'n') {
+              operatorType = '不等于';
+            } else if (suffix == 'c') {
+              operatorType = '文字包含';
+            } else {
+              operatorType = '等于';
+            }
+
+            array.push({
+              column,
+              operatorType,
+              keyValue: json[key]
+            });
+          }
+        }
+
+        this.$refs.table.loadData(array);
+        this.$refs.table.open();
+      },
+      edit(row, index) {
+        this.index = index;
+        this.$refs.form.open(row);
+      },
+      async save() {
+        let isOK = await this.$refs.form.validate();
+
+        if (!isOK) {
+          this.error('Front_Msg_Form_Validate_Fail');
+          return;
+        }
+
+        let array = this.$refs.table.data;
+        let data = this.$refs.form.data;
+
+        if (this.index == null) {
+          // 新增
+          array.push(data);
+        } else {
+          // 编辑
+          array[this.index].column = data.column;
+          array[this.index].operatorType = data.operatorType;
+          array[this.index].keyValue = data.keyValue;
+        }
+
+        this.$refs.table.loadData(array);
+        this.$refs.form.close();
+      },
+      saveFiltering() {
+        let obj = {};
+        let json = null;
+
+        if (this.$refs.table.data.length > 0) {
+          this.$refs.table.data.forEach(item => {
+            let key = item.column;
+
+            if ((item.operatorType = '大于')) {
+              key += '_g';
+            } else if ((item.operatorType = '小于')) {
+              key += '_l';
+            } else if ((item.operatorType = '大于等于')) {
+              key += '_ge';
+            } else if ((item.operatorType = '小于等于')) {
+              key += '_le';
+            } else if ((item.operatorType = '不等于')) {
+              key += '_n';
+            } else if ((item.operatorType = '文字包含')) {
+              key += '_c';
+            }
+
+            obj[key] = item.keyValue;
+          });
+
+          json = JSON.stringify(obj);
+        }
+
+        this.$emit('update:modelValue', json);
+
+        this.$refs.table.close();
+      },
+      // 打开字段选择界面
+      openSelect() {
+        if (this.isDataSource) {
+          this.$refs.columnCheck.openDataSourceFilter(this.dataSource, checked => {
+            this.$refs.form.data.column = checked.code;
+          });
+        } else {
+          this.$refs.columnCheck.open(this.model, checked => {
+            this.$refs.form.data.column = checked.code;
+          });
+        }
+      }
+    }
+  };
+</script>

package/src/components/view/modal-setting-sorting.vue

@@ -0,0 +1,166 @@
+<template>
+  <Input type="text" :readonly="true" :model-value="modelValue" @click="open()">
+    <template #prepend>
+      <Button custom-icon="fa fa-edit" @click="open()"></Button>
+    </template>
+  </Input>
+  <modal-table ref="table" view-code="TableDefaultSorting" :static="true" :footer-enable="true" @edit="({ row, index }) => edit(row, index)">
+    <template #footer>
+      <Button type="primary" ghost custom-icon="fa fa-plus" @click="edit()">
+        {{ $t('Front_Btn_Add') }}
+      </Button>
+      <Button type="primary" custom-icon="fa fa-check" @click="saveSorting">{{ $t('Front_Btn_OK') }}</Button>
+    </template>
+  </modal-table>
+  <modal-form ref="form" view-code="TableDefaultSortingEdit">
+    <template #column="{ data, code }">
+      <template v-if="code == 'column'">
+        <Input type="text" readonly v-model="data[code]" @on-focus="openSelect()">
+          <template #prepend>
+            <Button custom-icon="fa fa-search" @click="openSelect()"></Button>
+          </template>
+        </Input>
+      </template>
+    </template>
+    <template #footer>
+      <Button type="primary" custom-icon="fa fa-check" @click="save()">{{ $t('Front_Btn_OK') }}</Button>
+    </template>
+  </modal-form>
+  <column-check ref="columnCheck" />
+</template>
+
+<script>
+  import mixinPage from '../../mixins/page';
+  import columnCheck from './column-check.vue';
+
+  export default {
+    mixins: [mixinPage],
+    components: { columnCheck },
+    props: {
+      /**
+       * @model
+       */
+      modelValue: {
+        type: String
+      },
+      /**
+       * 是否数据源
+       */
+      isDataSource: {
+        type: Boolean
+      },
+      /**
+       * 模型
+       */
+      model: {
+        type: String
+      },
+      /**
+       * 数据源
+       */
+      dataSource: {
+        type: String
+      }
+    },
+    data() {
+      return {
+        index: null
+      };
+    },
+    computed: {},
+    async created() {},
+    methods: {
+      open() {
+        if (this.isDataSource && !(this.dataSource || '').trim()) {
+          this.error('Front_Msg_Please_Select_Model_First');
+          return;
+        } else if (!this.isDataSource && !(this.model || '').trim()) {
+          this.error('Front_Msg_Please_Select_Model_First');
+          return;
+        }
+
+        let array = [];
+
+        if (!!(this.modelValue || '').trim()) {
+          let json = JSON.parse(this.modelValue);
+          for (let key in json) {
+            array.push({
+              column: key,
+              rule: json[key]
+            });
+          }
+        }
+
+        this.$refs.table.loadData(array);
+        this.$refs.table.open();
+      },
+      edit(row, index) {
+        this.index = index;
+        this.$refs.form.open(row);
+      },
+      async save() {
+        let isOK = await this.$refs.form.validate();
+
+        if (!isOK) {
+          this.error('Front_Msg_Form_Validate_Fail');
+          return;
+        }
+
+        let array = this.$refs.table.data;
+        let data = this.$refs.form.data;
+
+        if (this.index == null) {
+          // 新增
+          if (array.some(item => item.column == data.column)) {
+            this.error('排序字段已存在！');
+            return;
+          }
+
+          array.push(data);
+        } else {
+          // 编辑
+          for (let i = 0; i < data.length; i++) {
+            if (i != this.index && data[i].column == data.column) {
+              this.error('排序字段不能重复！');
+              return;
+            }
+          }
+
+          array[this.index].column = data.column;
+          array[this.index].rule = data.rule;
+        }
+
+        this.$refs.table.loadData(array);
+        this.$refs.form.close();
+      },
+      saveSorting() {
+        let obj = {};
+        let json = null;
+
+        if (this.$refs.table.data.length > 0) {
+          this.$refs.table.data.forEach(item => {
+            obj[item.column] = item.rule;
+          });
+
+          json = JSON.stringify(obj);
+        }
+
+        this.$emit('update:modelValue', json);
+
+        this.$refs.table.close();
+      },
+      // 打开字段选择界面
+      openSelect() {
+        if (this.isDataSource) {
+          this.$refs.columnCheck.openDataSourceFilter(this.dataSource, checked => {
+            this.$refs.form.data.column = checked.code;
+          });
+        } else {
+          this.$refs.columnCheck.open(this.model, checked => {
+            this.$refs.form.data.column = checked.code;
+          });
+        }
+      }
+    }
+  };
+</script>

package/src/components/view/table-setting.vue

@@ -23,18 +23,10 @@
           <Input type="text" :readonly="true" v-model="data.keywordColumn" @click="keywordColumnOpen()"></Input>
         </div>
         <div v-if="code == 'sorting'">
-          <Input type="text" :readonly="true" v-model="sort" @click="$refs.modal_sort.open()">
-            <template #prepend>
-              <Button custom-icon="fa fa-edit" @click="$refs.modal_sort.open()"></Button>
-            </template>
-          </Input>
+          <modal-setting-sorting ref="settingSorting" v-model="data.sorting" :is-data-source="data.isDataSource" :model="data.model" :data-source="data.dataSource" />
         </div>
         <div v-if="code == 'filtering'">
-          <Input type="text" :readonly="true" v-model="filter" @click="$refs.modal_filter.open()">
-            <template #prepend>
-              <Button custom-icon="fa fa-edit" @click="$refs.modal_filter.open()"></Button>
-            </template>
-          </Input>
+          <modal-setting-filtering ref="settingFiltering" v-model="data.filtering" :is-data-source="data.isDataSource" :model="data.model" :data-source="data.dataSource" />
         </div>
         <div v-if="code == 'batchSelectDataCode'">
           <Input type="text" :readonly="true" v-model="$refs.setting.data.batchSelectDataCode" @click="openColumnCheck($refs.setting.data, 'batchSelectDataCode')">
@@ -183,8 +175,7 @@
         <Button type="primary" custom-icon="fa fa-save" @click="saveParams">{{ $t('Front_Btn_Save') }}</Button>
       </template>
     </modal-table>
-    <modal-form-sort ref="modal_sort" :sort="sort" :dataView="dataView" @bindSort="bindSort" />
-    <modal-form-filter ref="modal_filter" :filter="filter" :dataView="dataView" @bindFilter="bindFilter" />
+
     <column-check ref="columnCheck" />
     <group-method ref="groupMethod" />
     <group-column ref="groupColumn" />
@@ -197,24 +188,20 @@
   import columnSelect from './column-select.vue';
   import columnEdit from './column-edit.vue';
   import { mapActions } from 'vuex';
-  import modalFormSort from './modal-form-sort.vue';
-  import modalFormFilter from './modal-form-filter.vue';
+  import modalSettingSorting from './modal-setting-sorting.vue';
+  import modalSettingFiltering from './modal-setting-filtering.vue';
   import groupMethod from './group-method.vue';
   import groupColumn from './group-column.vue';
   import conditionEdit from './condition-edit.vue';
 
   export default {
     mixins: [mixinPage],
-    components: { columnCheck, columnSelect, columnEdit, modalFormSort, modalFormFilter, groupMethod, groupColumn, conditionEdit },
+    components: { columnCheck, columnSelect, columnEdit, conditionEdit, groupMethod, groupColumn, modalSettingFiltering, modalSettingSorting },
     data() {
       return {
         active: false,
         dataView: {},
         data: {},
-        tablename: '',
-        sort: '',
-        filter: '',
-        tableid: '',
         commandButton: {}
       };
     },
@@ -418,10 +405,6 @@
       },
       // 设置
       setting() {
-        // 排序字段参数赋值
-        this.sort = this.dataView.sorting;
-        this.filter = this.dataView.filtering;
-
         if (!!(this.dataView.commandButton || '').trim()) {
           this.$refs.commandButton.loadData(JSON.parse(this.dataView.commandButton));
         } else {
@@ -455,16 +438,6 @@
           });
         }
       },
-      //绑定排序组件返回的排序json
-      bindSort(value) {
-        this.sort = value;
-        this.$refs.setting.data.sorting = value;
-      },
-      //绑定筛选组件返回的排序json
-      bindFilter(value) {
-        this.filter = value;
-        this.$refs.setting.data.filtering = value;
-      },
       // 打开操作栏按钮参数设置界面
       openParams(row) {
         this.commandButton = row;

package/src/components/view/view-table.vue

@@ -1466,10 +1466,12 @@
        */
       async edit(row, index) {
         let data = row;
-        if (this.tableView.isCustom) {
-          data = await customModelApi.get(this.tableView.model, row.id);
-        } else if (!this.tableView.isDataSource) {
-          data = await modelApi.get(this.tableView.model, row.id);
+        if (!this.static && !this.embedded) {
+          if (this.tableView.isCustom) {
+            data = await customModelApi.get(this.tableView.model, row.id);
+          } else if (!this.tableView.isDataSource) {
+            data = await modelApi.get(this.tableView.model, row.id);
+          }
         }
 
         /**
@@ -1487,10 +1489,12 @@
        */
       async show(row, index) {
         let data = row;
-        if (this.tableView.isCustom) {
-          data = await customModelApi.get(this.tableView.model, row.id);
-        } else if (!this.tableView.isDataSource) {
-          data = await modelApi.get(this.tableView.model, row.id);
+        if (!this.static && !this.embedded) {
+          if (this.tableView.isCustom) {
+            data = await customModelApi.get(this.tableView.model, row.id);
+          } else if (!this.tableView.isDataSource) {
+            data = await modelApi.get(this.tableView.model, row.id);
+          }
         }
 
         /**
@@ -1508,7 +1512,7 @@
        */
       remove(row, index) {
         this.confirm('Front_Msg_Sure_To_Delete_Item', async () => {
-          if (this.embedded) {
+          if (this.static || this.embedded) {
             this.staticData.splice((this.current - 1) * this.size + index, 1);
             this.loadData();
 

package/src/components/workflow/task-form.vue

@@ -24,6 +24,7 @@
           <Button type="warning" v-if="isRejectable" custom-icon="fa fa-reply" @click="reject()">{{ $t('Front_Btn_Reject') }}</Button>
           <Button type="primary" v-if="isBackable" custom-icon="fa fa-share" @click="back()">{{ $t('Front_Btn_Back_Previous') }}</Button>
           <Button type="primary" v-if="isRedirectable" custom-icon="fa fa-share" @click="$refs.redirectTaskForm.open()">{{ $t('Front_Btn_Redirect') }}</Button>
+          <Button type="primary" v-if="isRecallable" custom-icon="fa fa-reply-all" @click="recall()">{{ $t('Front_Btn_Recall') }}</Button>
           <Button type="primary" v-if="isMessageEnable" custom-icon="fa fa-comment-dots" @click="openMessage()">{{ $t('Front_Btn_Leave_Message') }}</Button>
           <Button type="info" custom-icon="fa fa-history" @click="$refs.approvalHistoryTable.open({ processInstID: task.processInstID })">{{ $t('Front_Btn_History') }}</Button>
           <Button type="default" custom-icon="fa fa-times" @click="opened = false">{{ $t('Front_Btn_Close') }}</Button>
@@ -92,6 +93,7 @@
         isBackable: false,
         isRedirectable: false,
         isMessageEnable: false,
+        isRecallable: false,
         messageData: {
           message: null
         },
@@ -117,6 +119,7 @@
         this.isBackable = this.task.activityInst.activity.isBackable && this.task.status == 'Pending';
         this.isRedirectable = this.task.activityInst.activity.isRedirectable && this.task.status == 'Pending';
         this.isMessageEnable = this.task.processInst.isMessageEnable && this.task.status == 'Pending';
+        this.isRecallable = this.task.activityInst.activity.isRecallable && this.task.status == 'Finished' && !this.task.isCallbacked;
         this.isCustom = false;
 
         setTimeout(async () => {
@@ -309,6 +312,29 @@
           }
         );
       },
+      // 撤回
+      async recall() {
+        this.confirmInput(
+          'Front_Msg_Sure_To_Recall_Task',
+          this.$t('Front_Label_Comment'),
+          async () => {
+            await taskApi.recall(this.task.id, this.comment);
+            this.success('Front_Msg_Success');
+            this.resetNotice();
+            this.$emit('on-after-action');
+            this.opened = false;
+          },
+          comment => {
+            if (!(comment || '').trim()) {
+              this.warning('Front_Msg_Please_Input_Recall_Reason');
+              return false;
+            } else {
+              this.comment = comment;
+              return true;
+            }
+          }
+        );
+      },
       // 退回上一步
       async back() {
         this.confirmInput(

package/src/pages/common/home.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <Row :gutter="12" class="ivu-mt">
-      <Col :xxl="8" :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
+      <!-- <Col :xxl="8" :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
         <div>
           <Row :gutter="12">
             <Col v-bind="grid" class="ivu-mb">
@@ -86,7 +86,7 @@
             </Col>
           </Row>
         </div>
-      </Col>
+      </Col> -->
       <Col :xl="10" :lg="8" :md="8" :sm="12" :xs="24">
         <notice-list />
       </Col>