mooho-base-admin-plus 0.4.9 → 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.9",
+  "version": "0.4.12",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "dotnetVersion": "1.4.0",
   "license": "MIT",

package/src/components/view/condition-edit.vue

@@ -71,7 +71,7 @@
           expression: {
             type: 'string',
             required: true,
-            message: this.tParam('Front_Msg_Please_Input|' + this.$t('Front_Label_Expression')),
+            message: this.$t('Front_Msg_Please_Input'),
             trigger: 'blur,change'
           }
         }

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/table-setting.vue

@@ -24,8 +24,9 @@
         </div>
         <div v-if="code == 'sorting'">
           <Input type="text" :readonly="true" v-model="sort" @click="$refs.modal_sort.open()">
-            <template #prepend></template>
-            <Button custom-icon="fa fa-edit" @click="$refs.modal_sort.open()"></Button>
+            <template #prepend>
+              <Button custom-icon="fa fa-edit" @click="$refs.modal_sort.open()"></Button>
+            </template>
           </Input>
         </div>
         <div v-if="code == 'filtering'">

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

@@ -589,7 +589,7 @@
       },
       // 获取数据源
       getDataSource(data, column) {
-        if (column.dataType && column.dataType.indexOf('Enum:') === 0) {
+        if (!column.isStaticItem && column.dataType.indexOf('Enum:') === 0) {
           // 枚举
           return this.getEnumList(column.dataType.split(':')[1]);
         } else {

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

@@ -830,14 +830,14 @@
             rules.push({
               pattern: /.+/,
               required: true,
-              message: this.tParam('Front_Msg_Please_Input|' + this.getNameI18n(column)),
+              message: this.$t('Front_Msg_Please_Input'),
               trigger: this.getTrigger(column)
             });
           } else {
             rules.push({
               type: this.getDataType(column),
               required: true,
-              message: this.tParam('Front_Msg_Please_Input|' + this.getNameI18n(column)),
+              message: this.$t('Front_Msg_Please_Input'),
               trigger: this.getTrigger(column)
             });
           }
@@ -847,7 +847,7 @@
           rules.push({
             type: this.getDataType(column),
             pattern: column.pattern,
-            message: this.$t('Front_Msg_Validation_Pattern|' + this.getNameI18n(column)),
+            message: this.$t('Front_Msg_Validation_Pattern'),
             trigger: this.getTrigger(column)
           });
         }
@@ -856,7 +856,7 @@
           rules.push({
             type: this.getDataType(column),
             max: column.maxValue,
-            message: this.$t('Front_Msg_Validation_Max_Value|' + this.getNameI18n(column) + '|' + column.maxValue),
+            message: this.$t('Front_Msg_Validation_Max_Value|' + column.maxValue),
             trigger: this.getTrigger(column)
           });
         }
@@ -865,7 +865,7 @@
           rules.push({
             type: this.getDataType(column),
             min: column.minValue,
-            message: this.$t('Front_Msg_Validation_Min_Value|' + this.getNameI18n(column) + '|' + column.minValue),
+            message: this.$t('Front_Msg_Validation_Min_Value|' + column.minValue),
             trigger: this.getTrigger(column)
           });
         }
@@ -874,7 +874,7 @@
           rules.push({
             type: this.getDataType(column),
             length: column.maxLength,
-            message: this.$t('Front_Msg_Validation_Max_Length|' + this.getNameI18n(column) + '|' + column.maxLength),
+            message: this.$t('Front_Msg_Validation_Max_Length|' + column.maxLength),
             trigger: this.getTrigger(column)
           });
         }

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);
           });
         }

package/src/layouts/basic-layout/header-user/index.vue

@@ -95,19 +95,19 @@
           oldPwd: {
             type: 'string',
             required: true,
-            message: this.tParam('Front_Msg_Please_Input|' + this.$t('Front_Label_Old_Password')),
+            message: this.$t('Front_Msg_Please_Input'),
             trigger: 'blur,change'
           },
           newPwd: {
             type: 'string',
             required: true,
-            message: this.tParam('Front_Msg_Please_Input|' + this.$t('Front_Label_New_Password')),
+            message: this.$t('Front_Msg_Please_Input'),
             trigger: 'blur,change'
           },
           checkPwd: {
             type: 'string',
             required: true,
-            message: this.tParam('Front_Msg_Please_Input|' + this.$t('Front_Label_Confirm_Password')),
+            message: this.$t('Front_Msg_Please_Input'),
             trigger: 'blur,change'
           }
         }

package/src/pages/common/task-form.vue

@@ -53,7 +53,7 @@
                 prop="message"
                 :rules="{
                   required: true,
-                  message: this.tParam('Front_Msg_Please_Input|' + this.$t('Front_Label_Message_Content')),
+                  message: this.$t('Front_Msg_Please_Input'),
                   trigger: 'blur,change'
                 }"
               >

package/src/pages/system/rolePropertyEdit.vue

@@ -216,43 +216,43 @@
           propertyName: {
             type: 'string',
             required: true,
-            message: this.tParam('Front_Msg_Please_Input|' + this.$t('Front_Label_Property_Name')),
+            message: this.$t('Front_Msg_Please_Input'),
             trigger: 'blur'
           },
           propertyCode: {
             type: 'string',
             required: true,
-            message: this.tParam('Front_Msg_Please_Input|' + this.$t('Front_Label_Property_Code')),
+            message: this.$t('Front_Msg_Please_Input'),
             trigger: 'blur'
           },
           dataType: {
             type: 'string',
             required: true,
-            message: this.tParam('Front_Msg_Please_Input|' + this.$t('Front_Label_Data_Type')),
+            message: this.$t('Front_Msg_Please_Input'),
             trigger: 'blur'
           },
           controlType: {
             type: 'string',
             required: true,
-            message: this.tParam('Front_Msg_Please_Input|' + this.$t('Front_Label_Control_Type')),
+            message: this.$t('Front_Msg_Please_Input'),
             trigger: 'blur'
           },
           source: {
             type: 'string',
             required: true,
-            message: this.tParam('Front_Msg_Please_Input|' + this.$t('Front_Label_Data_Source')),
+            message: this.$t('Front_Msg_Please_Input'),
             trigger: 'blur'
           },
           sourceDataCode: {
             type: 'string',
             required: true,
-            message: this.tParam('Front_Msg_Please_Input|' + this.$t('Front_Label_Source_Data_Code')),
+            message: this.$t('Front_Msg_Please_Input'),
             trigger: 'blur'
           },
           sourceDisplayCode: {
             type: 'string',
             required: true,
-            message: this.tParam('Front_Msg_Please_Input|' + this.$t('Front_Label_Source_Display_Code')),
+            message: this.$t('Front_Msg_Please_Input'),
             trigger: 'blur'
           }
         };
@@ -269,13 +269,13 @@
           code: {
             type: 'string',
             required: true,
-            message: this.tParam('Front_Msg_Please_Input|' + this.$t('Front_Label_Source_Display_Code')),
+            message: this.$t('Front_Msg_Please_Input'),
             trigger: 'blur,change'
           },
           val: {
             type: 'string',
             required: true,
-            message: this.tParam('Front_Msg_Please_Input|' + this.$t('Front_Label_Value')),
+            message: this.$t('Front_Msg_Please_Input'),
             trigger: 'blur,change'
           }
         };

package/src/pages/template/processPage.vue

@@ -94,7 +94,7 @@
                 prop="message"
                 :rules="{
                   required: true,
-                  message: this.tParam('Front_Msg_Please_Input|' + this.$t('Front_Label_Message_Content')),
+                  message: this.$t('Front_Msg_Please_Input'),
                   trigger: 'blur,change'
                 }"
               >