bri-components 1.2.11 → 1.2.13

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.2.11",
+    "version": "1.2.13",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",
@@ -32,11 +32,11 @@
     "dependencies": {
         "axios": "^0.23.0",
         "ali-oss": "^6.13.1",
-        "bri-datas": "^1.0.8-0",
+        "bri-datas": "1.0.14",
         "jshint": "^2.12.0",
         "minio": "^7.0.26",
         "stream": "^0.0.2",
-        "view-design": "^4.6.0",
+        "view-design": "4.6.0",
         "viewerjs": "^1.10.2",
         "vue-codemirror": "^4.0.6",
         "vue-cropperjs": "^4.1.0",

package/src/components/controls/BriControlInput.vue

@@ -18,6 +18,14 @@
                 @delete="clickDeleteItem"
             ></dsh-tags>
 
+            <!-- 对象的 地理坐标 -->
+            <div
+                v-else-if="$dataType(value, 'object')"
+                class="text"
+            >
+                {{ value._name || value.name || value.lnglat }}
+            </div>
+
             <!-- 文字的 -->
             <div
                 v-else
@@ -53,13 +61,12 @@
 <script>
     export default {
         name: "BriControlInput",
-        mixins: [],
         props: {
             canEdit: {
                 type: Boolean,
                 default: true
             },
-            value: [Array, String],
+            value: [Array, Object, String],
             inputIcon: String,
             propsObj: {
                 type: Object,
@@ -77,10 +84,10 @@
         created () {},
         methods: {
             clickDeleteItem (...params) {
-                this.$emit("clickDeleteItem", ...params);
+                this.$emit("deleteItem", ...params);
             },
             clickClear () {
-                this.$emit("clickClear");
+                this.$emit("clear");
             }
         }
     };

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

@@ -10,9 +10,9 @@
         v-else
         :class="[
             prefixCls,
-            'BriUpload',
             `BriUpload-${showType}`,
             {
+                'BriUpload': true,
                 'BriUpload-disabled': canEdit && !finalCanEdit,
                 'BriUpload-readonly': !canEdit,
                 'BriUpload-unit': !canEdit && isUnitShow
@@ -74,14 +74,12 @@
         <!-- 列表 -->
         <slot name="list">
             <upload-list
-                v-if="showUploadList"
                 :canEdit="finalCanEdit"
                 :files="curValList"
                 :emptyShowVal="emptyShowVal"
                 :showType="showType"
                 :propsObj="propsObj"
-                @on-file-remove="clickDeteItem"
-                @on-file-preview="clickPreviewItem"
+                @deleteItem="clickDeteItem"
             ></upload-list>
         </slot>
     </div>
@@ -105,10 +103,6 @@
             uploadList
         },
         props: {
-            showUploadList: {
-                type: Boolean,
-                default: true
-            },
             type: {
                 type: String,
                 default: "drag"
@@ -154,23 +148,24 @@
             },
 
             accept () {
-                let documentType = ["txt", "doc", "xls", "ppt", "docx", "xlsx", "pptx", "pdf"];
-                let imageType = ["jpg", "png", "gif", "jpeg", "tiff", "swf"];
-                let videoType = ["flv", "rmvb", "mp4", "mvb"];
-                let audioType = ["wma", "mp3", "m4a"];
-                let packageType = ["rar", "zip"];
+                const documentType = ["txt", "doc", "xls", "ppt", "docx", "xlsx", "pptx", "pdf"];
+                const imageType = ["jpg", "png", "gif", "jpeg", "tiff", "swf"];
+                const videoType = ["flv", "rmvb", "mp4", "mvb"];
+                const audioType = ["wma", "mp3", "m4a"];
+                const packageType = ["rar", "zip"];
 
                 // 限制文件格式
-                let format = [];
-                if (this.fileType === "image") {
-                    format = imageType;
-                } else {
-                    format = [...documentType, ...imageType, ...videoType, ...audioType, ...packageType];
-                }
-                format = format.map(item => {
-                    return `.${item}`;
-                });
-                return format.join();
+                return (
+                    this.fileType === "image"
+                        ? imageType
+                        : [
+                            ...documentType,
+                            ...imageType,
+                            ...videoType,
+                            ...audioType,
+                            ...packageType
+                        ]
+                ).map(item => `.${item}`).join();
             },
             classes () {
                 return [
@@ -192,16 +187,11 @@
                 this.curValList.splice(this.curValList.indexOf(fileItem), 1);
                 this.curValList = [...this.curValList];
             },
-            clickPreviewItem (fileItem) {
-                if (fileItem.status === "finished") {
-
-                }
-            },
             successCb (res, data) {
                 if (data.res === 0) {
                     this.curValList = [
                         ...this.curValList,
-                        ...data.data
+                        data.data
                     ];
                 } else {
                     this.$Message.error({

package/src/components/controls/base/BriUpload/uploadList.vue

@@ -5,10 +5,11 @@
     >
         <!-- 普通文本模式 -->
         <template v-if="showType ==='old'">
+            <!-- 有值 -->
             <div
-                v-if="files && files.length > 0"
-                class="uploadList-list"
+                v-if="files.length"
                 ref="viewerImage"
+                class="uploadList-list"
             >
                 <div
                     v-for="fileItem in files"
@@ -52,6 +53,7 @@
                 </div>
             </div>
 
+            <!-- 无值 -->
             <div
                 v-else
                 class="uploadList-nodata"
@@ -63,8 +65,9 @@
 
         <!-- 自定义新的展示方式 -->
         <template v-else>
+            <!-- 有值 -->
             <div
-                v-if="files && files.length > 0"
+                v-if="files.length"
                 ref="viewerImage"
                 class="uploadList-inline-list"
             >
@@ -94,10 +97,13 @@
                 </div>
             </div>
 
+            <!-- 无值 -->
             <span
                 v-else
                 class="uploadList-inline-nodata"
-            >{{ noText }}</span>
+            >
+                {{ noText }}
+            </span>
         </template>
     </div>
 </template>
@@ -138,7 +144,7 @@
                         name: "删除",
                         icon: "ios-trash-outline",
                         size: "16",
-                        event: "handleRemove",
+                        event: "clickDeleteItem",
                         canShow: this.canEdit
                     },
                     download: {
@@ -153,7 +159,7 @@
                         icon: "ios-eye-outline",
                         size: "22",
                         type: "updateColor",
-                        event: "handlePreview",
+                        event: "clickPreview",
                         canShow: undefined
                     }
                 };
@@ -182,16 +188,19 @@
                 return Object.keys(this.operationMap).filter(attr => this.operationMap[attr].canShow);
             },
 
+            // 点击删除某项
+            clickDeleteItem (operationItem, fileItem) {
+                this.$emit("deleteItem", fileItem);
+            },
             // 点击文件预览 -file服务器的数据列表
-            handlePreview (operation, file) {
+            clickPreview (operationItem, fileItem) {
                 if (this.propsObj._fileType === "image") {
-                    this.previewImage(file.url);
-                } else if (file.mimetype.indexOf("image") > -1) {
-                    this.previewImage(file.url);
+                    this.previewImage(fileItem.url);
+                } else if (fileItem.mimetype.indexOf("image") > -1) {
+                    this.previewImage(fileItem.url);
                 } else {
-                    window.open(file.url);
+                    window.open(fileItem.url);
                 }
-                this.$emit("on-file-preview", file);
             },
             // 图片预览
             previewImage (src) {
@@ -212,58 +221,54 @@
                 viewer.show();
             },
 
-            handleDownload (operation, file) {
-                this.downloadFile(file.url, file);
-            },
-            downloadFile (url, file) {
+            // 下载
+            handleDownload (operationItem, fileItem) {
                 axios
-                    .get(url, {
+                    .get(fileItem.url, {
                         responseType: "blob"
                     })
                     .then((res) => {
                         if (window.navigator.msSaveOrOpenBlob) {
                             // 兼容IE10
-                            navigator.msSaveBlob(res, file.name);
+                            navigator.msSaveBlob(res, fileItem.name);
                         } else {
                             const href = URL.createObjectURL(res.data); // 创建新的URL表示指定的blob对象
                             const a = document.createElement("a");
                             a.style.display = "none";
                             a.href = href; // 指定下载链接
-                            a.download = file.name; // 指定下载文件名
+                            a.download = fileItem.name; // 指定下载文件名
                             a.click();
                             URL.revokeObjectURL(a.href); // 释放URL对象
                             a.remove();
                         }
                 });
             },
-            handleRemove (operation, file) {
-                this.$emit("on-file-remove", file);
-            },
-            format (file) {
-                const format = file.name.split(".").pop().toLocaleLowerCase() || "";
-                let type = "ios-document-outline";
 
-                if (["gif", "jpg", "jpeg", "png", "bmp", "webp"].indexOf(format) > -1) {
-                    type = "ios-image";
-                }
-                if (["mp4", "m3u8", "rmvb", "avi", "swf", "3gp", "mkv", "flv"].indexOf(format) > -1) {
-                    type = "ios-film";
-                }
-                if (["mp3", "wav", "wma", "ogg", "aac", "flac"].indexOf(format) > -1) {
-                    type = "ios-musical-notes";
-                }
-                if (["doc", "txt", "docx", "pages", "epub", "pdf"].indexOf(format) > -1) {
-                    type = "md-document";
-                }
-                if (["numbers", "csv", "xls", "xlsx"].indexOf(format) > -1) {
-                    type = "ios-stats";
-                }
-                if (["keynote", "ppt", "pptx"].indexOf(format) > -1) {
-                    type = "ios-videocam";
-                }
+            // format (fileItem) {
+            //     const format = fileItem.name.split(".").pop().toLocaleLowerCase() || "";
+            //     let type = "ios-document-outline";
 
-                return type;
-            },
+            //     if (["gif", "jpg", "jpeg", "png", "bmp", "webp"].indexOf(format) > -1) {
+            //         type = "ios-image";
+            //     }
+            //     if (["mp4", "m3u8", "rmvb", "avi", "swf", "3gp", "mkv", "flv"].indexOf(format) > -1) {
+            //         type = "ios-film";
+            //     }
+            //     if (["mp3", "wav", "wma", "ogg", "aac", "flac"].indexOf(format) > -1) {
+            //         type = "ios-musical-notes";
+            //     }
+            //     if (["doc", "txt", "docx", "pages", "epub", "pdf"].indexOf(format) > -1) {
+            //         type = "md-document";
+            //     }
+            //     if (["numbers", "csv", "xls", "xlsx"].indexOf(format) > -1) {
+            //         type = "ios-stats";
+            //     }
+            //     if (["keynote", "ppt", "pptx"].indexOf(format) > -1) {
+            //         type = "ios-videocam";
+            //     }
+
+            //     return type;
+            // },
             // 获取不同类型文件的图片
             getFileImage (item) {
                 if (!item.mimetype) {

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

@@ -77,15 +77,14 @@
                         :clearable="selfPropsObj._clearable"
                         :size="selfPropsObj._size"
                         :filterable="selfPropsObj._filterable"
+                        :render-format="selfPropsObj._renderFormat"
                         :transfer="selfPropsObj._transfer"
                         :transfer-class-name="selfPropsObj._transferClassName"
                         :load-data="loadData"
                         @on-visible-change="visibleChange"
                         @on-change="changeVal"
                         @click.stop="clickCascader"
-                    >
-                        <slot></slot>
-                    </Cascader>
+                    ></Cascader>
                 </template>
             </template>
         </template>
@@ -193,8 +192,10 @@
         computed: {
             selfPropsObj () {
                 return {
-                    _filterable: true,
                     _showMode: false,
+                    _changeOnSelect: false, // 每级菜单都可取值
+                    _filterable: true,
+                    _renderFormat: (label) => label.join(this.propsObj._joinSymbol || "/"),
                     _transfer: true,
                     ...this.propsObj,
                     ...this.commonDealPropsObj
@@ -349,9 +350,6 @@
                 if (this.isVisible || !val.length) {
                     this.curValList = val;
                 }
-
-                // 注：...params 参数不可去单独使用地区组件时调用
-                this.$emit("change", this.value[this.controlKey], ...params);
             }
         },
         watch: {

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

@@ -175,9 +175,8 @@
         },
         created () {},
         methods: {
-            // 下拉框的选择
+            // 下拉框的change (下拉方式时用v-model触发change有问题，组件进来如果值不为空的，就会v-model返值一次)
             changeSelect (item) {
-                // 下拉方式时用v-model触发change有问题，组件进来如果值不为空的，就会v-model返值一次
                 if (this.curValList.includes(item.value)) {
                     let itemIndex = this.curValList.findIndex(valItem => valItem === item.value);
                     this.curValList.splice(itemIndex, 1);

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

@@ -14,7 +14,7 @@
                     'DshCoordinates-edit': true
                 }"
                 :canEdit="finalCanEdit"
-                :value="curVal.name"
+                :value="curVal"
                 :inputIcon="inputIcon"
                 :propsObj="selfPropsObj"
                 @clear="clickClear"
@@ -219,14 +219,6 @@
                     this.change();
                 }
             },
-            curLnglat: {
-                get () {
-                    return this.curVal.lnglat || [];
-                },
-                set (val) {
-                    this.curVal.lnglat = val;
-                }
-            },
             showVal () {
                 return this.$isEmptyData(this.curVal)
                     ? this.emptyShowVal
@@ -335,7 +327,7 @@
                 this.mouseTool.on("draw", this.handleMouseToolCallback);
                 // 设置默认坐标
                 if (!this.$isEmptyData(this.newVal)) {
-                    this.handleAddMarker(this.curLnglat, true);
+                    this.handleAddMarker(this.newVal.lnglat, true);
 
                     if (this.showType === "multipleMarker") { // 多选打开绘图功能
                         this.finalCanEdit && this.handleOpenDraw();
@@ -358,13 +350,13 @@
                     }
                     // 设置坐标
                     let lnglat = e.obj.getPosition();
-                    this.curLnglat.push([lnglat.lng, lnglat.lat]);
+                    this.newVal.lnglat.push([lnglat.lng, lnglat.lat]);
                     this.getRegeoCode();
 
                 } else {
                     this.plot = e.obj;
                     // 设置坐标
-                    this.curLnglat.push(...e.obj.getPath().map(lnglat => [lnglat.lng, lnglat.lat]));
+                    this.newVal.lnglat.push(...e.obj.getPath().map(lnglat => [lnglat.lng, lnglat.lat]));
                     this.getRegeoCode();
                     this.handleCloseDraw();
                 }
@@ -434,10 +426,10 @@
                     if (this.showType === "marker") {
                         this.handleRmoveMarker();
                         this.handleCloseDraw();
-                        this.curLnglat = [location];
+                        this.newVal.lnglat = [location];
                         this.getRegeoCode();
                     } else if (this.showType === "multipleMarker") {
-                        this.curLnglat.push(location);
+                        this.newVal.lnglat.push(location);
                         this.getRegeoCode();
                     }
                     centerView && this.map.setFitView(this.marker);
@@ -471,7 +463,7 @@
             getRegeoCode (value, scuessFun) {
                 let params = {
                     key: window.config.amapKey,
-                    location: this.curLnglat[0],
+                    location: this.newVal.lnglat[0],
                     radius: 1000,
                     extensions: "base",
                     batch: false,

package/src/components/controls/controlMixin.js

@@ -50,10 +50,10 @@ export default {
         // 值为[]类型用的
         curValList: {
             get () {
-                return (this.value[this.controlKey] || []).filter(item => !!item);
+                return this.value[this.controlKey] || [];
             },
             set (val) {
-                this.value[this.controlKey] = val;
+                this.$set(this.value, this.controlKey, val);
                 this.change();
             }
         },
@@ -142,6 +142,9 @@ export default {
         },
         entityKey () {
             return this.propsObj.entityKey;
+        },
+        modKey () {
+            return this.propsObj.modKey;
         }
     },
     methods: {

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

@@ -147,7 +147,6 @@
                     ...this.commonDealPropsObj
                 };
             },
-
             labelType () {
                 return this.selfPropsObj._labelType;
             },

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

@@ -73,6 +73,7 @@
                     <div class="content">
                         <!-- 左 部门 -->
                         <department-menu
+                            v-if="showModal"
                             class="content-menu"
                             :canEdit="false"
                             :list="departmentList"
@@ -288,7 +289,23 @@
             closeModal () {
                 this.showModal = false;
             },
-            init () {
+
+            clickInput () {
+                if (this.finalCanEdit) {
+                    this.openModal();
+                    this.newValList = this.$deepCopy(this.curValList);
+                    this.initModal();
+                }
+            },
+            clickDeleteItem (deleteItem) {
+                this.curValList = this.curValList.filter(item => item._key !== deleteItem._key);
+            },
+            clickClear () {
+                this.curValList = [];
+            },
+
+            /* ---------- 弹框里 --------- */
+            initModal () {
                 this.searchData = {
                     name: ""
                 };
@@ -297,7 +314,6 @@
                 this.getUserListData();
                 this.getDepartmentListData();
             },
-
             search () {
                 this.pagePropsObj.page = 1;
                 this.getUserListData();
@@ -314,21 +330,6 @@
                     this.getUserListData();
                 }
             },
-            clickInput () {
-                if (this.finalCanEdit) {
-                    this.openModal();
-                    this.newValList = this.$deepCopy(this.curValList);
-                    this.init();
-                }
-            },
-            clickDeleteItem (deleteItem) {
-                this.curValList = this.curValList.filter(item => item._key !== deleteItem._key);
-            },
-            clickClear () {
-                this.curValList = [];
-            },
-
-            /* ---------- 弹框里 --------- */
             clickCheckAll () {
                 if (this.curCheckAll) {
                     this.newValList = this.newValList.filter(newItem =>

package/src/components/list/BriFlatTable.vue

@@ -237,18 +237,26 @@
                         },
                         renderHeaderCell: ({ column }, h) => {
                             return h("span", [
-                                column._required && h("i", { style: { color: "#ed4014" } }, "*"),
+                                column._required && h("i", {
+                                    style: {
+                                        color: "#ed4014"
+                                    }
+                                }, "*"),
                                 h("span", column.title),
                                 column._description &&
                                     h("Tooltip", {
-                                        style: { display: "inline-block" },
+                                        style: {
+                                            display: "inline-block"
+                                        },
                                         props: {
                                             content: column._description,
                                             transfer: true,
                                             maxWidth: 200
                                         },
                                         scopedSlots: {
-                                            default: props => h("i", { class: "table-head-description ivu-icon bico-font bico-explain" })
+                                            default: props => h("i", {
+                                                class: "table-head-description ivu-icon bico-font bico-explain"
+                                            })
                                         }
                                     })
                             ]);

package/src/components/list/DshCascaderTable.vue

@@ -80,6 +80,7 @@
                                         class="table-row"
                                     >
                                         <template v-for="col in rowColumnsArr[rowIndex]">
+                                            <!-- 树节点单元格、汇总单元格 -->
                                             <td
                                                 v-if="['tree', 'summary'].includes(col.colType)"
                                                 :key="col._key"

package/src/components/list/DshPage.vue

@@ -29,7 +29,7 @@
             mode: {
                 type: String,
                 default: "small",
-                validator: function (value) {
+                validator (value) {
                     return ["simple", "default", "small"].indexOf(value) !== -1;
                 }
             },
@@ -49,34 +49,32 @@
         },
         computed: {
             obj () {
-                let obj = {};
-                if (this.mode === "default") {
-                    obj = {
+                const modeMap = {
+                    default: {
                         showTotal: true,
                         showElevator: false,
                         showSizer: true
-                    };
-                } else if (this.mode === "small") {
-                    obj = {
+                    },
+                    small: {
                         showTotal: true,
                         showElevator: false,
                         showSizer: true
-                    };
-                } else if (this.mode === "simple") {
-                    obj = {
+                    },
+                    simple: {
                         // // 简洁分页不能使用总数、电梯和切换数量
                         // showTotal: true,
                         // showElevator: false,
                         // showSizer: false
-                    };
-                }
+                    }
+                };
+
                 return {
                     page: 1,
                     pagesize: 10,
-                    pagesizeOpts: [10, 12, 15, 20, 30, 40, 50],
+                    pagesizeOpts: [10, 15, 20, 30, 40, 50],
                     transfer: false,
                     placement: "bottom",
-                    ...obj,
+                    ...(modeMap[this.mode] || {}),
                     ...this.propsObj
                 };
             },