mooho-base-admin-plus 2.10.60 → 2.10.61

package/package.json

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

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

@@ -102,14 +102,17 @@
       this.$refs.table.hotInstance.addHook('beforeOnCellMouseUp', (event, coords) => {
         this.coords = coords;
         if (event.detail === 2 && coords.row >= 0 && !this.readonly) {
-          // 双击弹出窗口
-          let column = this.hotSetting.columns[coords.col];
-          let data = this.$refs.table.hotInstance.getSourceData();
-
-          if (column.controlType === 'DialogSelect' && !column.readonly) {
-            this.$refs.dialogTable.init(column.source, () => {
-              this.$refs.dialogTable.open(this.getParam(data[coords.row], column, this.parentData));
-            });
+          let isReadonly = this.$refs.table.hotInstance.getCellMeta(coords.row, coords.col).readOnly;
+          if (!isReadonly) {
+            // 双击弹出窗口
+            let column = this.hotSetting.columns[coords.col];
+            //let data = this.$refs.table.hotInstance.getSourceData();
+
+            if (column.controlType === 'DialogSelect' && !column.readonly) {
+              this.$refs.dialogTable.init(column.source, () => {
+                this.$refs.dialogTable.open(this.getParam(this.staticData[coords.row], column, this.parentData));
+              });
+            }
           }
         }
       });
@@ -267,132 +270,122 @@
             if (!this.readonly) {
               if (item.controlType === 'Label' || item.isReadonly == true) {
                 column.readOnly = true;
-              } else if (item.controlType === 'TextInput') {
-                column.type = 'text';
-
-                if (column.isRequired) {
-                  column.validator = 'text-required';
-                }
-              } else if (item.controlType === 'NumberInput') {
-                column.type = 'numeric';
-                if (column.isRequired) {
-                  column.validator = 'numeric-required';
-                }
-                // column.validator = 'numeric';
-              } else if (item.controlType === 'Check') {
-                column.type = 'checkbox';
-              } else if (item.controlType === 'Select') {
-                column.editor = 'select';
-                if (column.isRequired) {
-                  column.validator = 'select-required';
-                }
-
-                let dataSource = [];
-
-                if (column.isStaticItem) {
-                  if (!!(column.itemData || '').trim()) {
-                    column.itemData.split(/[\n]/).forEach(item => {
-                      if (!!(item || '').trim()) {
-                        if (item.split(':').length > 1) {
-                          let key = item.split(':')[0];
-                          let value = item.split(':')[1];
-
-                          if (column.dataType == 'Integer' || column.dataType == 'BigInteger') {
-                            dataSource.push({
-                              id: parseInt(key),
-                              name: value
-                            });
-                          } else if (column.dataType == 'Decimal' || column.dataType == 'Float' || column.dataType == 'Double') {
-                            dataSource.push({
-                              id: parseFloat(key),
-                              name: value
-                            });
-                          } else if (column.dataType == 'Boolean') {
-                            dataSource.push({
-                              id: key.toUpperCase() == 'TRUE',
-                              name: value
-                            });
-                          } else {
-                            dataSource.push({
-                              id: key,
-                              name: value
-                            });
-                          }
-                        } else {
-                          if (column.dataType == 'Integer' || column.dataType == 'BigInteger') {
-                            dataSource.push({
-                              id: parseInt(item),
-                              name: item
-                            });
-                          } else if (column.dataType == 'Decimal' || column.dataType == 'Float' || column.dataType == 'Double') {
-                            dataSource.push({
-                              id: parseFloat(item),
-                              name: item
-                            });
-                          } else if (column.dataType == 'Boolean') {
-                            dataSource.push({
-                              id: item.toUpperCase() == 'TRUE',
-                              name: item
-                            });
+              } else {
+                column.validator = this.getValidator(column);
+
+                if (item.controlType === 'TextInput') {
+                  column.type = 'text';
+                } else if (item.controlType === 'NumberInput') {
+                  column.type = 'numeric';
+                } else if (item.controlType === 'Check') {
+                  column.type = 'checkbox';
+                } else if (item.controlType === 'Select') {
+                  column.editor = 'select';
+
+                  let dataSource = [];
+
+                  if (column.isStaticItem) {
+                    if (!!(column.itemData || '').trim()) {
+                      column.itemData.split(/[\n]/).forEach(item => {
+                        if (!!(item || '').trim()) {
+                          if (item.split(':').length > 1) {
+                            let key = item.split(':')[0];
+                            let value = item.split(':')[1];
+
+                            if (column.dataType == 'Integer' || column.dataType == 'BigInteger') {
+                              dataSource.push({
+                                id: parseInt(key),
+                                name: value
+                              });
+                            } else if (column.dataType == 'Decimal' || column.dataType == 'Float' || column.dataType == 'Double') {
+                              dataSource.push({
+                                id: parseFloat(key),
+                                name: value
+                              });
+                            } else if (column.dataType == 'Boolean') {
+                              dataSource.push({
+                                id: key.toUpperCase() == 'TRUE',
+                                name: value
+                              });
+                            } else {
+                              dataSource.push({
+                                id: key,
+                                name: value
+                              });
+                            }
                           } else {
-                            dataSource.push({
-                              id: item,
-                              name: item
-                            });
+                            if (column.dataType == 'Integer' || column.dataType == 'BigInteger') {
+                              dataSource.push({
+                                id: parseInt(item),
+                                name: item
+                              });
+                            } else if (column.dataType == 'Decimal' || column.dataType == 'Float' || column.dataType == 'Double') {
+                              dataSource.push({
+                                id: parseFloat(item),
+                                name: item
+                              });
+                            } else if (column.dataType == 'Boolean') {
+                              dataSource.push({
+                                id: item.toUpperCase() == 'TRUE',
+                                name: item
+                              });
+                            } else {
+                              dataSource.push({
+                                id: item,
+                                name: item
+                              });
+                            }
                           }
                         }
+                      });
+                    }
+                  } else {
+                    if (column.dataType.startsWith('Enum:')) {
+                      // 枚举
+                      dataSource = this.getEnumList(column.dataType.split(':')[1]);
+                    } else if (!!(column.source || '').trim()) {
+                      let param = this.getParam(null, column, this.parentData);
+
+                      // 选择框、单选框组
+                      this.disableLoader();
+                      let res;
+                      if (column.isSourceCustom) {
+                        res = await customModelApi.query(column.source, param); //, [column.sourceDataCode, column.sourceDisplayCode]);
+                      } else {
+                        res = await modelApi.query(column.source, param); //, [column.sourceDataCode, column.sourceDisplayCode]);
                       }
-                    });
-                  }
-                } else {
-                  if (column.dataType.startsWith('Enum:')) {
-                    // 枚举
-                    dataSource = this.getEnumList(column.dataType.split(':')[1]);
-                  } else if (!!(column.source || '').trim()) {
-                    let param = this.getParam(null, column, this.parentData);
-
-                    // 选择框、单选框组
-                    this.disableLoader();
-                    let res;
-                    if (column.isSourceCustom) {
-                      res = await customModelApi.query(column.source, param); //, [column.sourceDataCode, column.sourceDisplayCode]);
-                    } else {
-                      res = await modelApi.query(column.source, param); //, [column.sourceDataCode, column.sourceDisplayCode]);
+                      this.enableLoader();
+
+                      dataSource = res.data.map(item => {
+                        return {
+                          id: !(column.sourceDataCode || '').trim() ? item.id : this.parseData(item, column.sourceDataCode),
+                          name: this.parseData(item, column.sourceDisplayCode)
+                        };
+                      });
                     }
-                    this.enableLoader();
-
-                    dataSource = res.data.map(item => {
-                      return {
-                        id: !(column.sourceDataCode || '').trim() ? item.id : this.parseData(item, column.sourceDataCode),
-                        name: this.parseData(item, column.sourceDisplayCode)
-                      };
-                    });
                   }
-                }
 
-                column.selectOptions = dataSource.map(option => {
-                  return option.id;
-                });
-              } else if (item.controlType === 'Date') {
-                column.type = 'date';
-                if (column.isRequired) {
-                  column.validator = 'date-required';
+                  column.selectOptions = dataSource.map(option => {
+                    return option.id;
+                  });
+                } else if (item.controlType === 'Date') {
+                  column.type = 'date';
+                  column.dateFormat = 'YYYY-MM-DD';
+                  column.correctFormat = true;
+                  // column.renderer = function (instance, td, row, col, prop, value, cellProperties) {
+                  //   if (value) {
+                  //     td.innerHTML = dateFormat(new Date(value), 'yyyy-MM-dd');
+                  //     console.log(instance);
+                  //     console.log(td);
+                  //     console.log(row);
+                  //     console.log(col);
+                  //     console.log(prop);
+                  //     console.log(value);
+                  //     console.log(cellProperties);
+                  //   }
+                  //   return td;
+                  // };
                 }
-                column.dateFormat = 'YYYY-MM-DD';
-                column.correctFormat = true;
-                // column.renderer = function (instance, td, row, col, prop, value, cellProperties) {
-                //   if (value) {
-                //     td.innerHTML = dateFormat(new Date(value), 'yyyy-MM-dd');
-                //     console.log(instance);
-                //     console.log(td);
-                //     console.log(row);
-                //     console.log(col);
-                //     console.log(prop);
-                //     console.log(value);
-                //     console.log(cellProperties);
-                //   }
-                //   return td;
-                // };
               }
             }
 
@@ -662,6 +655,28 @@
           }
         });
       },
+      // 获取验证器
+      getValidator(column) {
+        if (column.controlType === 'TextInput' || column.controlType === 'Select' || column.controlType === 'DialogSelect') {
+          if (column.isRequired) {
+            return 'text-required';
+          } else {
+            return 'text';
+          }
+        } else if (column.controlType === 'NumberInput') {
+          if (column.isRequired) {
+            return 'numeric-required';
+          } else {
+            return 'numeric';
+          }
+        } else if (column.controlType === 'Date') {
+          if (column.isRequired) {
+            return 'date-required';
+          } else {
+            return 'date';
+          }
+        }
+      },
       /**
        * 加载数据
        *
@@ -851,16 +866,32 @@
           cells: (row, col, prop) => {
             let column = this.columns.find(item => item.code == prop);
 
+            let isShow = column.isShow;
+            let isReadonly = column.isReadonly;
+
             // 判断是否只读
             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]);
+                isReadonly = this.judgeCondition(setting, this.staticData[row]);
+              }
+            }
+
+            // 判断是否显示
+            if (!!(column.showJson || '').trim()) {
+              let setting = JSON.parse(column.showJson);
 
-                return { readOnly };
+              if (setting.type == 'Condition' || setting.type == 'Expression') {
+                isShow = this.judgeCondition(setting, this.staticData[row]);
               }
             }
+
+            if (!isShow) {
+              this.setData(this.staticData[row], prop, null);
+            }
+
+            return { readOnly: !isShow || isReadonly, validator: !isShow ? null : this.getValidator(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};