mooho-base-admin-plus 2.2.7 → 2.2.9

package/package.json

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

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

@@ -343,11 +343,16 @@
                 </Dropdown>
               </FormItem>
             </Col>
-            <Col v-bind="grid8">
+            <Col v-bind="grid8" v-if="data.controlType != 'Description'">
               <FormItem label="描述" key="description" prop="description">
                 <Input type="text" v-model="data.description" maxlength="200" />
               </FormItem>
             </Col>
+            <Col v-bind="grid24" v-if="data.controlType == 'Description'">
+              <FormItem label="描述" key="description" prop="description">
+                <Input type="textarea" :rows="5" v-model="data.description" />
+              </FormItem>
+            </Col>
             <Col v-bind="grid8" v-if="data.controlType == 'TextInput' || data.controlType == 'TextArea'">
               <FormItem label="最大字符数量" key="maxLength" prop="maxLength">
                 <Input type="number" style="width: 100px" number v-model="data.maxLength" />

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

@@ -186,6 +186,7 @@
             this.componentGroups.find(componentGroup => componentGroup.key == 'DateTime').components.push(component);
           } else if (
             item.id == 'Title' ||
+            item.id == 'Description' ||
             item.id == 'Table' ||
             item.id == 'List' ||
             item.id == 'Attachment' ||

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

@@ -380,7 +380,7 @@
 
         this.columns
           .filter(column => {
-            return !column.isStaticItem && !!(column.source || '').trim() && !!(column.param || '').trim();
+            return !column.isStaticItem && !!(column.source || '').trim() && !!(column.param || '').trim() && !column.dataType.startsWith('Enum:');
           })
           .forEach(column => {
             let param = JSON.parse(column.param);
@@ -556,6 +556,7 @@
             if (
               !column.isStaticItem &&
               !!(column.source || '').trim() &&
+              !column.dataType.startsWith('Enum:') &&
               (sender == null ||
                 sender.triggers.some(item => {
                   return item.id === column.id;

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

@@ -610,7 +610,7 @@
         // 数据源中包含变量需要刷新
         this.columns
           .filter(column => {
-            return !!(column.source || '').trim() && !!(column.param || '').trim();
+            return !!(column.source || '').trim() && !!(column.param || '').trim() && !column.dataType.startsWith('Enum:');
           })
           .forEach(column => {
             let param = JSON.parse(column.param);
@@ -756,6 +756,7 @@
           this.columns.forEach(function (column) {
             if (
               !!(column.source || '').trim() &&
+              !column.dataType.startsWith('Enum:') &&
               (sender == null ||
                 sender.triggers.some(item => {
                   return item.id === column.id;
@@ -784,7 +785,7 @@
             column.triggers.forEach(item => {
               item.needClear = true;
             });
-          } else if (column.needRefresh && !!(column.source || '').trim()) {
+          } else if (column.needRefresh && !!(column.source || '').trim() && !column.dataType.startsWith('Enum:')) {
             let param = this.getParam(this.data, column);
 
             if (

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

@@ -93,6 +93,9 @@
                   <div :class="{ error: compareData != null && parseData(data, column.code) != parseData(compareData, column.code) }" v-html="showData(data, column)"></div>
                 </div>
               </template>
+              <template v-else-if="column.controlType === 'Description'">
+                <div v-html="showDataMultiLine(column.description)"></div>
+              </template>
               <template v-if="column.controlType === 'Hyperlink'">
                 <a :href="getHyperlink(data, column.hyperlink)" :target="column.isNewWindow ? '_blank' : ''">
                   <span v-html="showData(data, column)"></span>
@@ -1007,7 +1010,7 @@
         // 数据源中包含变量需要刷新
         this.columns
           .filter(column => {
-            return !column.isStaticItem && !!(column.source || '').trim() && !!(column.param || '').trim();
+            return !column.isStaticItem && !!(column.source || '').trim() && !!(column.param || '').trim() && !column.dataType.startsWith('Enum:');
           })
           .forEach(column => {
             let param = JSON.parse(column.param);
@@ -1329,6 +1332,7 @@
             if (
               !column.isStaticItem &&
               !!(column.source || '').trim() &&
+              !column.dataType.startsWith('Enum:') &&
               (sender == null ||
                 sender.triggers.some(item => {
                   return item.code == column.code;
@@ -1361,7 +1365,7 @@
             column.triggers.forEach(item => {
               item.needClear = true;
             });
-          } else if (column.needRefresh && !!(column.source || '').trim()) {
+          } else if (column.needRefresh && !!(column.source || '').trim() && !column.dataType.startsWith('Enum:')) {
             let param = this.getParam(this.data, column);
 
             if (

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

@@ -1668,7 +1668,7 @@
 
               //this.$forceUpdate();
             } else {
-              if (!!(column.source || '').trim()) {
+              if (!!(column.source || '').trim() && !column.dataType.startsWith('Enum:')) {
                 this.data.forEach(row => {
                   if (row._dataSource && row._dataSource[column.code]) {
                     return;
@@ -1696,7 +1696,7 @@
         // 数据源中包含变量需要刷新
         this.columns
           .filter(column => {
-            return !column.isStaticItem && !!(column.source || '').trim() && !!(column.param || '').trim();
+            return !column.isStaticItem && !!(column.source || '').trim() && !!(column.param || '').trim() && !column.dataType.startsWith('Enum:');
           })
           .forEach(column => {
             let param = JSON.parse(column.param);
@@ -1910,6 +1910,7 @@
             if (
               !column.isStaticItem &&
               !!(column.source || '').trim() &&
+              !column.dataType.startsWith('Enum:') &&
               (sender == null ||
                 sender.triggers.some(item => {
                   return item.code == column.code;
@@ -1940,7 +1941,7 @@
             column.triggers.forEach(item => {
               data._needClear[item.code] = true;
             });
-          } else if (data._needRefresh[column.code] && !!(column.source || '').trim()) {
+          } else if (data._needRefresh[column.code] && !!(column.source || '').trim() && !column.dataType.startsWith('Enum:')) {
             let param = this.getParam(data, column, this.parentData);
 
             if (

package/src/mixins/page.js

@@ -296,6 +296,13 @@ export default {
         return value;
       }
     },
+    showDataMultiLine(content) {
+      if (content == null) {
+        return null;
+      } else {
+        return content.replaceAll(' ', '&nbsp;').replaceAll('\n', '<br/>');
+      }
+    },
     // 根据表达式取值
     parseData(model, expression) {
       // if (expression == null) {