build v3.4.7

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smallwei/avue",
-  "version": "3.4.6",
+  "version": "3.4.7",
   "description": "A Magic Configurable Web Framework",
   "main": "lib/avue.min.js",
   "unpkg": "lib/avue.min.js",
@@ -71,4 +71,4 @@
     "README.md",
     "LICENSE"
   ]
-}
+}

packages/element-ui/cascader/index.vue

@@ -77,10 +77,14 @@ export default create({
       return {
         label: this.labelKey,
         value: this.valueKey,
+        disabled: this.disabledKey,
         children: this.childrenKey,
         checkStrictly: this.checkStrictly,
         multiple: this.multiple,
         emitPath: this.emitPath,
+        expandTrigger: this.props.expandTrigger,
+        hoverThreshold: this.props.hoverThreshold,
+        leaf: this.leafKey,
         lazy: this.lazy,
         lazyLoad: (node, resolve) => {
           let callback = (list) => {

packages/element-ui/crud/column/column-default.vue

@@ -38,7 +38,7 @@
              :index="indexMethod"
              align="center">
     <template #="{$index}">
-      {{ $index+1 }}
+      {{ indexMethod($index)}}
     </template>
   </component>
 </template>

packages/element-ui/crud/grid/index.vue

@@ -84,6 +84,9 @@ export default create({
     }
   },
   methods: {
+    doLayout () {
+
+    },
     clearSelection () {
       this.checkList = []
       this.checkListChange(this.checkList)

packages/element-ui/crud/index.vue

@@ -500,6 +500,7 @@ export default create({
   methods: {
     handleGridShow () {
       this.gridShow = !this.gridShow
+      this.$emit('grid-status-change', this.gridShow)
     },
     handleValidate (prop, valid, msg) {
       if (!this.listError[prop]) this.listError[prop] = { valid: false, msg: '' }
@@ -903,7 +904,7 @@ export default create({
         } else if (type == 'column' && !this.isColumnSort) {
           return
         }
-      }
+      } else if (!el) return
       if (!window.Sortable) {
         packages.logs("Sortable")
         return

packages/element-ui/input-icon/index.vue

@@ -23,6 +23,7 @@
     <div v-if="box">
       <el-dialog class="avue-dialog"
                  :title="placeholder"
+                 :before-close="beforeClose"
                  :append-to-body="$AVUE.appendToBody"
                  lock-scroll
                  v-model="box"
@@ -65,6 +66,7 @@ export default create({
   },
   mixins: [props(), event(), locale],
   props: {
+    beforeClose: Function,
     prefixIcon: {
       type: String
     },

packages/element-ui/input-map/index.vue

@@ -17,6 +17,7 @@
     <div v-if="box">
       <el-dialog class="avue-dialog"
                  :width="dialogWidth"
+                 :before-close="beforeClose"
                  :append-to-body="$AVUE.appendToBody"
                  lock-scroll
                  :title="placeholder"
@@ -63,6 +64,7 @@ export default create({
   name: "input-map",
   mixins: [props(), event(), locale],
   props: {
+    beforeClose: Function,
     mapChange: Function,
     prefixIcon: {
       type: String

packages/element-ui/input-number/index.vue

@@ -15,7 +15,6 @@
                    :readonly="readonly"
                    :controls-position="controlsPosition"
                    :controls="controls"
-                   :label="placeholder"
                    :disabled="disabled"></el-input-number>
 </template>
 

packages/element-ui/input-table/index.vue

@@ -16,6 +16,7 @@
       <el-dialog class="avue-dialog"
                  :class="b()"
                  :width="dialogWidth"
+                 :before-close="beforeClose"
                  :append-to-body="$AVUE.appendToBody"
                  lock-scroll
                  :title="placeholder"
@@ -32,6 +33,7 @@
                    @selection-change="handleSelectionChange"
                    :rowClassName="handleRowClassName"
                    @current-row-change="handleCurrentChange"
+                   v-model:search="search"
                    v-model:page="page"></avue-crud>
         <span class="avue-dialog__footer">
           <el-button type="primary"
@@ -57,6 +59,7 @@ export default create({
     return {
       object: [],
       active: [],
+      search: {},
       page: {},
       loading: false,
       box: false,
@@ -65,6 +68,7 @@ export default create({
     };
   },
   props: {
+    beforeClose: Function,
     prefixIcon: {
       type: String
     },
@@ -145,10 +149,12 @@ export default create({
     handleShow () {
       this.$refs.main.blur();
       if (this.disabled || this.readonly) return;
+      this.search = {}
       this.page = {
         currentPage: 1,
         total: 0
       }
+      this.data = []
       this.box = true;
     },
     setVal () {
@@ -173,14 +179,14 @@ export default create({
     handleSearchChange (form, done) {
       this.loading = true;
       this.page.currentPage = 1;
-      this.onList({ data: form }, () => {
+      this.onList({}, () => {
         done && done()
       })
     },
-    onList (params = {}, callback) {
+    onList (params, callback) {
       this.loading = true;
       if (typeof this.onLoad == 'function') {
-        this.onLoad(Object.assign({ page: this.page }, params), data => {
+        this.onLoad({ page: this.page, data: this.search }, data => {
           callback && callback()
           this.page.total = data.total;
           this.data = data.data

src/version.js

@@ -1 +1 @@
-export const version = '3.4.6'
+export const version = '3.4.7'

styles/src/element-ui/group.scss

@@ -1,59 +1,81 @@
-.avue-group{
+.avue-group {
   width: 100%;
-  .el-collapse,.el-collapse-item__wrap{
-    border-color:#fff;
+
+  .el-collapse,
+  .el-collapse-item__wrap {
+    border-color: #fff;
   }
-  .el-collapse-item__header{
+
+  .el-collapse-item__header {
     width: 100%;
     height: inherit;
-    border:none;
-    border-bottom:1px solid #eee;
+    border: none;
+    border-bottom: 1px solid #eee;
     margin-bottom: 20px;
   }
-  .el-collapse-item__content,.van-collapse-item__content{
+
+  .el-collapse-item__content,
+  .van-collapse-item__content {
     padding-bottom: 0;
   }
-  .van-collapse-item__content{
+
+  .van-collapse-item__content {
     padding: 0 2px;
   }
-  &--arrow{
-    .el-collapse-item__arrow,.van-icon-arrow {
-     display: none;
+
+  &--arrow {
+
+    .el-collapse-item__arrow,
+    .van-icon-arrow {
+      display: none;
     }
   }
-  .van-hairline--top-bottom::after, .van-hairline-unset--top-bottom::after{
+
+  .van-hairline--top-bottom::after,
+  .van-hairline-unset--top-bottom::after {
     display: none;
   }
-  .van-collapse-item__title{
+
+  .van-collapse-item__title {
     padding: 0 10px;
     display: flex;
     align-items: center;
-    &::after{
-      left:0 !important;
+
+    &::after {
+      left: 0 !important;
     }
   }
-  &--none{
+
+  &--none {
     margin: 0 !important;
-    border:none !important;
+    border: none !important;
   }
-  &--header{
-    .el-collapse-item__header{
+
+  &--header {
+
+    &>.el-collapse>.el-collapse-item>.el-collapse-item__header,
+    &>.el-collapse>.el-collapse-item>div>.el-collapse-item__header {
       display: none;
     }
   }
-  &--collapse{
-    .el-collapse-item__arrow,.el-collapse-item__header{
+
+  &--collapse {
+
+    .el-collapse-item__arrow,
+    .el-collapse-item__header {
       display: flex !important;
     }
   }
+
   &__item {
     margin-bottom: 10px;
     background-color: #fff;
     border-bottom: 1px solid #eee;
     border-radius: 5px;
     box-sizing: border-box;
+
     &:last-child {
-        border-bottom: none;
+      border-bottom: none;
     }
   }
 
@@ -64,15 +86,17 @@
     height: 50px;
     line-height: 50px;
     box-sizing: border-box;
-}
+  }
+
   &__icon {
-      margin-right: 8px;
-      font-size: 20px;
-      color: rgba(0, 0, 0, 0.85);
+    margin-right: 8px;
+    font-size: 20px;
+    color: rgba(0, 0, 0, 0.85);
   }
+
   &__title {
-      font-size: 16px;
-      font-weight: 500;
-      color: rgba(0, 0, 0, 0.85);
+    font-size: 16px;
+    font-weight: 500;
+    color: rgba(0, 0, 0, 0.85);
   }
-}
+}