mooho-base-admin-plus 2.10.57 → 2.10.59

package/package.json

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

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

@@ -37,6 +37,7 @@
   import mixinPage from '../../mixins/page';
   import mixin from './mixin';
   import tableSetting from './table-setting.vue';
+  import { readonly } from 'vue';
 
   // register Handsontable's modules
   registerAllModules();
@@ -500,24 +501,62 @@
             this.hotSetting.contextMenu.items.move_up = {
               name: '整行上移',
               callback: (key, selection, clickEvent) => {
-                let index = selection[0].start.row;
+                let rows = [];
+
+                for (let item of selection) {
+                  for (let i = item.start.row; i <= item.end.row; i++) {
+                    rows.push(i);
+                  }
+                }
+
+                rows.sort(function (a, b) {
+                  return a - b; // 升序排列
+                });
+
+                rows = [...new Set(rows)]; // 去重
+
+                if (rows[rows.length - 1] - rows[0] != rows.length - 1) {
+                  this.error('只能选中连续的行执行此操作！');
+                  return;
+                }
+
+                let index = rows[0];
+
                 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.updateData(data);
+                  let moveRows = this.staticData.splice(index, rows.length);
+                  this.staticData.splice(index - 1, 0, ...moveRows);
+                  this.$refs.table.hotInstance.updateData(this.staticData);
                 }
               }
             };
             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.updateData(data);
+                let rows = [];
+
+                for (let item of selection) {
+                  for (let i = item.start.row; i <= item.end.row; i++) {
+                    rows.push(i);
+                  }
+                }
+
+                rows.sort(function (a, b) {
+                  return a - b; // 升序排列
+                });
+
+                rows = [...new Set(rows)]; // 去重
+
+                if (rows[rows.length - 1] - rows[0] != rows.length - 1) {
+                  this.error('只能选中连续的行执行此操作！');
+                  return;
+                }
+
+                let index = rows[0];
+
+                if (rows[rows.length - 1] < this.staticData.length - 1) {
+                  let moveRows = this.staticData.splice(index, rows.length);
+                  this.staticData.splice(index + 1, 0, ...moveRows);
+                  this.$refs.table.hotInstance.updateData(this.staticData);
                 }
               }
             };
@@ -528,31 +567,26 @@
             this.hotSetting.contextMenu.items.remove_row = {
               name: '整行删除',
               callback: (key, selection, clickEvent) => {
-                let delArr = [];
-                let ids = [];
-                let rows = [];
-
-                let data = this.$refs.table.hotInstance.getSourceData();
+                this.confirm('确定要删除这些行吗？', async () => {
+                  let rows = [];
 
-                for (const sels of selection) {
-                  let startRowIndex = sels.start.row;
-                  let endRowIndex = sels.end.row;
+                  for (let item of selection) {
+                    for (let i = item.start.row; i <= item.end.row; i++) {
+                      rows.push(i);
+                    }
+                  }
 
-                  delArr.push([startRowIndex, endRowIndex - startRowIndex + 1]);
+                  rows.sort(function (a, b) {
+                    return b - a; // 降序排列
+                  });
 
-                  for (let i = startRowIndex; i <= endRowIndex; i++) {
-                    rows.push(i);
-                  }
+                  rows = [...new Set(rows)]; // 去重
 
-                  for (let i = startRowIndex; i < endRowIndex; i++) {
-                    if (data[i].id) {
-                      ids.push(data[i].id);
-                    }
+                  for (let i of rows) {
+                    this.staticData.splice(i, 1);
                   }
-                }
 
-                this.confirm('确定要删除该行吗？', async () => {
-                  this.$refs.table.hotInstance.alter('remove_row', delArr);
+                  this.$refs.table.hotInstance.updateData(this.staticData);
                 });
               }
             };
@@ -561,7 +595,6 @@
 
         // 变更事件
         this.$refs.table.hotInstance.addHook('afterChange', changes => {
-          //console.log('afterChange', changes);
           if (changes) {
             changes.forEach(([row, property, oldValue, newValue]) => {
               if (!this.readonly && this.tableView.createEnable && row == this.staticData.length - 1 && (oldValue ?? '') != (newValue ?? '')) {
@@ -590,7 +623,6 @@
 
         // 粘贴事件
         this.$refs.table.hotInstance.addHook('beforePaste', (data, coords) => {
-          //console.log('beforePaste', data, coords);
           // 不含父级表头
           let columns = this.columns.filter(item => {
             return (
@@ -665,12 +697,7 @@
         //this.hotSetting.data = this.data;
 
         // 设置数据的可见性和只读属性
-        // this.data.forEach(item => {
-        //   //this.setShowStatus(item);
-
-        //   // 只读时禁止选中
-        //   item._disabled = this.readonly;
-        // });
+        this.setShowStatus();
 
         // 加载数据源
         //this.initDataSource();
@@ -770,7 +797,7 @@
       },
       // 数据变化事件
       onDataChange(data, sender, selected) {
-        //this.setShowStatus(data);
+        this.setShowStatus();
 
         //this.$forceUpdate();
 
@@ -817,6 +844,25 @@
       rowData(row, index) {
         return this.staticData[index];
       },
+      // 设置可见性和只读
+      setShowStatus() {
+        this.$refs.table.hotInstance.updateSettings({
+          cells: (row, col, prop) => {
+            let column = this.columns.find(item => item.code == prop);
+
+            // 判断是否只读
+            if (!!(column.readonlyJson || '').trim()) {
+              let setting = JSON.parse(column.readonlyJson);
+
+              if (setting.type == 'Condition' || setting.type == 'Expression') {
+                let readOnly = this.judgeCondition(setting, this.staticData[row]);
+
+                return { readOnly };
+              }
+            }
+          }
+        });
+      },
       // 获取多语言名称
       getNameI18n(column) {
         if (column) {

package/src/i18n/locale/en-US.js

@@ -1 +1 @@
-import{s as e}from"./lang.js";const t={i:{locale:"en-US",select:{placeholder:"Select",noMatch:"No matching data",loading:"Loading"},table:{noDataText:"No Data",noFilteredDataText:"No filter data",confirmFilter:"Confirm",resetFilter:"Reset",clearFilter:"All",sumText:"Sum"},datepicker:{selectDate:"Select date",selectTime:"Select time",startTime:"Start Time",endTime:"End Time",clear:"Clear",ok:"OK",datePanelLabel:"[mmmm] [yyyy]",month:"Month",month1:"January",month2:"February",month3:"March",month4:"April",month5:"May",month6:"June",month7:"July",month8:"August",month9:"September",month10:"October",month11:"November",month12:"December",year:"Year",weekStartDay:"0",weeks:{sun:"Sun",mon:"Mon",tue:"Tue",wed:"Wed",thu:"Thu",fri:"Fri",sat:"Sat"},months:{m1:"Jan",m2:"Feb",m3:"Mar",m4:"Apr",m5:"May",m6:"Jun",m7:"Jul",m8:"Aug",m9:"Sep",m10:"Oct",m11:"Nov",m12:"Dec"}},transfer:{titles:{source:"Source",target:"Target"},filterPlaceholder:"Search here",notFoundText:"Not Found"},modal:{okText:"OK",cancelText:"Cancel"},poptip:{okText:"OK",cancelText:"Cancel"},page:{prev:"Previous Page",next:"Next Page",total:"Total",item:"item",items:"items",prev5:"Previous 5 Pages",next5:"Next 5 Pages",page:"/page",goto:"Goto",p:""},rate:{star:"Star",stars:"Stars"},time:{before:" ago",after:" after",just:"just now",seconds:" seconds",minutes:" minutes",hours:" hours",days:" days"},tree:{emptyText:"No Data"}}};e(t);export{t as default};
+import{s as e}from"./lang.js";const t={i:{locale:"en-US",select:{placeholder:"Select",noMatch:"No matching data",loading:"Loading"},table:{noDataText:"No Data",noFilteredDataText:"No filter data",confirmFilter:"Confirm",resetFilter:"Reset",clearFilter:"All",sumText:"Sum"},datepicker:{selectDate:"Select date",selectTime:"Select time",startTime:"Start Time",endTime:"End Time",clear:"Clear",ok:"OK",datePanelLabel:"[mmmm] [yyyy]",month:"Month",month1:"January",month2:"February",month3:"March",month4:"April",month5:"May",month6:"June",month7:"July",month8:"August",month9:"September",month10:"October",month11:"November",month12:"December",year:"Year",weekStartDay:"0",weeks:{sun:"Sun",mon:"Mon",tue:"Tue",wed:"Wed",thu:"Thu",fri:"Fri",sat:"Sat"},months:{m1:"Jan",m2:"Feb",m3:"Mar",m4:"Apr",m5:"May",m6:"Jun",m7:"Jul",m8:"Aug",m9:"Sep",m10:"Oct",m11:"Nov",m12:"Dec"}},transfer:{titles:{source:"Source",target:"Target"},filterPlaceholder:"Search here",notFoundText:"Not Found"},modal:{okText:"OK",cancelText:"Cancel"},poptip:{okText:"OK",cancelText:"Cancel"},page:{prev:"Previous Page",next:"Next Page",total:"Total",item:"item",items:"items",prev5:"Previous 5 Pages",next5:"Next 5 Pages",page:"/page",goto:"Goto",p:""},rate:{star:"Star",stars:"Stars"},time:{before:" ago",after:" after",just:"just now",seconds:" seconds",minutes:" minutes",hours:" hours",days:" days"},tree:{emptyText:"No Data"}}};e(t);export{t as default};

package/src/i18n/locale/lang.js

@@ -1 +1 @@
-const e=typeof window!="undefined";function n(i){e&&typeof window.viewuiplus!="undefined"&&("langs"in viewuiplus||(viewuiplus.langs={}),viewuiplus.langs[i.i.locale]=i)}export{n as s};
+const e=typeof window!="undefined";function n(i){e&&typeof window.viewuiplus!="undefined"&&("langs"in viewuiplus||(viewuiplus.langs={}),viewuiplus.langs[i.i.locale]=i)}export{n as s};

package/src/i18n/locale/zh-CN.js

@@ -1 +1 @@
-import{s as e}from"./lang.js";const t={i:{locale:"zh-CN",select:{placeholder:"\u8BF7\u9009\u62E9",noMatch:"\u65E0\u5339\u914D\u6570\u636E",loading:"\u52A0\u8F7D\u4E2D"},table:{noDataText:"\u6682\u65E0\u6570\u636E",noFilteredDataText:"\u6682\u65E0\u7B5B\u9009\u7ED3\u679C",confirmFilter:"\u7B5B\u9009",resetFilter:"\u91CD\u7F6E",clearFilter:"\u5168\u90E8",sumText:"\u5408\u8BA1"},datepicker:{selectDate:"\u9009\u62E9\u65E5\u671F",selectTime:"\u9009\u62E9\u65F6\u95F4",startTime:"\u5F00\u59CB\u65F6\u95F4",endTime:"\u7ED3\u675F\u65F6\u95F4",clear:"\u6E05\u7A7A",ok:"\u786E\u5B9A",datePanelLabel:"[yyyy\u5E74] [m\u6708]",month:"\u6708",month1:"1 \u6708",month2:"2 \u6708",month3:"3 \u6708",month4:"4 \u6708",month5:"5 \u6708",month6:"6 \u6708",month7:"7 \u6708",month8:"8 \u6708",month9:"9 \u6708",month10:"10 \u6708",month11:"11 \u6708",month12:"12 \u6708",year:"\u5E74",weekStartDay:"0",weeks:{sun:"\u65E5",mon:"\u4E00",tue:"\u4E8C",wed:"\u4E09",thu:"\u56DB",fri:"\u4E94",sat:"\u516D"},months:{m1:"1\u6708",m2:"2\u6708",m3:"3\u6708",m4:"4\u6708",m5:"5\u6708",m6:"6\u6708",m7:"7\u6708",m8:"8\u6708",m9:"9\u6708",m10:"10\u6708",m11:"11\u6708",m12:"12\u6708"}},transfer:{titles:{source:"\u6E90\u5217\u8868",target:"\u76EE\u7684\u5217\u8868"},filterPlaceholder:"\u8BF7\u8F93\u5165\u641C\u7D22\u5185\u5BB9",notFoundText:"\u5217\u8868\u4E3A\u7A7A"},modal:{okText:"\u786E\u5B9A",cancelText:"\u53D6\u6D88"},poptip:{okText:"\u786E\u5B9A",cancelText:"\u53D6\u6D88"},page:{prev:"\u4E0A\u4E00\u9875",next:"\u4E0B\u4E00\u9875",total:"\u5171",item:"\u6761",items:"\u6761",prev5:"\u5411\u524D 5 \u9875",next5:"\u5411\u540E 5 \u9875",page:"\u6761/\u9875",goto:"\u8DF3\u81F3",p:"\u9875"},rate:{star:"\u661F",stars:"\u661F"},time:{before:"\u524D",after:"\u540E",just:"\u521A\u521A",seconds:"\u79D2",minutes:"\u5206\u949F",hours:"\u5C0F\u65F6",days:"\u5929"},tree:{emptyText:"\u6682\u65E0\u6570\u636E"}}};e(t);export{t as default};
+import{s as e}from"./lang.js";const t={i:{locale:"zh-CN",select:{placeholder:"\u8BF7\u9009\u62E9",noMatch:"\u65E0\u5339\u914D\u6570\u636E",loading:"\u52A0\u8F7D\u4E2D"},table:{noDataText:"\u6682\u65E0\u6570\u636E",noFilteredDataText:"\u6682\u65E0\u7B5B\u9009\u7ED3\u679C",confirmFilter:"\u7B5B\u9009",resetFilter:"\u91CD\u7F6E",clearFilter:"\u5168\u90E8",sumText:"\u5408\u8BA1"},datepicker:{selectDate:"\u9009\u62E9\u65E5\u671F",selectTime:"\u9009\u62E9\u65F6\u95F4",startTime:"\u5F00\u59CB\u65F6\u95F4",endTime:"\u7ED3\u675F\u65F6\u95F4",clear:"\u6E05\u7A7A",ok:"\u786E\u5B9A",datePanelLabel:"[yyyy\u5E74] [m\u6708]",month:"\u6708",month1:"1 \u6708",month2:"2 \u6708",month3:"3 \u6708",month4:"4 \u6708",month5:"5 \u6708",month6:"6 \u6708",month7:"7 \u6708",month8:"8 \u6708",month9:"9 \u6708",month10:"10 \u6708",month11:"11 \u6708",month12:"12 \u6708",year:"\u5E74",weekStartDay:"0",weeks:{sun:"\u65E5",mon:"\u4E00",tue:"\u4E8C",wed:"\u4E09",thu:"\u56DB",fri:"\u4E94",sat:"\u516D"},months:{m1:"1\u6708",m2:"2\u6708",m3:"3\u6708",m4:"4\u6708",m5:"5\u6708",m6:"6\u6708",m7:"7\u6708",m8:"8\u6708",m9:"9\u6708",m10:"10\u6708",m11:"11\u6708",m12:"12\u6708"}},transfer:{titles:{source:"\u6E90\u5217\u8868",target:"\u76EE\u7684\u5217\u8868"},filterPlaceholder:"\u8BF7\u8F93\u5165\u641C\u7D22\u5185\u5BB9",notFoundText:"\u5217\u8868\u4E3A\u7A7A"},modal:{okText:"\u786E\u5B9A",cancelText:"\u53D6\u6D88"},poptip:{okText:"\u786E\u5B9A",cancelText:"\u53D6\u6D88"},page:{prev:"\u4E0A\u4E00\u9875",next:"\u4E0B\u4E00\u9875",total:"\u5171",item:"\u6761",items:"\u6761",prev5:"\u5411\u524D 5 \u9875",next5:"\u5411\u540E 5 \u9875",page:"\u6761/\u9875",goto:"\u8DF3\u81F3",p:"\u9875"},rate:{star:"\u661F",stars:"\u661F"},time:{before:"\u524D",after:"\u540E",just:"\u521A\u521A",seconds:"\u79D2",minutes:"\u5206\u949F",hours:"\u5C0F\u65F6",days:"\u5929"},tree:{emptyText:"\u6682\u65E0\u6570\u636E"}}};e(t);export{t as default};