xianniu-ui 0.3.21 → 0.3.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xianniu-ui",
-  "version": "0.3.21",
+  "version": "0.3.23",
   "private": false,
   "main": "lib/xianniu-ui.umd.min.js",
   "scripts": {
@@ -21,7 +21,6 @@
     "public"
   ],
   "dependencies": {
-    "axios": "^0.26.0",
     "core-js": "^3.6.5",
     "dayjs": "^1.10.7",
     "decimal.js": "^10.4.2",
@@ -39,6 +38,7 @@
     "@vue/cli-plugin-router": "~4.5.0",
     "@vue/cli-service": "~4.5.0",
     "@vue/component-compiler-utils": "^2.6.0",
+    "axios": "^0.26.1",
     "babel-eslint": "^10.1.0",
     "babel-plugin-component": "^1.1.1",
     "babel-plugin-module-resolver": "^2.7.1",

package/packages/search/main.vue

@@ -2,7 +2,7 @@
   <div class="xn-search">
     <el-form ref="form" inline :model="form" :label-width="labelWidth">
       <el-row :gutter="0" class="xn-search--row">
-        <template v-for="(item, idx) in formData">
+        <template v-for="(item, idx) in form.value">
           <el-col v-bind="{ ...col }" :key="idx" v-show="item.isShow || isColl">
             <el-form-item
               v-if="item.type === 'city'"
@@ -12,8 +12,9 @@
               class="xn-search--row_col"
             >
               <xn-city
+                :key="item.prop"
                 :data-level="(item.options && item.options.dataLevel) || 2"
-                v-model="form.value[idx].modelVal"
+                v-model="item.modelVal"
                 @on-city="handleChangeCity"
               />
             </el-form-item>
@@ -25,9 +26,10 @@
               class="xn-search--row_col"
             >
               <el-input
+                :key="item.prop"
                 style="width: 100%"
                 v-bind="item.options ? { ...item.options } : {}"
-                v-model="form.value[idx].modelVal"
+                v-model="item.modelVal"
                 :clearable="item.clearable || true"
                 :placeholder="item.placeholder || '请填写' + item.label"
               />
@@ -40,8 +42,9 @@
               class="xn-search--row_col"
             >
               <el-select
+                :key="item.prop"
                 style="width: 100%"
-                v-model="form.value[idx].modelVal"
+                v-model="item.modelVal"
                 :placeholder="item.placeholder || '请选择' + item.label"
                 :clearable="item.clearable || true"
                 filterable
@@ -71,7 +74,8 @@
               class="xn-search--row_col"
             >
               <xn-date
-                v-model="form.value[idx].modelVal"
+                :key="item.prop"
+                v-model="item.modelVal"
                 :mode="item.mode || 'range'"
                 :type="item.type || 'daterange'"
                 :is-shortcut="showShortcut(item)"
@@ -203,16 +207,29 @@ export default {
     };
   },
   created() {
-    for (let i = 0, formData = this.formData; i < formData.length; i++) {
-      const item = formData[i];
-      item.isShow = i > 3 && this.showColl ? false : true;
-      this.form.value.push({
-        key: item.prop,
-        modelVal: "",
-      });
-    }
+    // this.init();
+  },
+  watch: {
+    formData: {
+      handler(n) {
+        n&&n.length&&this.init();
+      },
+      immediate:true
+    },
   },
   methods: {
+    init() {
+      this.form.value = []
+      for (let i = 0, formData = this.formData; i < formData.length; i++) {
+        const item = formData[i];
+        item.isShow = i > 3 && this.showColl ? false : true;
+        this.form.value.push({
+          ...item,
+          key: item.prop,
+          modelVal: "",
+        });
+      }
+    },
     onSearch() {
       const formValue = {};
       if (this.formData) {

package/packages/table/main.vue

@@ -121,13 +121,13 @@
         type="index"
       ></el-table-column>
       <slot>
-        <template v-for="(item, idx) in columns">
-          <column
-            :key="idx"
-            v-if="item.checked === true"
-            v-bind="item"
-          ></column>
-        </template>
+          <template v-for="(item, idx) in columns">
+            <column
+              :key="idx"
+              v-if="item.checked === true"
+              v-bind="item"
+            ></column>
+          </template>
       </slot>
       <template #append v-if="$slots.append">
           <slot name="append"></slot>
@@ -199,10 +199,13 @@ export default {
   },
   computed: {},
   created() {
+
+  },
+  updated() {
     !this.$slots.default &&
       this.columns.length &&
       this.columns.forEach((item) => {
-        this.$set(item, "checked", true);
+        if(item.checked !== true) this.$set(item, "checked", true);
       });
   },
   methods: {