mooho-base-admin-plus 2.2.14 → 2.2.15

package/package.json

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

package/public/setting.js

@@ -78,7 +78,9 @@ window.setting = {
     // 提示框样式(SweetAlert/Message/Notice)
     alertStyle: 'SweetAlert',
     // 筛选标题栏宽度
-    filterWidth: 125
+    filterWidth: 125,
+    // 每页默认数量
+    pageSize: 20
   },
   /**
    * 多语言配置

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

@@ -288,6 +288,32 @@
                 </Select>
               </FormItem>
             </Col>
+            <Col v-bind="grid8" v-if="viewType == 'TableView' && data.controlType == 'Label'">
+              <FormItem label="强制单行" key="is_fixed" prop="isSingleLine">
+                <Switch
+                  :model-value="!!data.isSingleLine"
+                  @update:model-value="
+                    $event => {
+                      data.isSingleLine = $event;
+                      //$forceUpdate();
+                    }
+                  "
+                />
+              </FormItem>
+            </Col>
+            <Col v-bind="grid8" v-if="viewType == 'TableView' && data.controlType == 'Label'">
+              <FormItem label="固定在最前" key="isFixed" prop="isFixed">
+                <Switch
+                  :model-value="!!data.isFixed"
+                  @update:model-value="
+                    $event => {
+                      data.isFixed = $event;
+                      //$forceUpdate();
+                    }
+                  "
+                />
+              </FormItem>
+            </Col>
             <Col v-bind="grid8">
               <FormItem label="是否必填" key="isRequired" prop="isRequired">
                 <Switch

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

@@ -28,7 +28,6 @@
         ref="table"
         :view-code="viewCode"
         :static="this.static"
-        :filter="tableFilter"
         :setting-enable="settingEnable"
         :auto-load="false"
         :select-enable="selectEnable"
@@ -143,8 +142,7 @@
       return {
         opened: false,
         tableView: {},
-        param: {},
-        tableFilter: {}
+        param: {}
       };
     },
     created() {},
@@ -348,7 +346,7 @@
       },
       // 筛选条件数据
       filterData() {
-        return this.$refs.tableFilter.data;
+        return this.$refs.table.filterData;
       },
       // 屏幕宽度
       screenWidth() {
@@ -374,14 +372,18 @@
        * @public
        */
       open(param) {
-        for (let key in this.param) {
-          delete this.tableFilter[key];
+        if (this.param) {
+          for (let key in this.param) {
+            delete this.filterData[key];
+          }
         }
 
         this.param = param;
 
-        for (let key in this.param) {
-          this.tableFilter[key] = this.param[key];
+        if (this.param) {
+          for (let key in this.param) {
+            this.filterData[key] = this.param[key];
+          }
         }
 
         setTimeout(() => {

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

@@ -309,8 +309,6 @@
               } else if (item.dataType === 'Boolean' && item.defaultValue.toUpperCase == 'FALSE') {
                 this.setFilterData(data, item, false);
               } else {
-                console.log('this.setFilterData', data, item, item.defaultValue);
-
                 this.setFilterData(data, item, item.defaultValue);
               }
             }
@@ -513,7 +511,6 @@
       // },
       // 选项变化事件
       onSelectDataChange(sender, selected) {
-        console.log('onSelectDataChange', sender, selected);
         let code;
         if (sender.code.endsWith('ID')) {
           code = sender.code.substr(0, sender.code.length - 2);

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

@@ -121,7 +121,11 @@
               <slot name="column" :row="rowData(row, index)" :index="index" :column="column" :code="column.code"></slot>
             </template>
             <template v-else-if="column.controlType === 'Label'">
-              <div v-html="showData(rowData(row, index), column)"></div>
+              <div
+                :title="column.isSingleLine ? showData(rowData(row, index), column) : null"
+                :class="{ 'single-line': column.isSingleLine }"
+                v-html="showData(rowData(row, index), column)"
+              ></div>
             </template>
             <template v-else-if="column.controlType === 'Hyperlink'">
               <a :href="getHyperlink(rowData(row, index), column.hyperlink)" :target="column.isNewWindow ? '_blank' : ''">
@@ -905,7 +909,7 @@
       },
       // 筛选条件数据
       filterData() {
-        return this.$refs.tableFilter.data;
+        return this.$refs.tableFilter ? this.$refs.tableFilter.data : null;
       }
     },
     watch: {
@@ -980,6 +984,7 @@
 
         this.columns.forEach(column => {
           column.name = this.getNameI18n(column);
+          column.fixed = column.isFixed ? 'left' : null;
         });
 
         if (this.tableView.snEnable) {
@@ -1067,7 +1072,7 @@
         if (this.tableView.size) {
           this.size = this.tableView.size;
         } else if (this.tableView.pageEnable && this.pageEnable) {
-          this.size = 10;
+          this.size = Setting.layout.pageSize;
         } else {
           this.size = 1000;
         }
@@ -2087,11 +2092,9 @@
       },
       // 合并后最终的筛选项
       getAllFilter() {
-        console.log('getAllFilter');
-
         let filter = {
           ...this.viewFilter,
-          ...this.filterData
+          ...(this.filterData ?? {})
         };
 
         for (let key in filter) {

package/src/setting.js

@@ -122,7 +122,9 @@ const Setting = {
     // 提示框样式(SweetAlert/Message/Notice)
     alertStyle: 'SweetAlert',
     // 筛选标题栏宽度
-    filterWidth: 125
+    filterWidth: 125,
+    // 每页默认数量
+    pageSize: 10
   },
   /**
    * 多页 Tabs

package/src/styles/css/default.css

@@ -584,3 +584,9 @@
 ::-webkit-scrollbar-track {
   background-color: transparent;
 }
+
+.single-line {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}