chenlei 7 mesiacov pred
rodič
commit
ebf698d40f

+ 3 - 0
packages/form/src/main.vue

@@ -171,6 +171,9 @@ export default {
     myValidateField(field) {
       this.$refs[this.formRef].validateField(field)
     },
+    validate() {
+      return this.$refs[this.formRef].validate()
+    },
     modeShowStatus(mode) {
       let tmpModeStatus = false;
 

+ 3 - 3
packages/input/src/main.vue

@@ -33,7 +33,7 @@
                 :md="formLineWidth(inputItem[inputType], 'value')"
                 :lg="formLineWidth(inputItem[inputType], 'value')"
                 :xl="formLineWidth(inputItem[inputType], 'value')">
-                <el-form-item :label="inputItem[inputType].label" :prop="inputItem.field" :class="inputItem[inputType].type === 'span' ? 'el-form-item__content--span' : ''" :style="formItemStyle">
+                <el-form-item :label="inputItem[inputType].label" :label-width="inputItem[inputType].labelWidth" :prop="inputItem.field" :class="inputItem[inputType].type === 'span' ? 'el-form-item__content--span' : ''" :style="formItemStyle">
                     <!--input-->
                     <el-input v-if="inputItem[inputType].type === 'text'" v-model="rowData[(inputType === 'search' ? inputPriField : inputItem.field)]"
                                 @blur="onInputBlur(rowData[(inputType === 'search' ? inputPriField : inputItem.field)])"
@@ -665,8 +665,8 @@ import { isTypeof, LOCAL_STORAGE_CURR, downLoadImage, isHttpHeaderURL, datepicke
                 if (curConfig.type === 'span') {
                     rv = 'width: 95%'
                 }
-                if (curConfig.style) {
-                    rv = curConfig.style
+                if (curConfig.itemStyle) {
+                    rv = curConfig.itemStyle
                 }
                 if (curConfig.hidden) {
                     rv = 'visibility: hidden'

+ 6 - 3
packages/list/src/tables.vue

@@ -13,7 +13,7 @@
     :stripe="emTableList.stripe === false ? false : true"
     style="width: 100%"
     :row-key="emTableList.rowKey"
-    :default-sort="{prop: 'totalQty', order: 'descending'}"
+    :default-sort="defaultSort"
     ref="multipleTable"
     @sort-change="sortReloadData"
     @selection-change="handleSelectionChange"
@@ -561,8 +561,11 @@ export default {
       return this.$refs.multipleTable
     },
     defaultSort(){
-      const defsort = this.showColumns.find(f=>typeof(f.sort) === 'string')
-      return defsort && {prop: defsort.field, order: defsort.sort}
+      const defsort = this.showColumns.find(f => typeof (f.sort) === 'string')
+      if(defsort) {
+        this.emTableList.order[defsort.field]  = defsort.sort
+        return  {prop: defsort.field, order: defsort.sort}
+      }
     },
     // 第一个 显示的 && 复选框列
     checkboxItem() {

+ 6 - 0
readme.md

@@ -1,4 +1,10 @@
 ## 版本
+1.04
+  增加功能:
+  1.page_column[*].show.labelWidth等于 <el-form-item>的labelWidth
+  2.page_column[*].show.itemStyle等于 <el-form-item>的style
+  3.<dx-form>增加validate等于<el-from>的validate
+  
 1.03
   增加功能:
   1.dx-table-list支持 selectable、selection-change、toggleRowSelection、clearSelection、toggleAllSelection、cell-mouse-enter 功能与 el-table 一致