mooho-base-admin-plus 0.4.11 → 0.4.12

package/package.json

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

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

@@ -80,7 +80,7 @@
             @slot 页脚
           -->
           <slot name="footer">
-            <Button type="primary" custom-icon="fa fa-save" v-if="canSave() && saveEnable" @click="onSave">{{ $t('Front_Btn_Save') }}</Button>
+            <Button type="primary" custom-icon="fa fa-save" v-if="canSave() && saveEnable && !formView.editEnable" @click="onSave">{{ $t('Front_Btn_Save') }}</Button>
           </slot>
           <Button type="default" custom-icon="fa fa-times" @click="clickClose">{{ $t('Front_Btn_Close') }}</Button>
           <Button type="error" :title="$t('Front_Btn_Setting')" custom-icon="fa fa-cog" v-if="settingEnable && allow('permission/formView')" @click="settingOpen"></Button>

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

@@ -447,8 +447,8 @@
       <table-setting ref="tableSetting" v-if="tableSettingActive" :is-setting="true" @on-change="viewCode => init(viewCode)" />
       <filter-setting ref="filterSetting" v-if="filterSettingActive" @on-change="viewCode => init(viewCode)" />
       <item-select ref="itemSelect" v-if="itemSelectActive" @save="saveItemSelect"></item-select>
-      <modal-table ref="modalTable" v-if="inited"></modal-table>
-      <modal-form ref="modalForm" :saveEnable="false" v-if="inited"></modal-form>
+      <modal-table ref="modalTable" v-if="inited" @create="$refs.modalForm.openDefault(commandButtonParams)" @edit="({ row, index }) => $refs.modalForm.open(row)"></modal-table>
+      <modal-form ref="modalForm" v-if="inited" @on-after-save="$refs.modalTable.loadData()"></modal-form>
       <modal-table ref="batchEditTable" :embedded="true" :static="true" :footerEnable="true" v-if="inited">
         <template #footer>
           <Button type="primary" custom-icon="fa fa-save" @click="batchSave()">{{ $t('Front_Btn_Save') }}</Button>
@@ -567,7 +567,8 @@
         commandButtons: [],
         preview: false,
         imageUrl: null,
-        isFullScreen: false
+        isFullScreen: false,
+        commandButtonParams: null
       };
     },
     async created() {
@@ -2164,22 +2165,26 @@
         if (commandButton.viewType == 'TableView') {
           // 打开表格
           this.$refs.modalTable.init(commandButton.viewCode, async () => {
-            let params = {};
+            if (!!(commandButton.formViewCode || '').trim()) {
+              this.$refs.modalForm.init(commandButton.formViewCode);
+            }
+
+            this.commandButtonParams = {};
 
             if (!!(commandButton.params || '').trim()) {
               let commandButtonParams = JSON.parse(commandButton.params);
 
               for (let i = 0; i < commandButtonParams.length; i++) {
                 let value = this.parseData(row, commandButtonParams[i].value);
-                params[commandButtonParams[i].param] = value;
+                this.commandButtonParams[commandButtonParams[i].param] = value;
               }
             }
 
-            this.$refs.modalTable.open(params);
+            this.$refs.modalTable.open(this.commandButtonParams);
           });
         } else {
           // 打开表单
-          this.$refs.modalForm.init(commandButton.viewCode, async () => {
+          this.$refs.modalForm.init(commandButton.formViewCode, async () => {
             this.$refs.modalForm.open(row);
           });
         }