mooho-base-admin-plus 0.4.42 → 0.4.44

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "0.4.42",
+  "version": "0.4.44",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "dotnetVersion": "1.4.0",
   "license": "MIT",

package/src/pages/system/applicationType.vue

@@ -4,7 +4,11 @@
       <PageHeader :title="$route.meta.title" :content="$route.meta.description" hidden-breadcrumb />
     </div>
     <Card :bordered="false" dis-hover class="ivu-mt">
-      <view-table ref="table" view-code="ApplicationType" @create="$refs.form.open()" @edit="({ row }) => edit(row)"></view-table>
+      <view-table ref="table" view-code="ApplicationType" @create="$refs.form.open()" @edit="({ row }) => edit(row)">
+        <template #command="{ row }">
+          <Button size="small" :title="$t('Front_Btn_NotificationSetting')" type="primary" custom-icon="fa fa-mail-bulk" @click="notificationSetting(row)"></Button>
+        </template>
+      </view-table>
     </Card>
     <modal-form ref="form" view-code="ApplicationTypeEdit" @on-after-save="$refs.table.loadData()" @on-change="formChange">
       <template #column="{ code }">
@@ -36,6 +40,11 @@
         <Button type="primary" custom-icon="fa fa-save" @click="save">{{ $t('Front_Btn_Save') }}</Button>
       </template>
     </modal-form>
+    <modal-form ref="notificationSettingForm" view-code="ApplicationNotificationSetting">
+      <template #footer>
+        <Button type="primary" custom-icon="fa fa-save" @click="saveSetting">{{ $t('Front_Btn_Save') }}</Button>
+      </template>
+    </modal-form>
     <column-check ref="columnCheck" />
   </div>
 </template>
@@ -50,6 +59,7 @@
     components: { columnCheck },
     data() {
       return {
+        applicationType: null,
         processProperties: []
       };
     },
@@ -176,6 +186,36 @@
         }
 
         this.$refs.propertyTable.loadData(this.processProperties);
+      },
+      // 通知设置
+      notificationSetting(row) {
+        this.applicationType = row;
+        let setting = {};
+        if (!!(row.notificationSetting || '').trim()) {
+          setting = JSON.parse(row.notificationSetting);
+        }
+
+        this.$refs.notificationSettingForm.open(setting);
+      },
+      // 保存通知设置
+      async saveSetting() {
+        let isOK = await this.$refs.notificationSettingForm.validate();
+
+        if (!isOK) {
+          this.error('Front_Msg_Form_Validate_Fail');
+        } else {
+          this.confirm('Front_Msg_Sure_To_Save', async () => {
+            let data = this.$refs.notificationSettingForm.getFullData();
+
+            this.applicationType.notificationSetting = JSON.stringify(data);
+
+            await modelApi.update('ApplicationType', this.applicationType);
+            this.success('Front_Msg_Success', () => {
+              this.$refs.notificationSettingForm.close();
+              this.$refs.table.loadData();
+            });
+          });
+        }
       }
     }
   };

package/src/pages/system/dictType.vue

@@ -7,7 +7,7 @@
       <view-table ref="table" view-code="DictType" :selectEnable="true" @create="$refs.form.open()" @edit="({ row, index }) => $refs.form.open(row)">
         <template #filterCommand>
           <Button size="small" type="info" custom-icon="fa fa-cloud-download-alt" @click="exportFile()">{{ $t('Front_Btn_Export') }}</Button>
-          <file-upload url="api/DictType/importFile" accept=".dict" @on-success="importFileSuccess" style="display: inline-block; margin-left: 4px; margin-right: 4px">
+          <file-upload url="api/DictType/importFile" accept=".dict" @on-success="importFileSuccess">
             <template #>
               <Button type="primary" custom-icon="fa fa-cloud-upload-alt" size="small">{{ $t('Front_Btn_Import') }}</Button>
             </template>

package/src/pages/system/mailTemplate.vue

@@ -0,0 +1,26 @@
+<template>
+  <div>
+    <div class="i-layout-page-header">
+      <PageHeader :title="$route.meta.title" :content="$route.meta.description" hidden-breadcrumb />
+    </div>
+    <Card :bordered="false" dis-hover class="ivu-mt">
+      <view-table ref="table" view-code="MailTemplate" @create="$refs.form.open()" @edit="({ row, index }) => $refs.form.open(row)"></view-table>
+    </Card>
+    <modal-form ref="form" view-code="MailTemplateEdit" @on-after-save="$refs.table.loadData()" />
+  </div>
+</template>
+<script>
+  import mixinPage from '../../mixins/page';
+
+  export default {
+    name: 'system-mailTemplate',
+    mixins: [mixinPage],
+    components: {},
+    data() {
+      return {};
+    },
+    computed: {},
+    created() {},
+    methods: {}
+  };
+</script>

package/src/pages/system/permission.vue

@@ -21,7 +21,7 @@
       >
         <template #filterCommand>
           <Button size="small" type="info" custom-icon="fa fa-cloud-download-alt" @click="exportFile()">{{ $t('Front_Btn_Export') }}</Button>
-          <file-upload url="api/Permission/importFile" accept=".pms" @on-success="importFileSuccess" style="display: inline-block; margin-left: 4px; margin-right: 4px">
+          <file-upload url="api/Permission/importFile" accept=".pms" @on-success="importFileSuccess">
             <template #>
               <Button type="primary" custom-icon="fa fa-cloud-upload-alt" size="small">{{ $t('Front_Btn_Import') }}</Button>
             </template>

package/src/pages/system/process.vue

@@ -7,7 +7,7 @@
       <view-table ref="table" view-code="Process" :selectEnable="true" @create="$refs.form.open()" @edit="({ row, index }) => $refs.form.open(row)">
         <template #filterCommand>
           <Button size="small" type="info" custom-icon="fa fa-cloud-download-alt" @click="exportFile()">{{ $t('Front_Btn_Export') }}</Button>
-          <file-upload url="api/Process/importFile" accept=".proc" @on-success="importFileSuccess" style="display: inline-block; margin-left: 4px; margin-right: 4px">
+          <file-upload url="api/Process/importFile" accept=".proc" @on-success="importFileSuccess">
             <template #>
               <Button type="primary" custom-icon="fa fa-cloud-upload-alt" size="small">{{ $t('Front_Btn_Import') }}</Button>
             </template>

package/src/pages/system/tableView.vue

@@ -7,7 +7,7 @@
       <view-table ref="table" view-code="TableView" :filter="filter" :selectEnable="true" @create="create" @edit="edit">
         <template #filterCommand>
           <Button size="small" type="info" custom-icon="fa fa-cloud-download-alt" @click="exportFile()">{{ $t('Front_Btn_Export') }}</Button>
-          <file-upload url="api/DataView/importFile" accept=".view" @on-success="importFileSuccess" style="display: inline-block; margin-left: 4px; margin-right: 4px">
+          <file-upload url="api/DataView/importFile" accept=".view" @on-success="importFileSuccess">
             <template #>
               <Button type="primary" custom-icon="fa fa-cloud-upload-alt" size="small">{{ $t('Front_Btn_Import') }}</Button>
             </template>

package/src/styles/css/default.css

@@ -242,20 +242,17 @@
   display: inline-table;
 }
 
-.filter button + button {
+.filter button + button,
+.filter button + .ivu-dropdown,
+.filter button + .ivu-upload,
+.filter .ivu-upload + .ivu-upload,
+.filter .ivu-upload + .ivu-dropdown,
+.filter .ivu-upload + button,
+.filter .ivu-dropdown + button {
   margin-left: 4px;
   margin-bottom: 0;
 }
 
-.filter .ivu-upload {
-  margin-left: 2px !important;
-  margin-right: 2px !important;
-}
-
-.ivu-dropdown {
-  margin-right: 4px;
-}
-
 /* 表格内部按钮 */
 .ivu-table-cell button + button {
   margin-left: 4px;