bri-components 1.2.56 → 1.2.58

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

@@ -0,0 +1,141 @@
+<template>
+    <div class="cascaderSimple">
+        <Cascader
+            :value="activeCodeValue"
+            :data="renderData"
+            :placeholder="selfPropsObj._placeholder"
+            :disabled="selfPropsObj._disabled"
+            :clearable="selfPropsObj._clearable"
+            :size="selfPropsObj._size"
+            :filterable="useFilter"
+            :render-format="renderFormat"
+            :change-on-select="changeOnSelect"
+            :transfer="selfPropsObj._transfer"
+            :transfer-class-name="selfPropsObj._transferClassName"
+            :load-data="loadData"
+            @on-visible-change="changeVisible"
+            @on-change="changeSelect"
+            @click.native="clickCascader"
+        >
+            <slot></slot>
+        </Cascader>
+    </div>
+</template>
+
+<script>
+    import cascaderPickerMixin from "../../../mixins/cascaderPickerMixin.js";
+
+    export default {
+        name: "cascaderSimple",
+        mixins: [
+            cascaderPickerMixin
+        ],
+        components: {},
+        props: {},
+        data () {
+            return {
+                renderAll: false
+            };
+        },
+        computed: {
+            selfPropsObj () {
+                return {
+                    ...this.propsObj
+                };
+            },
+            useFilter () {
+                // 多选暂不支持搜索，值得弄成false，不然出bug
+                return this.multipleMode ? false : this.filterable;
+            },
+
+            renderData () {
+                return this.renderAll
+                    ? this.data
+                    : this.data.map(item => {
+                        return {
+                            ...item,
+                            children: []
+                        };
+                });
+            }
+        },
+        created () {},
+        methods: {
+            // 动态加载数据
+            loadData (treeItem, cb) {
+                const linealDatas = this.$getTreeLinealDatas(treeItem.keys, this.data, undefined, this.saveKey);
+                const lastData = linealDatas.slice(-1)[0];
+                treeItem.children = lastData.children.map(item =>
+                    ({
+                        ...item,
+                        children: []
+                    })
+                );
+
+                cb();
+            },
+            // 点击级联框 如果是需要搜索，需要先渲染完多有节点，不然搜索起来
+            clickCascader () {
+                // if (
+                //     !this.selfPropsObj._disabled &&
+                //     this.useFilter === true &&
+                //     this.renderAll === false &&
+                //     !this.clickFlag
+                // ) {
+                //     this.clickFlag = true; // 这个处理其实觉大概率没必要，有没有不受影响
+                //     setTimeout(() => {
+                //         this.renderAll = true;
+                //     }, 0);
+                // }
+            },
+            // 展开和关闭弹窗时触发
+            changeVisible (bool) {
+                this.isVisible = bool;
+
+                if (this.isVisible === false) {
+                    // 多选时
+                    if (this.multipleMode) {
+                        this.clickConfirm();
+                    }
+                }
+            },
+            // 选项变化
+            changeSelect (value, selectedOptions) {
+                if (this.isVisible || !value.length) {
+                    const node = selectedOptions.slice(-1)[0] || {
+                        keys: [],
+                        loading: false
+                    };
+
+                    // 避免重复点击 -简易模式其实无效，不过为了代码对照好看
+                    if (JSON.stringify(this.selectedValue) !== JSON.stringify(node.keys)) {
+                        this.selectedValue = node.keys;
+
+                        const obj = {
+                            value: this.selectedValue,
+                            selectedOptions: this.selectedOptions
+                        };
+                        this.$emit("change", obj);
+                        node.loading === undefined && this.$emit("finish", obj);
+
+                        // 单选时
+                        if (!this.multipleMode) {
+                            this.clickConfirm();
+                        }
+                    }
+                }
+            },
+            clickConfirm () {
+                if (this.selectedValue.length && this.selectedOptions.length) {
+                    this.$emit("confirm", this.selectedValue, this.selectedOptions);
+                }
+            }
+        }
+    };
+</script>
+
+<style lang="less">
+    .cascaderSimple {
+
+    }
+</style>>

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

@@ -141,7 +141,7 @@
 </template>
 
 <script>
-    import controlMixin from "../controlMixin.js";
+    import controlMixin from "../mixins/controlMixin.js";
 
     const plotStrokeColor = "#4575EF";
     const plotFillColor = "#4575EF";

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

@@ -65,7 +65,7 @@
 </template>
 
 <script>
-    import controlMixin from "../../controlMixin.js";
+    import controlMixin from "../../mixins/controlMixin.js";
     import DshDaterange from "./DshDaterange.vue";
 
     export default {

package/src/components/controls/base/DshDate/DshDaterange.vue

@@ -76,7 +76,7 @@
 </template>
 
 <script>
-    import controlMixin from "../../controlMixin.js";
+    import controlMixin from "../../mixins/controlMixin.js";
 
     export default {
         name: "DshDaterange",

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

@@ -42,7 +42,7 @@
 </template>
 
 <script>
-    import controlMixin from "../controlMixin.js";
+    import controlMixin from "../mixins/controlMixin.js";
 
     export default {
         name: "DshDivider",

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

@@ -62,7 +62,7 @@
 </template>
 
 <script>
-    import controlMixin from "../controlMixin.js";
+    import controlMixin from "../mixins/controlMixin.js";
     import uploadMixin from "./BriUpload/uploadMixin.js";
     import E from "wangeditor";
 

package/src/components/controls/base/DshInput/BriInputs.vue

@@ -46,7 +46,7 @@
 </template>
 
 <script>
-    import controlMixin from "../../controlMixin.js";
+    import controlMixin from "../../mixins/controlMixin.js";
 
     export default {
         name: "BriInputs",

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

@@ -92,7 +92,7 @@
 </template>
 
 <script>
-    import controlMixin from "../../controlMixin.js";
+    import controlMixin from "../../mixins/controlMixin.js";
     import DshInputs from "./BriInputs.vue";
 
     export default {

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

@@ -62,7 +62,7 @@
 </template>
 
 <script>
-    import controlMixin from "../../controlMixin.js";
+    import controlMixin from "../../mixins/controlMixin.js";
     import BriInputNumber from "./BriInputNumber/BriInputNumber.vue";
     import DshNumberange from "./DshNumberange.vue";
 

package/src/components/controls/base/DshNumber/DshNumberange.vue

@@ -52,7 +52,7 @@
 </template>
 
 <script>
-    import controlMixin from "../../controlMixin.js";
+    import controlMixin from "../../mixins/controlMixin.js";
     import BriInputNumber from "./BriInputNumber/BriInputNumber.vue";
 
     export default {

package/src/components/controls/base/DshSelect/DshCheckbox.vue

@@ -110,7 +110,7 @@
 </template>
 
 <script>
-    import selectMixin from "./selectMixin.js";
+    import selectMixin from "../../mixins/selectMixin.js";
 
     export default {
         name: "DshCheckbox",

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

@@ -119,7 +119,7 @@
 </template>
 
 <script>
-    import selectMixin from "./selectMixin.js";
+    import selectMixin from "../../mixins/selectMixin.js";
     import DshCheckbox from "./DshCheckbox.vue";
 
     export default {

package/src/components/controls/base/DshSwitch/switchMixin.js

@@ -1,4 +1,4 @@
-import controlMixin from "../../controlMixin.js";
+import controlMixin from "../../mixins/controlMixin.js";
 import DshCheckbox from "../DshSelect/DshCheckbox.vue";
 
 export default {

package/src/components/controls/extra/themeColor.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script>
-    import controlMixin from "../controlMixin.js";
+    import controlMixin from "../mixins/controlMixin.js";
 
     export default {
         name: "themeColor",

package/src/components/controls/extra/themeIcon.vue

@@ -27,7 +27,7 @@
 </template>
 
 <script>
-    import controlMixin from "../controlMixin.js";
+    import controlMixin from "../mixins/controlMixin.js";
 
     export default {
         name: "themeIcon",

package/src/components/controls/{base/DshCascader → mixins}/cascaderMixin.js

@@ -1,4 +1,4 @@
-import controlMixin from "../../controlMixin.js";
+import controlMixin from "./controlMixin.js";
 import { regionData, userIndustryData } from "bri-datas";
 
 export default {
@@ -15,35 +15,25 @@ export default {
             const _joinSymbol = this.propsObj._joinSymbol || "/";
             return {
                 _showMode: "default",
+                _saveKey: "_key",
+                _valueKey: "code",
+                _nameKey: "name",
                 _filterable: true,
                 _cascaderFilterVals: [], // 过滤级联数据，只保留的数组
-                _changeOnSelect: false, // 每级菜单都可取值
                 _renderFormat: (labels) => labels.join(_joinSymbol),
 
                 ...this.propsObj,
                 ...this.commonDealPropsObj,
 
-                _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 // 级联拼接符
             };
         },
         showType () {
             return this.selfPropsObj._showMode;
         },
-        filterable () {
-            return this.selfPropsObj._filterable;
-        },
-        cascaderLevel () {
-            return this.selfPropsObj._cascaderLevel;
-        },
-        cascaderFilterVals () {
-            return this.selfPropsObj._cascaderFilterVals;
-        },
-        changeOnSelect () {
-            return this.isOnSearch ? true : this.selfPropsObj._changeOnSelect;
-        },
         saveKey () {
             return this.selfPropsObj._saveKey;
         },
@@ -53,6 +43,12 @@ export default {
         nameKey () {
             return this.selfPropsObj._nameKey;
         },
+        cascaderLevel () {
+            return this.selfPropsObj._cascaderLevel;
+        },
+        cascaderFilterVals () {
+            return this.selfPropsObj._cascaderFilterVals;
+        },
         renderFormat () {
             return this.selfPropsObj._renderFormat;
         },
@@ -65,13 +61,13 @@ export default {
                     : this.selfPropsObj._data;
         },
         cascaderData () {
-            const loop = (data = [], level, parentKeys = [], filterVals = [], isMobile = false) => {
-                if (data && filterVals.length) {
-                    data = data.filter(item => filterVals.includes(item[this.saveKey]));
+            const loop = (arr = [], level, parentKeys = [], filterVals = [], isMobile = false) => {
+                if (arr && filterVals.length) {
+                    arr = arr.filter(item => filterVals.includes(item[this.saveKey]));
                 }
 
-                return data
-                    ? data.reduce((arr, item) => {
+                return arr
+                    ? arr.reduce((arr, item) => {
                         let newItem = {
                             keys: [...parentKeys, item[this.saveKey]], // ！！此处就是用_key拼，不会用别的属性
                             code: [...parentKeys, item._key].join(""),
@@ -102,9 +98,7 @@ export default {
 
             return loop(this.originData, this.cascaderLevel, undefined, this.cascaderFilterVals, this.isMobile);
         },
-        curValKeyList () {
-            return this.$getTreeLinealDatas(this.curValList, this.cascaderData, this.valueKey, this.saveKey);
-        },
+
         curValName: {
             get () {
                 return this.transformFullName(this.curValList);
@@ -131,15 +125,6 @@ export default {
     },
     created () { },
     methods: {
-        // 点击选择框 进行选择
-        clickInput (e) {
-            if (!this.selfPropsObj._disabled) {
-                this.openModal();
-            } else {
-                e.stopPropagation();
-            }
-        },
-
         // 点击清除
         clickClear () {
             this.curValList = [];

package/src/components/controls/{base/DshCascader → mixins}/cascaderPickerMixin.js

@@ -6,6 +6,10 @@ export default {
             type: Boolean,
             default: false
         },
+        multipleMode: {
+            type: Boolean,
+            default: false
+        },
 
         activeValue: {
             type: Array,
@@ -13,10 +17,6 @@ export default {
                 return [];
             }
         },
-        activeStr: {
-            type: String,
-            default: ""
-        },
         data: {
             type: Array,
             drfault () {
@@ -36,7 +36,9 @@ export default {
             showMode: "default", // "flat", "default"
             maxFlatModeSearchNum: 80,
 
+            inputStr: "",
             selectedValue: [],
+            activeCodeValue: [],
 
             operationMap: {
                 canCancel: {
@@ -71,12 +73,6 @@ export default {
                 ...this.propsObj
             };
         },
-        filterable () {
-            return this.selfPropsObj._filterable;
-        },
-        changeOnSelect () {
-            return this.selfPropsObj._changeOnSelect;
-        },
         saveKey () {
             return this.selfPropsObj._saveKey;
         },
@@ -86,12 +82,18 @@ export default {
         nameKey () {
             return this.selfPropsObj._nameKey;
         },
-        renderFormat () {
-            return this.selfPropsObj._renderFormat;
-        },
         resourceKey () {
             return this.selfPropsObj._resourceKey;
         },
+        filterable () {
+            return this.selfPropsObj._filterable;
+        },
+        changeOnSelect () {
+            return this.selfPropsObj._changeOnSelect;
+        },
+        renderFormat () {
+            return this.selfPropsObj._renderFormat;
+        },
 
         canUseModeSwitch () {
             return this.searchName.trim() &&
@@ -107,15 +109,8 @@ export default {
                     将不支持使用模式切换，因为此时平级方式不方便，不适用`;
         },
 
-        inputStr: {
-            get () {
-                return this.activeStr;
-            },
-            set (str) {
-                if (!str) {
-                    this.$emit("clear", []);
-                }
-            }
+        initData () {
+            return this.data;
         },
         matchFunc () {
             return node => {
@@ -141,48 +136,44 @@ export default {
                 };
             });
         },
+        // activeCodeValue () {
+        //     return this.$getTreeLinealDatas(this.activeValue, this.data, this.valueKey, this.saveKey);
+        // },
         // 选中项 -各级数据对象集合
         selectedOptions () {
             return this.$getTreeLinealDatas(this.selectedValue, this.showTreeData, undefined, this.saveKey);
         },
         // 选中项 -最后一级数据对象
-        selectedLastOption () {
+        selectedObj () {
             return this.selectedOptions.slice(-1)[0];
         },
         // 选中项 -名字
         selectedName () {
-            return this.selectedLastOption ? this.selectedLastOption[this.nameKey] : "";
+            return this.selectedObj ? this.selectedObj[this.nameKey] : "";
         }
     },
-    created () { },
+    created () {
+        this.cascaderPickerInit();
+    },
     methods: {
-        clickInput () {
+        cascaderPickerInit () {
+            this.selectedValue = this.activeValue;
+            this.activeCodeValue = this.$getTreeLinealDatas(this.activeValue, this.data, this.valueKey, this.saveKey);
+        },
+
+        clickInput (e) {
             if (!this.selfPropsObj._disabled) {
                 this.showModal = true;
+            } else {
+                e.stopPropagation();
             }
         },
-        clickItem (node) {
-            this.oldSelectedValue = this.selectedValue;
-            this.selectedValue = node.keys;
-            // 避免重复点击
-            if (JSON.stringify(this.selectedValue) !== JSON.stringify(this.oldSelectedValue)) {
-                const obj = {
-                    value: this.selectedValue,
-                    selectedOptions: this.selectedOptions,
-                    tabIndex: this.curTabIndex
-                };
-                this.$emit("change", obj);
-                !node.children.length && this.$emit("finish", obj);
-            }
-
-            this.clickItemCb && this.clickItemCb(node);
-        },
         clickCancel () {
             this.showModal = false;
         },
         clickConfirm () {
             if (this.selectedValue.length && this.selectedOptions.length) {
-                if (!this.changeOnSelect && !this.selectedLastOption.isLeaf) {
+                if (!this.changeOnSelect && !this.selectedObj.isLeaf) {
                     this.$Message.error({
                         content: "请选择到末级数据！",
                         duration: 2
@@ -196,7 +187,24 @@ export default {
                     duration: 2
                 });
             }
+        },
+        getDescription (value = []) {
+            if (value.length) {
+                this.$https({
+                    url: {
+                        module: "sheet",
+                        name: "getResourceDescription"
+                    },
+                    params: {
+                        resourceKey: this.resourceKey,
+                        nodeKeys: value
+                    },
+                    callback: data => {
+                        this.description = data;
+                        this.selectedObj.description = data;
+                    }
+                });
+            }
         }
-
     }
 };

package/src/components/controls/{base/DshSelect → mixins}/selectMixin.js

@@ -1,4 +1,4 @@
-import controlMixin from "../../controlMixin.js";
+import controlMixin from "./controlMixin.js";
 import { resourceData } from "bri-datas";
 
 export default {

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

@@ -117,7 +117,7 @@
 </template>
 
 <script>
-    import controlMixin from "../controlMixin.js";
+    import controlMixin from "../mixins/controlMixin.js";
 
     export default {
         name: "BriLabels",

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

@@ -19,7 +19,7 @@
 </template>
 
 <script>
-    import controlMixin from "../controlMixin.js";
+    import controlMixin from "../mixins/controlMixin.js";
 
     export default {
         name: "DshPackage",

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

@@ -68,7 +68,7 @@
 </template>
 
 <script>
-    import controlMixin from "../controlMixin.js";
+    import controlMixin from "../mixins/controlMixin.js";
     import DshBtnModal from "../../small/DshBtnModal.vue";
     import DshCascaderTable from "../../list/DshCascaderTable.vue";
 

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

@@ -82,12 +82,13 @@
             :propsObj="propsObj"
             :importParams="importParams"
             @input="toggleBatchImportModal"
+            @importCb="importCb"
         ></flat-table-import-modal>
     </div>
 </template>
 
 <script>
-    import controlMixin from "../controlMixin.js";
+    import controlMixin from "../mixins/controlMixin.js";
     import DshBtnModal from "../../small/DshBtnModal.vue";
     import BriFlatTable from "../../list/BriFlatTable.vue";
     import flatTableImportModal from "./flatTableImportModal.vue";
@@ -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 () {