mooho-base-admin-plus 2.10.80 → 2.10.82

package/package.json

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

package/src/App.vue

@@ -2,6 +2,17 @@
   <div id="app">
     <router-view />
     <loader />
+    <modal-table ref="multiDialogTable" :autoLoad="false" :select-enable="true" :check-cross-page="true" :footer-enable="true">
+      <template #footer>
+        <Button type="primary" custom-icon="fa fa-save" @click="multiSave">{{ $t('Front_Btn_OK') }}</Button>
+        <Button type="default" custom-icon="fa fa-times" @click="$refs.dialogTable.close()">{{ $t('Front_Btn_Close') }}</Button>
+      </template>
+    </modal-table>
+    <modal-table ref="dialogTable" :autoLoad="false" :check-cross-page="true" @on-row-dblclick="dialogTableRowDblclick">
+      <template #command="{ row }">
+        <Button size="small" type="primary" custom-icon="fa fa-check" @click="dialogCheck(row)">{{ $t('Front_Btn_Select') }}</Button>
+      </template>
+    </modal-table>
   </div>
 </template>
 <script>
@@ -17,6 +28,12 @@
   export default {
     name: 'app',
     components: { loader },
+    data() {
+      return {
+        dialogCheck: null,
+        multiSave: null
+      };
+    },
     computed: {},
     methods: {
       ...mapMutations('admin/layout', ['setDevice', 'setBodyHeight']),
@@ -37,6 +54,20 @@
       },
       handleSetBodyHeight() {
         this.setBodyHeight(document.body.offsetHeight);
+      },
+      // 打开多选表格
+      openMultiDialogTable(param, multiSave) {
+        this.multiSave = multiSave;
+        this.$refs.multiDialogTable.open(param);
+      },
+      // 打开单选表格
+      openDialogTable(param, dialogCheck) {
+        this.dialogCheck = dialogCheck;
+        this.$refs.dialogTable.open(param);
+      },
+      // 双击行选中
+      dialogTableRowDblclick(row) {
+        this.dialogCheck(row);
       }
     },
     mounted() {

package/src/components/input/dialog-select.vue

@@ -14,23 +14,6 @@
         <Button :size="size" custom-icon="fa fa-search" @click="dialogSelectOpen()"></Button>
       </template>
     </Input>
-    <modal-table
-      ref="dialogTable"
-      :view-code="source"
-      :autoLoad="false"
-      :select-enable="multi"
-      :check-cross-page="true"
-      :footer-enable="multi"
-      @on-row-dblclick="dialogTableRowDblclick"
-    >
-      <template #command="{ row }">
-        <Button size="small" v-if="!multi" type="primary" custom-icon="fa fa-check" @click="dialogCheck(row)">{{ $t('Front_Btn_Select') }}</Button>
-      </template>
-      <template #footer>
-        <Button type="primary" custom-icon="fa fa-save" @click="multiSave">{{ $t('Front_Btn_OK') }}</Button>
-        <Button type="default" custom-icon="fa fa-times" @click="close()">{{ $t('Front_Btn_Close') }}</Button>
-      </template>
-    </modal-table>
   </div>
 </template>
 <script>
@@ -49,7 +32,8 @@
       return {
         //changed: false,
         selected: null,
-        selectedData: null
+        selectedData: null,
+        dialogTable: null
       };
     },
     props: {
@@ -59,6 +43,18 @@
       modelValue: {
         type: String
       },
+      /**
+       * 原始数据
+       */
+      rawData: {
+        type: Object
+      },
+      /**
+       * 字段代码
+       */
+      columnCode: {
+        type: Object
+      },
       /**
        * 数据源
        */
@@ -188,6 +184,17 @@
             }
           });
         } else {
+          if (this.rawData && this.columnCode.endsWith('ID')) {
+            let selected = this.parseData(this.rawData, this.columnCode.substring(0, this.columnCode.length - 2));
+
+            if (selected != null) {
+              this.selected = this.parseData(selected, this.sourceDisplayCode);
+              this.selectedData = selected;
+
+              return;
+            }
+          }
+
           let filter = {
             page: 1,
             per: 1
@@ -225,33 +232,66 @@
       },
       // 弹出选择框
       dialogSelectOpen() {
-        if (!this.readonly && this.source) {
-          // if (this.param) {
-          //   // 参数完整
-          //   this.loadDataEnable = true;
-          // } else {
-          //   // 参数不完整
-          //   this.loadDataEnable = false;
-          // }
-
-          //this.$refs.dialogTable.loadData();
-
-          setTimeout(async () => {
-            for (let key in this.$refs.dialogTable.filterData) {
-              delete this.$refs.dialogTable.filterData[key];
-            }
+        let that = this.$parent;
 
-            if (this.multi) {
-              if (this.selectedData != null) {
-                this.$refs.dialogTable.setSelected(this.selectedData);
+        while (that.$parent != null) {
+          if (that.$refs['dialogTable'] != null) {
+            break;
+          } else {
+            that = that.$parent;
+          }
+        }
+
+        if (this.multi) {
+          this.dialogTable = that.$refs.multiDialogTable;
+        } else {
+          this.dialogTable = that.$refs.dialogTable;
+        }
+
+        this.dialogTable.init(this.source, () => {
+          if (!this.readonly && this.source) {
+            // if (this.param) {
+            //   // 参数完整
+            //   this.loadDataEnable = true;
+            // } else {
+            //   // 参数不完整
+            //   this.loadDataEnable = false;
+            // }
+
+            //this.$refs.dialogTable.loadData();
+
+            setTimeout(async () => {
+              for (let key in this.dialogTable.filterData) {
+                delete this.dialogTable.filterData[key];
+              }
+
+              if (this.multi) {
+                if (this.selectedData != null) {
+                  this.dialogTable.setSelected(this.selectedData);
+                } else {
+                  this.dialogTable.setSelected([]);
+                }
+
+                that.openMultiDialogTable(this.param, this.multiSave);
               } else {
-                this.$refs.dialogTable.setSelected([]);
+                that.openDialogTable(this.param, this.dialogCheck);
               }
-            }
+            });
+          }
+        });
+      },
 
-            this.$refs.dialogTable.open(this.param);
-          });
-        }
+      // 弹出选择框移除内容
+      dialogSelectRemove() {
+        /**
+         * 拖动完成事件
+         * @property {object} args { index1 来源行序号, index2 目标行序号 }
+         */
+        this.$emit('update:modelValue', null);
+        this.selected = null;
+        this.selectedData = null;
+
+        this.$emit('on-change');
       },
       // 弹出选择框选中
       dialogCheck(row) {
@@ -272,23 +312,11 @@
          */
         this.$emit('on-change', row);
 
-        this.$refs.dialogTable.close();
-      },
-      // 弹出选择框移除内容
-      dialogSelectRemove() {
-        /**
-         * 拖动完成事件
-         * @property {object} args { index1 来源行序号, index2 目标行序号 }
-         */
-        this.$emit('update:modelValue', null);
-        this.selected = null;
-        this.selectedData = null;
-
-        this.$emit('on-change');
+        this.dialogTable.close();
       },
       // 多选保存
       multiSave() {
-        let selectedData = this.$refs.dialogTable.getSelected();
+        let selectedData = this.dialogTable.getSelected();
         let data =
           selectedData.length == 0
             ? null
@@ -321,18 +349,7 @@
          */
         this.$emit('on-change', data, displayData);
 
-        this.$refs.dialogTable.close();
-      },
-      // 关闭
-      close() {
-        this.$refs.dialogTable.close();
-      },
-      // 双击行选中
-
-      dialogTableRowDblclick(row) {
-        if (!this.multi) {
-          this.dialogCheck(row);
-        }
+        this.dialogTable.close();
       }
     }
   };

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

@@ -292,13 +292,15 @@
               <template v-else-if="column.controlType === 'DialogSelect'">
                 <dialog-select
                   :model-value="parseData(data, column.code)"
+                  :raw-data="data"
+                  :column-code="column.code"
                   @update:model-value="$event => setData(data, column.code, $event)"
                   :readonly="readonly || column.isReadonly"
                   :source="column.source"
                   :source-data-code="column.sourceDataCode"
                   :source-display-code="column.sourceDisplayCode"
                   :param="getParam(data, column)"
-                  :controlWidth="column.controlWidth"
+                  :control-width="column.controlWidth"
                   @on-change="selected => onSelectDataChange(column, selected)"
                 ></dialog-select>
               </template>
@@ -312,7 +314,7 @@
                   :source-data-code="column.sourceDataCode"
                   :source-display-code="column.sourceDisplayCode"
                   :param="getParam(data, column)"
-                  :controlWidth="column.controlWidth"
+                  :control-width="column.controlWidth"
                   @on-change="selected => onSelectDataChange(column, selected)"
                 ></dialog-select>
               </template>

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

@@ -279,6 +279,8 @@
             <template v-else-if="column.controlType === 'DialogSelect'">
               <dialog-select
                 :model-value="parseData(rowData(row, index), column.code)"
+                :raw-data="rowData(row, index)"
+                :column-code="column.code"
                 size="small"
                 @update:model-value="$event => setData(rowData(row, index), column.code, $event)"
                 :readonly="isReadonly(rowData(row, index), 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};

package/src/mixins/page.js

@@ -105,25 +105,27 @@ export default {
       //return JSON.parse(JSON.stringify(model));
     },
     allow(key) {
-      if (key.startsWith('permission/')) {
-        // 全局权限
-        return this.userPermissions[key];
-      } else {
-        // 页面权限点
-        let url = this.$router.currentRoute.value.fullPath.substr(1).split('?')[0];
+      if (this.userPermissions) {
+        if (key.startsWith('permission/')) {
+          // 全局权限
+          return this.userPermissions[key];
+        } else {
+          // 页面权限点
+          let url = this.$router.currentRoute.value.fullPath.substr(1).split('?')[0];
 
-        if (this.userPermissions[url + '$' + key] == true) {
-          return true;
-        }
+          if (this.userPermissions[url + '$' + key] == true) {
+            return true;
+          }
 
-        let count = Object.keys(this.userPermissions).filter(item => item.startsWith(url + '$')).length;
+          let count = Object.keys(this.userPermissions).filter(item => item.startsWith(url + '$')).length;
 
-        // 未分权限点
-        if (this.userPermissions[url] == true && count == 0) {
-          return true;
-        }
+          // 未分权限点
+          if (this.userPermissions[url] == true && count == 0) {
+            return true;
+          }
 
-        return false;
+          return false;
+        }
       }
     },
     getCache(type, id) {

package/token.txt

@@ -1,2 +1,2 @@
 echo "//registry.npmjs.org/:_authToken=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" >> .npmrc
-npm config set //registry.npmjs.org/:_authToken=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
+npm config set //registry.npmjs.org/:_authToken=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