mooho-base-admin-plus 2.10.79 → 2.10.81

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.10.79",
+  "version": "2.10.81",
   "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: {
@@ -225,33 +209,66 @@
       },
       // 弹出选择框
       dialogSelectOpen() {
-        if (!this.readonly && this.source) {
-          // if (this.param) {
-          //   // 参数完整
-          //   this.loadDataEnable = true;
-          // } else {
-          //   // 参数不完整
-          //   this.loadDataEnable = false;
-          // }
+        let that = this.$parent;
 
-          //this.$refs.dialogTable.loadData();
+        while (that.$parent != null) {
+          if (that.$refs['dialogTable'] != null) {
+            break;
+          } else {
+            that = that.$parent;
+          }
+        }
 
-          setTimeout(async () => {
-            for (let key in this.$refs.dialogTable.filterData) {
-              delete this.$refs.dialogTable.filterData[key];
-            }
+        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.$refs.dialogTable.setSelected(this.selectedData);
+              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 +289,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 +326,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-table-excel.vue

@@ -280,9 +280,7 @@
                   column.type = 'numeric';
                 } else if (item.controlType === 'Check') {
                   column.type = 'checkbox';
-                } else if (item.controlType === 'Select') {
-                  column.editor = 'select';
-
+                } else if (item.controlType === 'Select' || item.controlType == 'ComboSelect') {
                   let dataSource = [];
 
                   if (column.isStaticItem) {
@@ -366,9 +364,29 @@
                     }
                   }
 
-                  column.selectOptions = dataSource.map(option => {
-                    return option.id;
-                  });
+                  if (item.controlType == 'Select') {
+                    column.editor = 'select';
+                    column.selectOptions = dataSource.map(option => {
+                      return option.id;
+                    });
+                  } else if (item.controlType == 'ComboSelect') {
+                    column.type = 'autocomplete';
+                    column.dropdownMenu = true;
+                    column.strict = true;
+                    column.source = (query, process) => {
+                      let searchResult = [];
+                      if (query) {
+                        const lowerQuery = query.toLowerCase();
+                        searchResult = dataSource.filter(data => {
+                          return data.name.toLowerCase().includes(lowerQuery);
+                        });
+                      } else {
+                        searchResult = [...dataSource];
+                      }
+                      const showNames = searchResult.map(item => item.name);
+                      process(showNames);
+                    };
+                  }
                 } else if (item.controlType === 'Date') {
                   column.type = 'date';
                   column.dateFormat = 'YYYY-MM-DD';

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