mooho-base-admin-plus 0.4.12 → 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.12",
+  "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-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/view-table.vue

@@ -772,6 +772,12 @@
        */
       pageSizeOpts: {
         type: Array
+      },
+      /**
+       * 合并单元格的配置
+       */
+      spanMethod: {
+        type: Function
       }
     },
     computed: {
@@ -2195,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);