mooho-base-admin-plus 2.10.34 → 2.10.35

package/package.json

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

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

@@ -368,7 +368,7 @@
                 />
               </FormItem>
             </Col>
-            <Col v-bind="grid8" v-if="viewType == 'TableView' && data.controlType == 'Label'">
+            <Col v-bind="grid8" v-if="viewType == 'TableView'">
               <FormItem label="固定在最前" key="isFixed" prop="isFixed">
                 <Switch
                   :model-value="!!data.isFixed"

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

@@ -60,7 +60,15 @@
           autoWrapCol: true,
           autoWrapRow: true,
           manualColumnResize: true,
-          minSpareRows: 1,
+          // columnSummary: [
+          //   {
+          //     sourceColumn: 2,
+          //     type: 'sum',
+          //     destinationRow: 3,
+          //     destinationColumn: 2
+          //   }
+          // ],
+          // minSpareRows: 1,
           contextMenu: {
             items: {
               row_above: {
@@ -291,7 +299,7 @@
           view.viewColumns.map(async item => {
             let column = {
               ...item,
-              title: item.name,
+              title: item.isRequired ? item.name + '<font style="color: red">*</font>' : item.name,
               data: item.code,
               width: item.controlWidth || 80,
               className: item.align ? item.align.toLowerCase() : 'htCenter',
@@ -421,7 +429,15 @@
           })
         );
 
-        console.log('this.columns', this.columns);
+        this.columns = this.columns
+          .filter(item => {
+            return item.isFixed == true;
+          })
+          .concat(
+            this.columns.filter(item => {
+              return item.isFixed != true;
+            })
+          );
 
         // .filter(item => {
         //   return !(item.parentCode || '').trim();
@@ -430,13 +446,60 @@
         //   return getColumns(view, item, this.static);
         // });
 
-        this.hotSetting.columns = this.columns;
-
-        this.columns.forEach(column => {
-          //column.name = this.getNameI18n(column) + (column.isRequired ? ' <font color="red">*</font>' : '');
-          //column.fixed = column.isFixed ? 'left' : null;
+        this.hotSetting.columns = this.columns.filter(item => {
+          return (
+            !!(item.parentCode || '').trim() ||
+            this.columns.filter(i => {
+              return i.parentCode == item.code;
+            }).length == 0
+          );
         });
 
+        this.hotSetting.fixedColumnsStart = this.columns.filter(item => {
+          return item.isFixed == true;
+        }).length;
+
+        if (
+          this.columns.filter(item => {
+            return !!(item.parentCode || '').trim();
+          }).length > 0
+        ) {
+          let lv1 = this.columns
+            .filter(item => {
+              return !(item.parentCode || '').trim();
+            })
+            .map(item => {
+              return {
+                label: item.title,
+                colspan:
+                  this.columns.filter(i => {
+                    return i.parentCode == item.code;
+                  }).length == 0
+                    ? 1
+                    : this.columns.filter(i => {
+                        return i.parentCode == item.code;
+                      }).length
+              };
+            });
+
+          let lv2 = this.columns
+            .filter(item => {
+              return (
+                !!(item.parentCode || '').trim() ||
+                this.columns.filter(i => {
+                  return i.parentCode == item.code;
+                }).length == 0
+              );
+            })
+            .map(item => {
+              return {
+                label: !!(item.parentCode || '').trim() ? item.title : ''
+              };
+            });
+
+          this.hotSetting.nestedHeaders = [lv1, lv2];
+        }
+
         // this.columns.unshift({
         //   tree: true,
         //   display: 'inline',
@@ -453,6 +516,22 @@
         //   });
         // }
 
+        this.$refs.table.hotInstance.addHook('afterChange', changes => {
+          if (changes) {
+            changes.forEach(([row, property, oldValue, newValue]) => {
+              if (row == this.data.length - 1 && (oldValue ?? '') != (newValue ?? '')) {
+                this.data.push(this.getDefaultData());
+                this.$refs.table.hotInstance.loadData(this.data);
+              }
+
+              this.onDataChange(
+                this.data[row],
+                this.columns.find(item => item.code == property)
+              );
+            });
+          }
+        });
+
         this.inited = true;
 
         setTimeout(() => {
@@ -490,6 +569,8 @@
 
         this.data = this.staticData;
 
+        this.data.push(this.getDefaultData());
+
         //this.hotSetting.data = this.data;
 
         this.$refs.table.hotInstance.loadData(this.data);
@@ -498,8 +579,6 @@
           this.$refs.table.hotInstance.render();
         });
 
-        console.log('this.data', this.data);
-
         // 设置数据的可见性和只读属性
         this.data.forEach(item => {
           //this.setShowStatus(item);
@@ -618,52 +697,6 @@
 
         return data;
       },
-      onSelectDataChange(data, sender, selected) {
-        let code;
-        if (sender.code.endsWith('ID')) {
-          code = sender.code.substr(0, sender.code.length - 2);
-        }
-
-        let model = null;
-
-        if (typeof selected == 'object') {
-          if (selected instanceof Array) {
-            model = [];
-
-            for (let item of selected) {
-              if (typeof item == 'object') {
-                model.push(item);
-              } else {
-                if (data._rawData && data._rawData[sender.code]) {
-                  model.push(
-                    data._rawData[sender.code].find(rawData => {
-                      return this.parseData(rawData, sender.sourceDataCode) == item;
-                    })
-                  );
-                } else {
-                  model.push(item);
-                }
-              }
-            }
-          } else {
-            model = selected;
-          }
-        } else {
-          if (data._rawData && data._rawData[sender.code]) {
-            model = data._rawData[sender.code].find(rawData => {
-              return this.parseData(rawData, sender.sourceDataCode) == selected;
-            });
-          } else {
-            model = selected;
-          }
-        }
-
-        if (code) {
-          this.setData(data, code, model);
-        }
-
-        this.onDataChange(data, sender, model);
-      },
       // 数据变化事件
       onDataChange(data, sender, selected) {
         //this.setShowStatus(data);
@@ -680,25 +713,6 @@
          * @property {object} selected 选中对象（弹出选择框等有效）
          */
         this.$emit('on-change', data, sender, selected);
-
-        // 计算需要刷新的字段
-        if (sender == null || sender.triggers !== []) {
-          this.columns.forEach(function (column) {
-            if (
-              !column.isStaticItem &&
-              !!(column.source || '').trim() &&
-              !(column.dataType && column.dataType.startsWith('Enum:')) &&
-              (sender == null ||
-                sender.triggers.some(item => {
-                  return item.code == column.code;
-                }))
-            ) {
-              if (data._needRefresh) {
-                data._needRefresh[column.code] = true;
-              }
-            }
-          });
-        }
       },
       // 公式计算
       calc(data, sender) {

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