mooho-base-admin-plus 2.10.41 → 2.10.43

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.10.41",
+  "version": "2.10.43",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

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

@@ -90,14 +90,14 @@
                 :parent-data="data"
                 @on-change="(row, sender, selected) => onDataChange(column, null, row, sender, selected)"
               >
-                <template #filterCommand>
+                <template #top>
                   <!--
                       @slot 内嵌表格筛选栏按钮
                       @binding {object} table 表格对象
                       @binding {object} tableColumn 表格列对象
                       @binding {string} tableCode 表格列代码
                   -->
-                  <slot name="excelTableFilterCommand" :tableColumn="column" :tableCode="column.code"></slot>
+                  <slot name="excelTableTop" :tableColumn="column" :tableCode="column.code"></slot>
                 </template>
               </view-table-excel>
             </div>

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

@@ -60,6 +60,7 @@
           autoWrapCol: true,
           autoWrapRow: true,
           manualColumnResize: true,
+          readOnly: this.readonly,
           // columnSummary: [
           //   {
           //     sourceColumn: 2,
@@ -69,7 +70,7 @@
           //   }
           // ],
           // minSpareRows: 1,
-          contextMenu: { items: {} },
+          contextMenu: this.readonly ? false : { items: {} },
           licenseKey: 'non-commercial-and-evaluation'
         },
         coords: {},
@@ -221,9 +222,7 @@
               controlType: item.controlType
             };
 
-            if (this.readonly) {
-              column.readOnly = true;
-            } else {
+            if (!this.readonly) {
               if (item.controlType === 'Label' || item.isReadonly == true) {
                 column.readOnly = true;
               } else if (item.controlType === 'NumberInput') {
@@ -433,85 +432,87 @@
         //   });
         // }
 
-        // 右键菜单 新增
-        if (this.tableView.createEnable) {
-          this.hotSetting.contextMenu.items.row_above = { name: '上方插入行' };
-          this.hotSetting.contextMenu.items.row_below = { name: '下方插入行' };
-          this.hotSetting.contextMenu.items.separator1 = ContextMenu.SEPARATOR;
-        }
+        if (!this.readonly) {
+          // 右键菜单 新增
+          if (this.tableView.createEnable) {
+            this.hotSetting.contextMenu.items.row_above = { name: '上方插入行' };
+            this.hotSetting.contextMenu.items.row_below = { name: '下方插入行' };
+            this.hotSetting.contextMenu.items.separator1 = ContextMenu.SEPARATOR;
+          }
 
-        // 右键菜单 调整
-        if (this.tableView.adjustEnable) {
-          this.hotSetting.contextMenu.items.move_up = {
-            name: '整行上移',
-            callback: (key, selection, clickEvent) => {
-              let index = selection[0].start.row;
-              if (index > 0) {
-                let data = this.$refs.table.hotInstance.getSourceData();
-                let delRows = data.splice(index, 1);
-                data.splice(index - 1, 0, delRows[0]);
-                this.$refs.table.hotInstance.loadData(data);
+          // 右键菜单 调整
+          if (this.tableView.adjustEnable) {
+            this.hotSetting.contextMenu.items.move_up = {
+              name: '整行上移',
+              callback: (key, selection, clickEvent) => {
+                let index = selection[0].start.row;
+                if (index > 0) {
+                  let data = this.$refs.table.hotInstance.getSourceData();
+                  let delRows = data.splice(index, 1);
+                  data.splice(index - 1, 0, delRows[0]);
+                  this.$refs.table.hotInstance.loadData(data);
+                }
               }
-            }
-          };
-          this.hotSetting.contextMenu.items.move_down = {
-            name: '整行下移',
-            callback: (key, selection, clickEvent) => {
-              let index = selection[0].start.row;
-              let data = this.$refs.table.hotInstance.getSourceData();
-              if (index < data.length - 1) {
-                let delRows = data.splice(index, 1);
-                data.splice(index + 1, 0, delRows[0]);
-                this.$refs.table.hotInstance.loadData(data);
+            };
+            this.hotSetting.contextMenu.items.move_down = {
+              name: '整行下移',
+              callback: (key, selection, clickEvent) => {
+                let index = selection[0].start.row;
+                let data = this.$refs.table.hotInstance.getSourceData();
+                if (index < data.length - 1) {
+                  let delRows = data.splice(index, 1);
+                  data.splice(index + 1, 0, delRows[0]);
+                  this.$refs.table.hotInstance.loadData(data);
+                }
               }
-            }
-          };
-        }
+            };
+          }
 
-        // 右键菜单 删除
-        if (this.tableView.removeEnable) {
-          this.hotSetting.contextMenu.items.remove_row = {
-            name: '整行删除',
-            callback: (key, selection, clickEvent) => {
-              let delArr = [];
-              let ids = [];
-              let rows = [];
+          // 右键菜单 删除
+          if (this.tableView.removeEnable) {
+            this.hotSetting.contextMenu.items.remove_row = {
+              name: '整行删除',
+              callback: (key, selection, clickEvent) => {
+                let delArr = [];
+                let ids = [];
+                let rows = [];
 
-              let data = this.$refs.table.hotInstance.getSourceData();
+                let data = this.$refs.table.hotInstance.getSourceData();
 
-              for (const sels of selection) {
-                let startRowIndex = sels.start.row;
-                let endRowIndex = sels.end.row;
+                for (const sels of selection) {
+                  let startRowIndex = sels.start.row;
+                  let endRowIndex = sels.end.row;
 
-                delArr.push([startRowIndex, endRowIndex - startRowIndex + 1]);
+                  delArr.push([startRowIndex, endRowIndex - startRowIndex + 1]);
 
-                for (let i = startRowIndex; i <= endRowIndex; i++) {
-                  rows.push(i);
-                }
+                  for (let i = startRowIndex; i <= endRowIndex; i++) {
+                    rows.push(i);
+                  }
 
-                for (let i = startRowIndex; i < endRowIndex; i++) {
-                  if (data[i].id) {
-                    ids.push(data[i].id);
+                  for (let i = startRowIndex; i < endRowIndex; i++) {
+                    if (data[i].id) {
+                      ids.push(data[i].id);
+                    }
                   }
                 }
-              }
-
-              this.confirm('确定要删除该行吗？', async () => {
-                // if (ids.length > 0) {
-                //     await modelApi.delete(this.viewCode, ids);
-                // }
-                let b = true;
 
-                this.$emit('on-remove', rows, val => {
-                  b = val;
+                this.confirm('确定要删除该行吗？', async () => {
+                  // if (ids.length > 0) {
+                  //     await modelApi.delete(this.viewCode, ids);
+                  // }
+                  let b = true;
+
+                  this.$emit('on-remove', rows, val => {
+                    b = val;
+                  });
+                  console.log(b);
+                  if (b) {
+                    this.$refs.table.hotInstance.alter('remove_row', delArr);
+                  }
                 });
-                console.log(b);
-                if (b) {
-                  this.$refs.table.hotInstance.alter('remove_row', delArr);
-                }
-              });
-            }
-          };
+              }
+            };
+          }
         }
 
         // 变更事件
@@ -633,14 +634,8 @@
             let column = this.columns[j];
             let value = this.parseData(row, column.code);
 
-            if (column.slot != 'normal') {
-              continue;
-            }
-
             // 不显示的不验证
-            if (row._isShow && row._isShow[column.code] == false) {
-              continue;
-            } else if (column.isShow == false) {
+            if (column.isShow == false) {
               continue;
             }