mooho-base-admin-plus 2.0.6 → 2.0.7

package/package.json

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

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

@@ -14,7 +14,9 @@
             <slot name="column" :filter="data" :column="column" :code="column.code"></slot>
           </template>
           <template v-else-if="column.controlType === 'Label'">
-            <div v-html="showData(data, column)"></div>
+            <div class="label">
+              <div>{{ showData(data, column) }}</div>
+            </div>
           </template>
           <template v-else-if="column.controlType === 'TextInput'">
             <Input

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

@@ -439,9 +439,7 @@
                   :placeholder="column.description"
                 />
               </template>
-              <Tooltip v-if="!!(column.tooltip || '').trim()" :content="column.tooltip" max-width="400" :transfer="true">
-                <Button type="primary" style="margin-left: 4px" size="small" shape="circle" icon="md-help"></Button>
-              </Tooltip>
+              <Button type="primary" v-if="!!(column.tooltip || '').trim()" style="margin-left: 4px" size="small" :title="column.tooltip" shape="circle" icon="md-help"></Button>
             </FormItem>
           </Col>
         </template>

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

@@ -2019,8 +2019,6 @@
         if (!this.filterDisable) {
           let filter = this.filter;
 
-          console.log('filter', filter);
-
           for (let key in filter) {
             let column = key;
             let value = filter[key];

package/src/mixins/page.js

@@ -235,7 +235,7 @@ export default {
 
       if (dataType.indexOf('Enum:') === 0) {
         return this.getEnum(dataType.replace('Enum:', ''), this.parseData(model, expression));
-      } else if (dataType === 'BigInteger') {
+      } else if (dataType === 'BigInteger' && format == 'User') {
         return this.getUserName(this.parseData(model, expression));
       }
 

package/src/styles/css/default.css

@@ -246,6 +246,11 @@
   margin-bottom: 0px;
 }
 
+.filter .ivu-form-item-content .label {
+  line-height: 24px;
+  min-height: 24px;
+}
+
 .filter .ivu-input-group {
   display: inline-table;
 }