mooho-base-admin-plus 2.9.4 → 2.10.0

package/src/pages/system/i18nText.vue

@@ -7,11 +7,23 @@
       <view-form ref="form" view-code="I18nTextFilter" @on-change="formChange"></view-form>
       <div v-if="canSave" style="margin-bottom: 8px; text-align: center">
         <Button type="primary" style="margin-right: 8px" custom-icon="fa fa-save" @click="save()">{{ $t('Front_Btn_Save') }}</Button>
-        <Button v-if="i18nType == 'Server' || i18nType == 'Front'" type="primary" custom-icon="fa fa-plus" @click="$refs.newForm.openDefault({ i18nType: i18nType })">
+        <Button
+          v-if="i18nType == 'Server' || i18nType == 'Front'"
+          type="primary"
+          style="margin-right: 8px"
+          custom-icon="fa fa-plus"
+          @click="$refs.newForm.openDefault({ i18nType: i18nType })"
+        >
           {{ $t('Front_Btn_Add') }}
         </Button>
+        <Button v-if="allow('export')" style="margin-right: 8px" type="info" custom-icon="fa fa-cloud-download-alt" @click="exportFile()">{{ $t('Front_Btn_Export') }}</Button>
+        <file-upload v-if="allow('import')" url="api/I18nText/importFile" accept=".i18n" @on-success="importFileSuccess">
+          <template #>
+            <Button type="primary" custom-icon="fa fa-cloud-upload-alt">{{ $t('Front_Btn_Import') }}</Button>
+          </template>
+        </file-upload>
       </div>
-      <view-table ref="table" view-code="I18nText" :static="true" :onSearch="loadData">
+      <view-table ref="table" view-code="I18nText" :static="true" :select-enable="true" :onSearch="loadData">
         <template #command="{ row }">
           <Button
             v-if="i18nType == 'Server' || i18nType == 'Front'"
@@ -92,6 +104,27 @@
             this.loadData();
           });
         });
+      },
+      // 导出文件
+      exportFile() {
+        let ids = this.$refs.table.getSelected().map(x => {
+          return x.id;
+        });
+        if (ids.length > 0) {
+          i18nTextApi.exportFile(ids);
+        } else {
+          this.error('Front_Msg_Please_Select_Export_Item');
+        }
+      },
+      // 导入成功
+      importFileSuccess(res) {
+        if (res.code == 0) {
+          this.success('Front_Msg_Success', () => {
+            this.loadData();
+          });
+        } else {
+          this.error(res.message);
+        }
       }
     }
   };

package/src/pages/system/tableView.vue

@@ -34,18 +34,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="$refs.form.data.sorting" @click="openSort">
-            <template #prepend>
-              <Button custom-icon="fa fa-edit" @click="openSort"></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="$refs.form.data.filtering" @click="openFilter">
-            <template #prepend>
-              <Button custom-icon="fa fa-edit" @click="openFilter"></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.form.data.batchSelectDataCode" @click="openColumnCheck($refs.form.data, 'batchSelectDataCode')">
@@ -172,8 +164,6 @@
         <Button type="primary" v-if="canCopy" custom-icon="fa fa-copy" @click="copy">{{ $t('Front_Btn_Copy') }}</Button>
       </template>
     </modal-form>
-    <modal-form-sort ref="modal_sort" :sort="data.sorting" :dataView="data" @bindSort="bindSort" />
-    <modal-form-filter ref="modal_filter" :filter="data.filtering" :dataView="data" @bindFilter="bindFilter" />
     <table-setting ref="tableSetting" />
     <filter-setting ref="filterSetting" />
     <column-select ref="columnSelect" />
@@ -194,11 +184,13 @@
   import groupMethod from '../../components/view/group-method.vue';
   import groupColumn from '../../components/view/group-column.vue';
   import conditionEdit from '../../components/view/condition-edit.vue';
+  import modalSettingSorting from '../../components/view/modal-setting-sorting.vue';
+  import modalSettingFiltering from '../../components/view/modal-setting-filtering.vue';
 
   export default {
     name: 'system-ui-tableView',
     mixins: [mixinPage],
-    components: { columnSelect, columnCheck, filterSetting, groupMethod, groupColumn, conditionEdit },
+    components: { columnSelect, columnCheck, conditionEdit, filterSetting, groupMethod, groupColumn, modalSettingFiltering, modalSettingSorting },
     data() {
       return {
         filter: {
@@ -267,34 +259,6 @@
         let res = await filterColumnApi.queryByDataViewID(row.id);
         this.$refs.filterSetting.open(row, res.data);
       },
-      //绑定排序组件返回的排序json
-      bindSort(value) {
-        this.$refs.form.data.sorting = value;
-        // this.data.sorting = value;
-      },
-      //绑定筛选组件返回的排序json
-      bindFilter(value) {
-        this.$refs.form.data.filtering = value;
-        // this.data.filtering = value;
-      },
-      // 打开排序编辑框
-      async openSort() {
-        if (!this.$refs.form.data.model == '') {
-          this.data = this.$refs.form.data;
-          this.$refs.modal_sort.open();
-        } else {
-          this.error('Front_Msg_Please_Select_Model_First');
-        }
-      },
-      // 打开筛选编辑框
-      async openFilter() {
-        if (!this.$refs.form.data.model == '') {
-          this.data = this.$refs.form.data;
-          this.$refs.modal_filter.open();
-        } else {
-          this.error('Front_Msg_Please_Select_Model_First');
-        }
-      },
       // 导出文件
       exportFile() {
         let ids = this.$refs.table.getSelected().map(x => {

package/src/pages/template/processPage.vue

@@ -37,7 +37,7 @@
         <Button
           type="warning"
           v-if="
-            cancelEnable &&
+            isCancelable &&
             $refs.form &&
             $refs.form.data &&
             $refs.form.data.application &&
@@ -62,6 +62,21 @@
     <modal-form ref="showForm" v-if="page" :readonly="page.showViewCode == null" @on-after-save="$refs.table.loadData()">
       <template #footer>
         <span></span>
+        <Button
+          type="warning"
+          v-if="
+            isRecallable &&
+            $refs.showForm &&
+            $refs.showForm.data &&
+            $refs.showForm.data.application &&
+            $refs.showForm.data.applicationID &&
+            $refs.showForm.data.application.status == 'Running'
+          "
+          custom-icon="fa fa-reply-all"
+          @click="recall"
+        >
+          {{ $t('Front_Btn_Recall') }}
+        </Button>
         <Button
           type="primary"
           v-if="
@@ -139,7 +154,9 @@
         messageData: {
           message: null
         },
-        messageOpened: false
+        messageOpened: false,
+        isCancelable: false,
+        isRecallable: false
       };
     },
     props: {
@@ -158,11 +175,6 @@
       // 申请类别
       applicationTypeCode: {
         type: String
-      },
-      // 允许撤销
-      cancelEnable: {
-        type: Boolean,
-        default: true
       }
     },
     computed: {},
@@ -198,6 +210,9 @@
       ...mapActions('admin/viewPage', { loadPage: 'load' }),
       // 初始化
       async init() {
+        this.isCancelable = this.page.applicationType.isCancelable;
+        this.isRecallable = this.page.applicationType.isRecallable;
+
         setTimeout(() => {
           if (!this.allow('all')) {
             this.filter.createUserID = this.info.id;
@@ -302,6 +317,17 @@
             this.$refs.form.close();
           });
         });
+      },
+      // 撤回
+      async recall() {
+        this.confirm('Front_Msg_Sure_To_Recall_Application', async () => {
+          await applicationApi.recall(this.$refs.showForm.data.applicationID);
+
+          this.success('Front_Msg_Success', () => {
+            this.$refs.table.loadData();
+            this.$refs.showForm.close();
+          });
+        });
       }
     }
   };

package/src/store/modules/admin/modules/user.js

@@ -21,7 +21,6 @@ export default {
         // store 赋值
         state.info = info;
 
-        console.log('info', info);
         // 持久化
         await dispatch(
           'admin/db/set',

package/src/components/view/modal-form-filter.vue

@@ -1,322 +0,0 @@
-<template>
-  <!-- 字段筛选table展示 -->
-  <Modal v-model="opened" scrollable :mask-closable="layout.maskClosable" :draggable="layout.draggable" :sticky="true" :reset-drag-position="true" :width="formView.width || '800'">
-    <template #header>
-      <div>
-        <span class="title">{{ $t('Front_Label_Sorting_Setting') }}</span>
-        <span class="description">{{ $t('Front_Label_Filtering_Setting_Desc') }}</span>
-      </div>
-    </template>
-
-    <div class="i-table-no-border">
-      <Table stripe :columns="columnsFiltering" :data="dataFiltering">
-        <template #action="{ row, index }">
-          <Button size="small" :title="$t('Front_Btn_Edit')" type="primary" ghost custom-icon="fa fa-edit" @click="filteringFmModalopen(row)"></Button>
-          <Button size="small" :title="$t('Front_Btn_Up')" type="primary" ghost custom-icon="fa fa-chevron-up" @click="upfiltering(row, index)"></Button>
-          <Button size="small" :title="$t('Front_Btn_Down')" type="primary" ghost custom-icon="fa fa-chevron-down" @click="downfiltering(row, index)"></Button>
-          <Button size="small" :title="$t('Front_Btn_Remove')" type="primary" ghost custom-icon="fa fa-times" @click="removefiltering(row, index)"></Button>
-        </template>
-      </Table>
-    </div>
-    <template #footer>
-      <Button type="primary" ghost custom-icon="fa fa-plus" @click="filteringFmModalopen(null)">{{ $t('Front_Btn_Add') }}</Button>
-      <Button type="primary" custom-icon="fa fa-check" @click="SaveFiltering">{{ $t('Front_Btn_OK') }}</Button>
-    </template>
-    <!-- 对筛选条件进行处理 -->
-    <Modal v-model="filteringFmModal" scrollable :mask-closable="layout.maskClosable" :draggable="layout.draggable" :sticky="true" :reset-drag-position="true" width="800">
-      <template #header>
-        <div>
-          <span class="title">{{ $t('Front_Label_Filtering_Setting_Edit') }}</span>
-          <span class="description">{{ $t('Front_Label_Filtering_Setting_Edit_Desc') }}</span>
-        </div>
-      </template>
-      <Form ref="filteringform">
-        <Row :gutter="24" type="flex">
-          <Col>
-            <FormItem :label="$t('Front_Label_Column')" prop="Code">
-              <Input type="text" v-model="data.code">
-                <template #prepend>
-                  <Button custom-icon="fa fa-search" @click="openSelect()"></Button>
-                </template>
-              </Input>
-            </FormItem>
-          </Col>
-          <Col>
-            <FormItem :label="$t('Front_Label_Operator')" prop="Operator">
-              <Select v-model="data.operator" :transfer="true">
-                <Option v-for="item in getEnumList('Operator')" :key="item.value" :value="item.id">{{ item.name }}</Option>
-              </Select>
-            </FormItem>
-          </Col>
-          <Col>
-            <FormItem :label="$t('Front_Label_Keyword')" prop="KeyValue">
-              <Input type="text" v-model="data.keyValue" maxlength="200" />
-            </FormItem>
-          </Col>
-        </Row>
-      </Form>
-      <template #footer>
-        <Button type="primary" custom-icon="fa fa-check" @click="saveFilteringForm($event)">{{ $t('Front_Btn_OK') }}</Button>
-      </template>
-      <column-check ref="columnCheck" />
-    </Modal>
-  </Modal>
-</template>
-
-<script>
-  import mixinPage from '../../mixins/page';
-  import columnCheck from './column-check.vue';
-
-  export default {
-    mixins: [mixinPage],
-    components: { columnCheck },
-
-    props: {
-      filter: String, //原表单筛选字段json值
-      dataView: {} //原表单对象
-    },
-    data() {
-      return {
-        opened: false,
-        formView: {},
-        filteringFmModal: false,
-        dataFiltering: [],
-        data: {}
-      };
-    },
-    computed: {
-      columnsFiltering() {
-        return [
-          {
-            type: 'index',
-            width: 100,
-            title: ' ',
-            align: 'center'
-          },
-          {
-            title: this.$t('Front_Label_Column'),
-            key: 'column'
-          },
-          {
-            title: this.$t('Front_Label_Operator'),
-            key: 'operatorType'
-          },
-          {
-            title: this.$t('Front_Label_Keyword'),
-            key: 'keyValue'
-          },
-          {
-            title: ' ',
-            slot: 'action',
-            width: 200,
-            fixed: 'right',
-            align: 'center'
-          }
-        ];
-      }
-    },
-    methods: {
-      open() {
-        this.toData();
-        this.opened = true;
-      },
-      close() {
-        this.opened = false;
-      },
-      // 将数据库获取的json字符串转换为数组对象
-      toData() {
-        let filterArr = [];
-        if (this.filter !== '' && this.filter != null) {
-          let json = JSON.parse(this.filter);
-          for (let key in json) {
-            let operatorArr = [];
-            operatorArr = this.operatorChange(key);
-            filterArr.push({
-              column: operatorArr[0],
-              operatorType: operatorArr[1],
-              rule: operatorArr[2],
-              operator: operatorArr[3],
-              keyValue: json[key]
-            });
-          }
-        }
-        this.dataFiltering = filterArr;
-      },
-      // 操作符数据转换（ companyType_g  --->  companyType，_g，大于，GreaterThan）
-      operatorChange(operator) {
-        let operatorArr = new Array(4);
-        if (operator.indexOf('_g') >= 0 && operator.indexOf('_ge') == -1) {
-          operatorArr[0] = operator.replace('_g', '');
-          operatorArr[1] = '大于';
-          operatorArr[2] = '_g';
-          operatorArr[3] = 'GreaterThan';
-        } else if (operator.indexOf('_l') >= 0 && operator.indexOf('_le') == -1) {
-          operatorArr[0] = operator.replace('_l', '');
-          operatorArr[1] = '小于';
-          operatorArr[2] = '_l';
-          operatorArr[3] = 'LessThan';
-        } else if (operator.indexOf('_ge') >= 0) {
-          operatorArr[0] = operator.replace('_ge', '');
-          operatorArr[1] = '大于等于';
-          operatorArr[2] = '_ge';
-          operatorArr[3] = 'GreaterThanOrEqual';
-        } else if (operator.indexOf('_le') >= 0) {
-          operatorArr[0] = operator.replace('_le', '');
-          operatorArr[1] = '小于等于';
-          operatorArr[2] = '_le';
-          operatorArr[3] = 'LessThanOrEqual';
-        } else if (operator.indexOf('_n') >= 0) {
-          operatorArr[0] = operator.replace('_n', '');
-          operatorArr[1] = '不等于';
-          operatorArr[2] = '_n';
-          operatorArr[3] = 'NotEqual';
-        } else if (operator.indexOf('_c') >= 0) {
-          operatorArr[0] = operator;
-          operatorArr[1] = '文字包含';
-          operatorArr[2] = '_c';
-          operatorArr[3] = 'Contains';
-        } else {
-          operatorArr[0] = operator;
-          operatorArr[1] = '等于';
-          operatorArr[2] = '';
-          operatorArr[3] = 'Equal';
-        }
-        return operatorArr;
-      },
-      // 操作符数据转换 （ companyType，_g，大于，GreaterThan --->  companyType_g ）
-      operatorReChange(operator) {
-        let operatorArr = new Array(2);
-        if (operator == 'GreaterThan') {
-          operatorArr[0] = '大于';
-          operatorArr[1] = '_g';
-        } else if (operator == 'LessThan') {
-          operatorArr[0] = '小于';
-          operatorArr[1] = '_l';
-        } else if (operator == 'GreaterThanOrEqual') {
-          operatorArr[0] = '大于等于';
-          operatorArr[1] = '_ge';
-        } else if (operator == 'LessThanOrEqual') {
-          operatorArr[0] = '小于等于';
-          operatorArr[1] = '_le';
-        } else if (operator == 'NotEqual') {
-          operatorArr[0] = '不等于';
-          operatorArr[1] = '_n';
-        } else if (operator == 'Contains') {
-          operatorArr[0] = '文字包含';
-          operatorArr[1] = '_c';
-        } else {
-          operatorArr[0] = '等于';
-          operatorArr[1] = '';
-        }
-        return operatorArr;
-      },
-
-      // 筛选结果 将table对象转换为json字符串
-      toFilteringJson() {
-        let jsonStr = '{';
-        if (this.dataFiltering.length > 0) {
-          for (let key in this.dataFiltering) {
-            jsonStr += '"' + this.dataFiltering[key].column + this.dataFiltering[key].rule + '":"' + this.dataFiltering[key].keyValue + '",';
-          }
-          jsonStr = jsonStr.substring(0, jsonStr.length - 1);
-          jsonStr += '}';
-        } else {
-          jsonStr = '';
-        }
-        this.$emit('bindFilter', jsonStr);
-        this.close();
-      },
-
-      // 打开筛选编辑表单
-      filteringFmModalopen(row) {
-        // // row = null表示新增
-        if (row != null) {
-          this.data.code = row.column;
-          this.data.operator = row.operator;
-          this.data.keyValue = row.keyValue;
-        }
-        // 表示新增
-        else {
-          this.data.code = '';
-          this.data.rule = '';
-          this.data.operator = 'Equal';
-          this.data.keyValue = '';
-        }
-        this.filteringFmModal = true;
-      },
-
-      // 添加筛选字段表单确认
-      async saveFilteringForm() {
-        if (!!(this.data.code || '').trim() && !!(this.data.keyValue || '').trim() && !!(this.data.operator || '').trim()) {
-          let ope = this.operatorReChange(this.data.operator);
-          let checkSort = false;
-          this.dataFiltering.forEach(item => {
-            // 如果编辑列与原数据中有相同列，则做更新不做添加
-            if (item.column == this.data.code) {
-              checkSort = true;
-              (item.operatorType = ope[0]), (item.rule = ope[1]), (item.operator = this.data.operator), (item.keyValue = this.data.keyValue);
-            }
-          });
-          if (!checkSort) {
-            this.dataFiltering.push({
-              column: this.data.code,
-              operatorType: ope[0],
-              rule: ope[1],
-              operator: this.data.operator,
-              keyValue: this.data.keyValue
-            });
-          }
-
-          this.filteringFmModal = false;
-        } else {
-          this.error('Front_Msg_Column_Filtering_Required');
-        }
-      },
-      SaveFiltering() {
-        this.toFilteringJson();
-      },
-
-      // 筛选字段的移动操作
-      // 移除一行数据
-      removefiltering(row, index) {
-        if (row != null) {
-          this.dataFiltering.splice(index, 1);
-        }
-      },
-      // 上移
-      upfiltering(row, index) {
-        if (index > 0) {
-          this.dataFiltering.splice(index, 1);
-          this.dataFiltering.splice(index - 1, 0, row);
-        }
-      },
-      // 下移
-      downfiltering(row, index) {
-        if (index < this.dataFiltering.length - 1) {
-          this.dataFiltering.splice(index, 1);
-          this.dataFiltering.splice(index + 1, 0, row);
-        }
-      },
-      // 打开字段选择界面
-      openSelect() {
-        this.$refs.columnCheck.open(this.dataView.model, checked => {
-          this.data.code = checked.code;
-          this.data.name = checked.name;
-          this.data.dataType = checked.dataType;
-          this.data.source = checked.objColumn != null ? checked.objColumn.dataType : null;
-          this.data.sourceDataCode = checked.objColumn != null ? 'id' : null;
-          this.data.sourceDisplayCode =
-            checked.objColumn != null &&
-            checked.objColumn.columns.some(function (column) {
-              return column.code === checked.objColumn.code + '.name';
-            })
-              ? 'name'
-              : null;
-          setTimeout(() => {
-            //this.$forceUpdate();
-          });
-        });
-      }
-    }
-  };
-</script>