mooho-base-admin-plus 0.4.14 → 0.4.17

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "0.4.14",
+  "version": "0.4.17",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "dotnetVersion": "1.4.0",
   "license": "MIT",

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

@@ -28,7 +28,7 @@
                 :parent-data="data"
                 @on-change="onDataChange(column)"
               >
-                <template #column="{ row, index, column, code }">
+                <template #column="scope">
                   <!--
                       @slot 内嵌表格自定义列
                       @binding {object} table 表格对象
@@ -46,10 +46,10 @@
                     :tableData="data"
                     :tableColumn="column"
                     :tableCode="column.code"
-                    :row="row"
-                    :index="index"
-                    :column="column"
-                    :code="code"
+                    :row="scope.row"
+                    :index="scope.index"
+                    :column="scope.column"
+                    :code="scope.code"
                   ></slot>
                 </template>
               </view-table>

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

@@ -146,6 +146,19 @@
                 @on-blur="onBlur(rowData(row, index), column)"
               />
             </template>
+            <template v-else-if="column.controlType === 'TextArea'">
+              <Input
+                type="textarea"
+                size="small"
+                :model-value="parseData(rowData(row, index), column.code)"
+                @update:model-value="$event => setData(rowData(row, index), column.code, $event)"
+                :readonly="isReadonly(rowData(row, index), column)"
+                :style="{ width: column.controlWidth == null ? null : column.controlWidth - 36 + 'px' }"
+                :rows="column.controlHeight / 20"
+                :maxlength="column.maxLength"
+                :placeholder="column.description"
+              />
+            </template>
             <template v-else-if="column.controlType === 'NumberInput'">
               <Input
                 type="number"

package/src/components/workflow/flow-chart.vue

@@ -688,8 +688,8 @@
       },
       // 鼠标移动
       mousemove(e) {
-        this.current.x = e.layerX;
-        this.current.y = e.layerY;
+        this.current.x = e.offsetX;
+        this.current.y = e.offsetY;
         //this.$forceUpdate();
 
         if (this.isMoving) {

package/src/styles/css/default.css

@@ -220,13 +220,18 @@
 
 /* 表格筛选 */
 .filter {
-  margin-top: 4px;
+  /* margin-top: 4px; */
+}
+
+.filter .ivu-col {
+  margin-top: 2px;
+  margin-bottom: 2px;
 }
 
 .filter .ivu-form-item-label {
   float: left;
-  line-height: 6px;
-  padding: 10px 12px 10px 0;
+  line-height: 24px;
+  padding: 0px 12px 0px 0;
 }
 
 .filter .ivu-form-item {