bri-components 1.2.56 → 1.2.57

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.2.56",
+    "version": "1.2.57",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",

package/src/components/controls/base/DshCascader/DshCascader.vue

@@ -226,6 +226,7 @@
                 return {
                     _showMode: "default", // 只有单选模式有效，值为"default", "custom", "simple"
                     _transfer: true,
+                    _transferClassName: "",
 
                     ...this.basePropsObj,
 

package/src/components/controls/base/DshCascader/cascaderMixin.js

@@ -17,7 +17,6 @@ export default {
                 _showMode: "default",
                 _filterable: true,
                 _cascaderFilterVals: [], // 过滤级联数据，只保留的数组
-                _changeOnSelect: false, // 每级菜单都可取值
                 _renderFormat: (labels) => labels.join(_joinSymbol),
 
                 ...this.propsObj,
@@ -26,6 +25,9 @@ export default {
                 _saveKey: this.propsObj._saveKey || "_key",
                 _valueKey: this.propsObj._valueKey || "code",
                 _nameKey: this.propsObj._nameKey || "name",
+                _changeOnSelect: this.isOnSearch
+                    ? true
+                    : this.propsObj._changeOnSelect == undefined ? false : this.propsObj._changeOnSelect, // 每级菜单都可取值 -默认取末级
                 _joinSymbol: _joinSymbol // 级联拼接符
             };
         },
@@ -42,7 +44,7 @@ export default {
             return this.selfPropsObj._cascaderFilterVals;
         },
         changeOnSelect () {
-            return this.isOnSearch ? true : this.selfPropsObj._changeOnSelect;
+            return this.selfPropsObj._changeOnSelect;
         },
         saveKey () {
             return this.selfPropsObj._saveKey;

package/src/components/controls/base/DshCascader/cascaderModal.vue

@@ -153,7 +153,8 @@
         computed: {
             modalPropsObj () {
                 return {
-                    title: this.selfPropsObj._name
+                    title: this.selfPropsObj._name,
+                    clasName: this.selfPropsObj._transferClassName
                 };
             },
 

package/src/components/controls/base/DshCascader/cascaderPicker.vue

@@ -7,11 +7,11 @@
             :visible="showModal"
             :placement="placement"
             :transfer="true"
-            transfer-class-name="cascaderPicker-down"
+            :transfer-class-name="`cascaderPicker-down ${selfPropsObj._transferClassName}`"
             :stop-propagation="true"
             :events-enabled="true"
         >
-            <div @click.stop="clickInput">
+            <div @click="clickInput">
                 <slot>
                     <Input
                         v-model="inputStr"
@@ -24,7 +24,7 @@
                 </slot>
             </div>
 
-            <!-- 下拉面板 -->
+            <!-- 下拉面板 click.stop目的：slot插槽里的会渲染到body下，点击此面板时，click事件会被Dropdown捕捉到，被当成外部点击事件，用stop阻止住 -->
             <div
                 slot="list"
                 class="wrap"

package/src/components/controls/senior/flatTable.vue

@@ -82,6 +82,7 @@
             :propsObj="propsObj"
             :importParams="importParams"
             @input="toggleBatchImportModal"
+            @importCb="importCb"
         ></flat-table-import-modal>
     </div>
 </template>
@@ -166,9 +167,9 @@
                 if (this.propsObj._isExport) {
                     btnList.unshift("canExport");
                 }
-                // if (this.propsObj._isImport && this.finalCanEdit) {
-                //     btnList.unshift("canImport");
-                // }
+                if (this.propsObj._isImport && this.finalCanEdit) {
+                    btnList.unshift("canImport");
+                }
 
                 return btnList;
             },
@@ -185,10 +186,10 @@
         created () {},
         methods: {
             clickBatchImport () {
-                // this.openBatchImportModal();
+                this.openBatchImportModal();
             },
             openBatchImportModal () {
-                // this.showBatchImportModal = true;
+                this.showBatchImportModal = true;
             },
             // 关闭批量导入模态框
             closeBatchImportModal () {
@@ -249,6 +250,10 @@
                     }
                 });
             },
+            // 回调- 导入成功
+            importCb (data) {
+                this.value[this.controlKey] = data;
+            },
 
             // 校验方法 -供外部使用
             validate () {

package/src/components/controls/senior/flatTableImportModal.vue

@@ -187,7 +187,11 @@
                         headers: { "Content-Type": "multipart/form-data" }
                     },
                     callback: data => {
-                        this.timer = setInterval(this.getTransitStatus(data.jobId, "import"), 1000);
+                        this.$Message.success("导入成功");
+                        this.file = null;
+                        this.loadingStatus = false;
+                        this.$emit("importCb", data);
+                        this.showModal = false;
                     },
                     error: data => {
                         this.$Message.error("导入失败:" + data.msg);
@@ -198,14 +202,10 @@
                 });
             },
 
-            getTransitStatus (id, type) {
+            getTransitStatus (id) {
                 let that = this;
                 return function () {
-                    if (type && type === "import") {
-                        that.getImportJobStatus(id);
-                    } else {
-                        that.getJobStatus(id);
-                    }
+                    that.getJobStatus(id);
                 };
             },
             // 状态查询
@@ -231,35 +231,6 @@
                         this.timer = null;
                     }
                 });
-            },
-            // 导入状态查询
-            getImportJobStatus (id) {
-                this.$https({
-                    url: {
-                        module: "sheet",
-                        name: "getImportJobStatus"
-                    },
-                    params: {
-                        jobId: id
-                    },
-                    callback: data => {
-                        if (data.status === "over") {
-                            clearInterval(this.timer);
-                            this.$Message.success("导入成功");
-                            this.file = null;
-                            this.loadingStatus = false;
-                            this.showModal = false;
-                            this.$emit("importCb");
-                        } else if (data.status === "check-fai" || data.status === "fai") {
-                            clearInterval(this.timer);
-                            this.$Message.info({ content: data.faiMsg });
-                            this.loadingStatus = false;
-                        }
-                    },
-                    error: data => {
-                        this.timer = null;
-                    }
-                });
             }
         }
     };