bri-components 1.6.17 → 1.6.19

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.6.17",
+    "version": "1.6.19",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",
@@ -30,11 +30,16 @@
         "lib:prod": "webpack --config build/webpack.lib.prod.config.js"
     },
     "dependencies": {
+        "@turf/turf": "^7.4.0",
         "ali-oss": "^6.13.1",
         "axios": "^0.23.0",
-        "bri-datas": "^1.5.4",
+        "bri-datas": "^1.5.22",
         "jshint": "^2.12.0",
         "jsonlint": "^1.6.3",
+        "leaflet": "^1.9.4",
+        "mars2d": "^3.4.2",
+        "mars3d": "^3.11.5",
+        "mars3d-cesium": "^1.143.0",
         "minio": "7.1.0",
         "stream": "^0.0.2",
         "video.js": "^8.23.3",

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

@@ -87,7 +87,10 @@
                 <!-- 内容 -->
                 <div class="wrap-content">
                     <!-- 选中项tabs -->
-                    <div class="wrap-content-tabs">
+                    <div
+                        v-if="!isCheckboxMode"
+                        class="wrap-content-tabs"
+                    >
                         <span
                             v-for="(tabItem, tabIndex) in selectedLinealDatas"
                             :key="tabIndex"
@@ -111,8 +114,46 @@
                             v-if="showTreeData.length"
                             class="wrap-content-list-menu"
                         >
+                            <!-- 多选框方式（multipleMode 且 _cascaderLevel === 1） -->
+                            <template v-if="isCheckboxMode">
+                                <!-- 全选 -->
+                                <div
+                                    class="item item-select-all"
+                                    @click="clickSelectAll"
+                                >
+                                    <span class="item-checkbox">
+                                        <Checkbox
+                                            :value="isAllSelected"
+                                            :indeterminate="isIndeterminate"
+                                        ></Checkbox>
+                                    </span>
+                                    <span class="item-name">全选</span>
+                                </div>
+
+                                <div
+                                    v-for="nodeItem in showTreeData"
+                                    :key="nodeItem[valueKey]"
+                                    :class="{
+                                        'item': true,
+                                        'item-active': isNodeChecked(nodeItem),
+                                        'item-disabled': nodeItem.disabled
+                                    }"
+                                    @click="clickCheckboxItem(nodeItem)"
+                                >
+                                    <span class="item-checkbox">
+                                        <Checkbox
+                                            :value="isNodeChecked(nodeItem)"
+                                            :disabled="nodeItem.disabled"
+                                        ></Checkbox>
+                                    </span>
+                                    <span class="item-name">
+                                        {{ nodeItem[nameKey] }}
+                                    </span>
+                                </div>
+                            </template>
+
                             <!-- 拍平方式 -->
-                            <template v-if="useFlatMode">
+                            <template v-else-if="useFlatMode">
                                 <div
                                     v-for="nodeItem in showFlatData"
                                     :key="nodeItem[valueKey]"
@@ -196,6 +237,22 @@
             };
         },
         computed: {
+            isCheckboxMode () {
+                return this.multipleMode && this.selfPropsObj._cascaderLevel === "1";
+            },
+            isAllSelected () {
+                return this.showTreeData.length > 0 &&
+                    this.showTreeData.every(node => this.selectedValueArr.some(
+                        val => JSON.stringify(val) === JSON.stringify(node.keys)
+                ));
+            },
+            isIndeterminate () {
+                const checkedCount = this.showTreeData.filter(node =>
+                    this.selectedValueArr.some(val => JSON.stringify(val) === JSON.stringify(node.keys))
+                ).length;
+                return checkedCount > 0 && checkedCount < this.showTreeData.length;
+            },
+
             selectedLinealDatas () {
                 const arr = this.selectedOptions.map((item, index, list) => {
                     return {
@@ -269,6 +326,56 @@
                 if (this.searchMode === "default" && node.children.length) {
                     this.curTabIndex = this.curTabIndex + 1;
                 }
+            },
+
+            isNodeChecked (node) {
+                return this.selectedValueArr.some(val => JSON.stringify(val) === JSON.stringify(node.keys));
+            },
+            clickCheckboxItem (node) {
+                if (node.disabled) return;
+                const index = this.selectedValueArr.findIndex(val => JSON.stringify(val) === JSON.stringify(node.keys));
+                if (index === -1) {
+                    this.selectedValueArr = [...this.selectedValueArr, node.keys];
+                } else {
+                    this.selectedValueArr = this.selectedValueArr.filter((_, i) => i !== index);
+                }
+            },
+            clickSelectAll () {
+                if (this.isAllSelected) {
+                    this.selectedValueArr = [];
+                } else {
+                    this.selectedValueArr = this.showTreeData
+                        .filter(node => !node.disabled)
+                        .map(node => node.keys);
+                }
+            },
+            clickConfirm () {
+                if (this.isCheckboxMode) {
+                    if (this.selectedValueArr.length) {
+                        this.$emit("confirmMul", this.selectedValueArr, this.selectedOptionsArr);
+                    } else {
+                        this.$Message.error({
+                            content: "请选择数据！",
+                            duration: 2
+                        });
+                    }
+                } else {
+                    if (this.selectedValue.length && this.selectedOptions.length) {
+                        if (!this.changeOnSelect && !this.selectedObj.isLeaf) {
+                            this.$Message.error({
+                                content: "请选择到末级数据！",
+                                duration: 2
+                            });
+                        } else {
+                            this.$emit("confirm", this.selectedValue, this.selectedOptions);
+                        }
+                    } else {
+                        this.$Message.error({
+                            content: "请选择数据！",
+                            duration: 2
+                        });
+                    }
+                }
             }
         }
     };
@@ -375,6 +482,13 @@
                                 justify-content: space-between;
                                 align-items: center;
 
+                                &-checkbox {
+                                    margin-right: 5px;
+                                    display: flex;
+                                    align-items: center;
+                                    flex-shrink: 0;
+                                }
+
                                 &-name {
                                     flex: 1;
                                     min-width: 0px;
@@ -402,6 +516,12 @@
                                         color: @textColor-disabled;
                                     }
                                 }
+
+                                &-select-all {
+                                    border-bottom: 1px solid @borderColor;
+                                    margin-bottom: 4px;
+                                    font-weight: 500;
+                                }
                             }
                         }