mooho-base-admin-plus 0.4.10 → 0.4.13

package/package.json

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

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

@@ -2,10 +2,10 @@
   <div>
     <modal-table ref="table" :static="true" :setting-enable="false" :footer-enable="true" :draggable="true" :sticky="true" @on-drag-drop="dragDrop" v-if="active">
       <template #command="{ row, index }">
-        <Button size="small" :title="$('Front_Btn_Edit')" type="primary" ghost custom-icon="fa fa-edit" @click="edit(row, index)"></Button>
-        <Button size="small" :title="$('Front_Btn_Up')" type="primary" ghost custom-icon="fa fa-chevron-up" @click="up(row, index)"></Button>
-        <Button size="small" :title="$('Front_Btn_Down')" type="primary" ghost custom-icon="fa fa-chevron-down" @click="down(row, index)"></Button>
-        <Button size="small" :title="$('Front_Btn_Remove')" type="primary" ghost custom-icon="fa fa-times" @click="remove(row, index)"></Button>
+        <Button size="small" :title="$t('Front_Btn_Edit')" type="primary" ghost custom-icon="fa fa-edit" @click="edit(row, index)"></Button>
+        <Button size="small" :title="$t('Front_Btn_Up')" type="primary" ghost custom-icon="fa fa-chevron-up" @click="up(row, index)"></Button>
+        <Button size="small" :title="$t('Front_Btn_Down')" type="primary" ghost custom-icon="fa fa-chevron-down" @click="down(row, index)"></Button>
+        <Button size="small" :title="$t('Front_Btn_Remove')" type="primary" ghost custom-icon="fa fa-times" @click="remove(row, index)"></Button>
       </template>
       <template #footer>
         <Button type="primary" ghost custom-icon="fa fa-eye" @click="layoutMode">{{ $t('Front_Btn_Preview_Mode') }}</Button>

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

@@ -46,6 +46,7 @@
         :on-search="onSearch"
         :summary-method="summaryMethod"
         :page-size-opts="pageSizeOpts"
+        :span-method="spanMethod"
         @create="create"
         @edit="edit"
         @on-ready="onReady"
@@ -305,6 +306,12 @@
        */
       beforeClose: {
         type: Function
+      },
+      /**
+       * 合并单元格的配置
+       */
+      spanMethod: {
+        type: Function
       }
     },
     computed: {

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-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() {
@@ -771,6 +772,12 @@
        */
       pageSizeOpts: {
         type: Array
+      },
+      /**
+       * 合并单元格的配置
+       */
+      spanMethod: {
+        type: Function
       }
     },
     computed: {
@@ -2164,22 +2171,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);
           });
         }
@@ -2190,7 +2201,11 @@
         this.preview = true;
       },
       // 合并单元格方法
-      handleSpan({ row, column, rowIndex }) {
+      handleSpan({ row, column, rowIndex, columnIndex }) {
+        if (this.spanMethod != null) {
+          return this.spanMethod(row, column, rowIndex, columnIndex);
+        }
+
         if (column.mergeSame) {
           if (rowIndex != 0 && this.parseData(row, column.code) == this.parseData(this.data[rowIndex - 1], column.code)) {
             return [0, 0];

package/src/mixins/page.js

@@ -521,7 +521,9 @@ export default {
           } else if (operator == 'LessThanOrEqual') {
             result = data <= value;
           } else if (operator == 'NotEqual') {
-            result = String(data) != value;
+            result = value.split(',').every(item => {
+              return String(data) != item;
+            });
           }
 
           if (!result) {

package/src/pages/system/apiLog.vue

@@ -6,8 +6,8 @@
     <Card :bordered="false" dis-hover class="ivu-mt">
       <view-table ref="table" view-code="ApiLog">
         <template #command="{ row }">
-          <Button size="small" :title="$('Front_Btn_Request')" type="info" custom-icon="fa fa-cloud-upload-alt" @click="openRequest(row)"></Button>
-          <Button size="small" :title="$('Front_Btn_Response')" type="info" custom-icon="fa fa-cloud-download-alt" @click="openResponse(row)"></Button>
+          <Button size="small" :title="$t('Front_Btn_Request')" type="info" custom-icon="fa fa-cloud-upload-alt" @click="openRequest(row)"></Button>
+          <Button size="small" :title="$t('Front_Btn_Response')" type="info" custom-icon="fa fa-cloud-download-alt" @click="openResponse(row)"></Button>
         </template>
       </view-table>
     </Card>

package/src/pages/system/formView.vue

@@ -104,7 +104,7 @@
       copy() {
         this.confirmInput(
           'Front_Msg_Sure_To_Copy_Create_View',
-          'Front_Label_View_Code',
+          this.$t('Front_Label_View_Code'),
           async () => {
             let dataView = await dataViewApi.copy(this.$refs.form.data.id, this.newCode);
             this.$refs.form.open(dataView);