bri-components 1.3.96 → 1.3.98

package/package.json

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

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

@@ -1,7 +1,8 @@
 <template>
     <div :class="{
         uploadList: true,
-        [`uploadList-${showMode}`]: true
+        [`uploadList-${showMode}`]: true,
+        [`uploadList-${propsObj._fileType}`]: true
     }">
         <!-- 普通文本模式 -->
         <template v-if="showMode ==='old'">
@@ -9,38 +10,57 @@
             <div
                 v-if="files.length"
                 ref="viewerImage"
-                class="uploadList-list"
+                :class="['uploadList-list', `uploadList-list-${propsObj._fileType}`]"
             >
                 <div
                     v-for="(fileItem, fileIndex) in files"
                     :key="fileItem._key || fileItem._id"
-                    class="item"
+                    :class="{
+                        'item': propsObj._fileType === 'image',
+                        [`item-${propsObj._fileType}`]: true
+                    }"
                 >
                     <!-- 展示图 -->
-                    <div class="item-show">
-                        <img
-                            v-if="fileItem.mimetype.includes('image')"
-                            :data-original="fileItem.url"
-                            :src="$imageResize(fileItem.url, imageResizeConfig)"
-                            :alt="fileItem.name"
-                        >
-                        <img
-                            v-else
-                            :src="getFileImage(fileItem)"
-                            :alt="fileItem.name"
-                        >
-                    </div>
-
-                    <!-- 展示名称 -->
-                    <p class="item-name-title">{{ fileItem.name }}</p>
-
-                    <!-- 图标 -->
-                    <dsh-icons
-                        class="item-action"
-                        item-class="item-action-icon"
-                        :list="$getOperationList(getBtns(fileItem))"
-                        @click="$dispatchEvent($event, fileItem, fileIndex)"
-                    ></dsh-icons>
+                    <template v-if="propsObj._fileType === 'image'">
+                        <div class="item-show">
+                            <img
+                                v-if="fileItem.mimetype.includes('image')"
+                                :data-original="fileItem.url"
+                                :src="$imageResize(fileItem.url, imageResizeConfig)"
+                                :alt="fileItem.name"
+                            >
+                            <img
+                                v-else
+                                :src="getFileImage(fileItem)"
+                                :alt="fileItem.name"
+                            >
+                        </div>
+
+                        <!-- 展示名称 -->
+                        <p class="item-name-title">{{ fileItem.name }}</p>
+
+                        <!-- 图标 -->
+                        <dsh-icons
+                            class="item-action"
+                            item-class="item-action-icon"
+                            :list="$getOperationList(getBtns(fileItem))"
+                            @click="$dispatchEvent($event, fileItem, fileIndex)"
+                        ></dsh-icons>
+                    </template>
+
+                    <template v-else>
+                        <a
+                            :href="fileItem.downloadUrl"
+                            target="black"
+                        >{{ fileItem.name }}</a>
+
+                        <dsh-icons
+                            class="item-file-action"
+                            item-class="item-file-action-icon"
+                            :list="$getOperationList(getBtns(fileItem))"
+                            @click="$dispatchEvent($event, fileItem, fileIndex)"
+                        ></dsh-icons>
+                    </template>
                 </div>
             </div>
 
@@ -352,6 +372,36 @@
                     }
                 }
             }
+
+            // file 模式
+            &-file {
+                flex-direction: column;
+                .item-file {
+                    flex: 0 0 100%;
+                    height: auto;
+                    display: flex;
+                    flex-direction: row;
+                    justify-content: space-between;
+                    align-items: center;
+                    border-radius: 0px;
+                    margin: 0px;
+                    background: transparent;
+                    line-height: 22px;
+                    height: 22px !important;
+                    &:hover {
+                        background: #f4f5fa;
+                    }
+                    a {
+                        text-overflow: ellipsis;
+                        overflow: hidden;
+                    }
+                    .DshIcons {
+                        margin-left: 5px;
+                        color: @textColor;
+                        white-space: nowrap;
+                    }
+                }
+            }
         }
 
         &-inline {

package/src/components/controls/mixins/controlMixin.js

@@ -75,6 +75,17 @@ export default {
         // 值为不是[]类型用的
         curVal: {
             get () {
+                // 原选项变动了或选项动态改变时，过滤掉已不存在的选项值
+                if (!this.isInTable) {
+                    if (["select"].includes(this.controlType)) {
+                        if (!this.$dataType(this.propsObj._filterFunc, "function")) {
+                            this.value[this.controlKey] = this.listData.some(item => item[this.saveKey] === this.value[this.controlKey])
+                                ? this.value[this.controlKey]
+                                : "";
+                        }
+                    }
+                }
+
                 return this.value[this.controlKey];
             },
             set (val) {
@@ -90,6 +101,26 @@ export default {
         // 值为[]类型用的
         curValList: {
             get () {
+                // 原选项变动了或选项动态改变时，过滤掉已不存在的选项值
+                if (!this.isInTable) {
+                    const valList = this.value[this.controlKey] || [];
+                    if ((["select"].includes(this.controlType) && this.multipleMode) || ["checkbox"].includes(this.controlType)) {
+                        this.value[this.controlKey] = valList.some(valKey => !this.listDataKeys.includes(valKey))
+                            ? valList.filter(valKey => this.listDataKeys.includes(valKey))
+                            : valList;
+                    }
+                    // else if (["region", "cascader"].includes(this.controlType)) {
+                    //     this.value[this.controlKey] = this.$getTreeLinealDatas(valList, this.cascaderAllData, undefined, this.saveKey).length
+                    //         ? valList
+                    //         : [];
+                    // }
+                    // else if (["regions", "cascaders"].includes(this.controlType)) {
+                    //     this.value[this.controlKey] = valList.filter(valListItem =>
+                    //         this.$getTreeLinealDatas(valListItem, this.cascaderAllData, undefined, this.saveKey).length
+                    //     );
+                    // }
+                }
+
                 return this.value[this.controlKey] || [];
             },
             set (valList) {
@@ -115,7 +146,7 @@ export default {
         },
         // 字段的真实key
         fieldKey () {
-            return this.controlKey === "_default"
+            return this.isDftSet
                 ? this.value._key
                 : (this.propsObj.__realKey__ || this.controlKey);
         },
@@ -192,6 +223,10 @@ export default {
         // isShare () {
         //     return !!this.propsObj.isShare;
         // },
+        // 是否在设置默认值下
+        isDftSet () {
+            return this.controlKey === "_default";
+        },
         // 在单元格内
         isInTable () {
             return !!this.propsObj.inTable;

package/src/components/controls/mixins/selectMixin.js

@@ -26,6 +26,7 @@ export default {
                 _customData: [],
                 _reverseFilter: false, // 是否反向过滤，默认正向过滤
                 _selectFilterVals: [], // 过滤的数据
+                _selectFilterKey: undefined, // 用作过滤的属性，默认用_saveKey对应的属性
 
                 ...this.propsObj,
                 ...this.commonDealPropsObj
@@ -53,20 +54,27 @@ export default {
         selectFilterVals () {
             return this.selfPropsObj._selectFilterVals;
         },
+        selectFilterKey () {
+            return this.selfPropsObj._selectFilterKey;
+        },
 
         listData () {
             let listData = this.selfPropsObj._data.concat(this.initListData);
-            if (this.selectFilterVals.length) {
-                listData = listData.filter(item =>
+            listData = this.selectFilterVals.length
+                ? listData.filter(item =>
                     this.reverseFilter
-                        ? !this.selectFilterVals.includes(item[this.saveKey])
-                        : this.selectFilterVals.includes(item[this.saveKey])
-                );
-            }
-
-            return this.$dataType(this.selfPropsObj._filterFunc, "function")
+                        ? !this.selectFilterVals.includes(item[this.selectFilterKey || this.saveKey])
+                        : this.selectFilterVals.includes(item[this.selectFilterKey || this.saveKey])
+                )
+                : listData;
+            listData = this.$dataType(this.selfPropsObj._filterFunc, "function")
                 ? this.selfPropsObj._filterFunc(listData, this.selfPropsObj, this.value)
                 : listData;
+
+            return listData;
+        },
+        listDataKeys () {
+            return this.listData.map(item => item[this.saveKey]);
         },
         curValObj () {
             return this.getItemObj(this.curVal);

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

@@ -164,7 +164,7 @@
             clickInput () {
                 if (this.finalCanEdit) {
                     if (!this.renderList) {
-                        if (this.controlKey === "_default") {
+                        if (this.isDftSet) {
                             this.listData = this.originLabels.map(item => {
                                 return {
                                     ...item,

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

@@ -306,11 +306,10 @@
                     callback: data => {
                         this.loading = false;
                         this.departmentList = this.listFilterVals.length
-                            ? data.list.filter(
-                                item =>
-                                    this.reverseFilter
-                                        ? !this.listFilterVals.includes(item._key)
-                                        : this.listFilterVals.includes(item._key)
+                            ? data.list.filter(item =>
+                                this.reverseFilter
+                                    ? !this.listFilterVals.includes(item._key)
+                                    : this.listFilterVals.includes(item._key)
                             )
                             : data.list;
                     }

package/src/components/form/DshForm.vue

@@ -348,8 +348,12 @@
                 let rules = [];
                 let ruleConfig = this.$getFieldRuleConfig(formItem);
 
-                // 数据格式校验
-                if (ruleConfig.type) {
+                // 数据格式校验 -关联表格类型的会被过滤掉
+                if (
+                    ruleConfig.type &&
+                    (!ruleConfig.fields || Object.entries(ruleConfig.fields).every(arr => !arr[1].transform)) &&
+                    (!["date"].includes(formItem._type) || !["daterange", "datetimerange"].includes(formItem._dateType))
+                ) {
                     rules.push({
                         message: `${formItem._name}数据格式有错!`,
                         trigger: "blur, change",

package/src/components/list/DshCascaderTable.vue

@@ -22,10 +22,10 @@
                 }"
             >
                 <!-- 表头 -->
-                <dsh-render :render="getTableHeadRender()"></dsh-render>
+                <dsh-render :render="tableHeadRender"></dsh-render>
 
                 <!-- 数据行 -->
-                <dsh-render :render="getTableBodyRender()"></dsh-render>
+                <dsh-render :render="tableBodyRender"></dsh-render>
             </div>
         </div>
 
@@ -61,10 +61,10 @@
                         }"
                     >
                         <!-- 表头 -->
-                        <dsh-render :render="getTableHeadRender()"></dsh-render>
+                        <dsh-render :render="tableHeadRender"></dsh-render>
 
                         <!-- 数据行 -->
-                        <dsh-render :render="getTableBodyRender()"></dsh-render>
+                        <dsh-render :render="tableBodyRender"></dsh-render>
                     </div>
                 </div>
             </div>