bri-components 1.2.48 → 1.2.50

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

@@ -0,0 +1,73 @@
+import controlMixin from "../../controlMixin.js";
+import DshCheckbox from "../DshSelect/DshCheckbox.vue";
+
+export default {
+    mixins: [
+        controlMixin
+    ],
+    components: {
+        DshCheckbox
+    },
+    props: {},
+    data () {
+        return {};
+    },
+    computed: {
+        switchPropsObj () {
+            return {
+                loading: false, // 是否为加载状态
+                _openColor: this.$appData.themeColor, // 打开时的背景色
+                _closeColor: "#ccc", // 关闭时的背景色
+                _openValue: true, // 打开时对应的值
+                _closeValue: false, // 关闭时对应的值
+
+                ...this.propsObj,
+                ...this.commonDealPropsObj,
+
+                _openText: this.propsObj._openText || "是", // 此行放在 ...this.propsObj的下面目的是，处理_openText为空字符串的情况
+                _closeText: this.propsObj._closeText || "否",
+                _disabled: this.propsObj._disabled || !this.finalCanEdit
+            };
+        },
+        mulPropsObj () {
+            return {
+                ...this.propsObj,
+                _optionKind: "flat",
+                _data: [
+                    {
+                        _key: "true",
+                        name: this.selfPropsObj._openText,
+                        color: this.selfPropsObj._openColor
+                    },
+                    {
+                        _key: "false",
+                        name: this.selfPropsObj._closeText,
+                        color: this.selfPropsObj._closeColor
+                    }
+                ]
+            };
+        },
+        showStyle () {
+            return !this.$isEmptyData(this.curVal)
+                ? {
+                    backgroundColor: this.curVal === true ? "#d3f3dc" : "#FDEDED",
+                    color: this.curVal === true ? "#37C45E" : "#E83636",
+                    display: "inline-block",
+                    "max-width": "100%",
+                    padding: "0px 6px",
+                    "border-radius": "4px"
+                }
+                : {};
+        },
+
+        showVal () {
+            return this.$isEmptyData(this.curVal)
+                ? this.emptyShowVal
+                : this.curVal === true
+                    ? this.selfPropsObj._openText
+                    : this.selfPropsObj._closeText;
+        }
+    },
+    created () { },
+    methods: {}
+};

package/src/components/controls/controlMap.js

@@ -17,11 +17,11 @@ const componentNameMap = {
     url: "DshInput",
     password: "DshInput",
     serialNumber: "DshInput",
-    texts: "BriInputs",
+    texts: "DshInput",
     number: "DshNumber",
-    numberange: "DshNumberange",
+    numberange: "DshNumber",
     date: "DshDate",
-    daterange: "DshDaterange",
+    daterange: "DshDate",
     switch: "DshSwitch",
     select: "DshSelect",
     checkbox: "DshCheckbox",
@@ -50,15 +50,12 @@ const componentNameMap = {
 // 组件相对路径映射图
 const pathMap = {
     base: {
-        // DshInput: "./base/DshInput.vue", // 全局已注册
-        BriInputs: "./base/BriInputs.vue",
+        // DshInput: "./base/DshInput/DshInput.vue", // 全局已注册
         // DshNumber: "./base/DshNumber/DshNumber.vue", // 全局已注册
-        DshNumberange: "./base/DshNumberange.vue",
-        DshDate: "./base/DshDate.vue",
-        DshDaterange: "./base/DshDaterange.vue",
-        DshSwitch: "./base/DshSwitch.vue",
-        // DshSelect: "./base/DshSelect.vue", // 全局已注册
-        // DshCheckbox: "./base/DshCheckbox.vue", // 全局已注册
+        DshDate: "./base/DshDate/DshDate.vue",
+        DshSwitch: "./base/DshSwitch/DshSwitch.vue",
+        // DshSelect: "./base/DshSelect/DshSelect.vue", // 全局已注册
+        // DshCheckbox: "./base/DshSelect/DshCheckbox.vue", // 全局已注册
         // DshCascader: "./base/DshCascader/DshCascader.vue", // 全局已注册
         BriUpload: "./base/BriUpload/BriUpload.vue",
         DshCoordinates: "./base/DshCoordinates.vue",

package/src/components/controls/controlMixin.js

@@ -35,7 +35,9 @@ export default {
         }
     },
     data () {
-        return {};
+        return {
+            showModal: false
+        };
     },
     computed: {
         // 值为不是[]类型用的
@@ -45,6 +47,7 @@ export default {
             },
             set (val) {
                 this.value[this.controlKey] = val;
+                // this.change();
             }
         },
         // 值为[]类型用的
@@ -52,8 +55,8 @@ export default {
             get () {
                 return this.value[this.controlKey] || [];
             },
-            set (val) {
-                this.$set(this.value, this.controlKey, val);
+            set (valList) {
+                this.$set(this.value, this.controlKey, valList);
                 this.change();
             }
         },
@@ -65,7 +68,9 @@ export default {
                     : "暂无内容";
         },
         showVal () {
-            return this.$isEmptyData(this.curVal) ? this.emptyShowVal : this.curVal;
+            return this.$isEmptyData(this.curVal)
+                ? this.emptyShowVal
+                : this.curVal;
         },
 
         controlKey () {
@@ -83,8 +88,9 @@ export default {
         finalCanEdit () {
             return this.canEdit && (this.propsObj.canEdit == undefined ? true : this.propsObj.canEdit);
         },
+        // 是否为多选模式
         multipleMode () {
-            return this.selfPropsObj ? !!this.selfPropsObj._multiple : !!this.propsObj._multiple;
+            return ["numberange", "daterange", "checkbox", "regions", "cascaders"].includes(this.controlType) || !!this.propsObj._multiple;
         },
         commonDealPropsObj () {
             const selectControlTypes = ["date", "switch", "select", "checkbox", "file", "region", "regions", "cascader", "cascaders", "coordinates", "users", "departments"];
@@ -103,7 +109,7 @@ export default {
                 "bri-control-unit": !this.canEdit && this.isInTable,
                 "bri-control-show": !this.canEdit && !this.isInTable,
 
-                "dsh-ellipsis": !(this.isUnitShow && !!this.propsObj._unitWrap),
+                "dsh-ellipsis": this.isUnitShow,
                 "bri-control-nodata": this.$isEmptyData(this.curVal)
             };
         },
@@ -121,21 +127,22 @@ export default {
         // },
 
         /* 部分条件下 才使用的属性 */
-        isCore () {
-            return !!this.propsObj.isCore;
-        },
         isInTable () {
             return !!this.propsObj.isInTable;
         },
+        isOnSearch () {
+            return !!this.propsObj.onSearch;
+        },
         isUnitUpdate () {
-            return !!this.canEdit && this.isInTable;
+            return this.isInTable && !!this.canEdit;
         },
         isUnitShow () {
-            return !this.canEdit && this.isInTable;
-        },
-        isShare () {
-            return !!this.propsObj.isShare;
+            return this.isInTable && !this.canEdit;
         },
+        // isShare () {
+        //     return !!this.propsObj.isShare;
+        // },
+
         /* 部分控件下 才使用的属性 */
         compKey () {
             return this.propsObj.compKey;
@@ -148,6 +155,12 @@ export default {
         },
         modKey () {
             return this.propsObj.modKey;
+        },
+        // 移动端在用 --只做校验的field框所用的propsObj
+        ruleFieldPropsObj () {
+            return {
+                _rules: this.propsObj._rules
+            };
         }
     },
     methods: {
@@ -156,6 +169,20 @@ export default {
         },
         refChange (...params) {
             this.$emit("refChange", this.value[this.controlKey]);
+        },
+
+        /* ----- 工具方法 ------- */
+        // 切换弹框
+        toggleModal (bool) {
+            this.showModal = bool;
+        },
+        // 打开弹框
+        openModal () {
+            this.showModal = true;
+        },
+        // 关闭弹框
+        closeModal () {
+            this.showModal = false;
         }
     }
 };

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

@@ -151,7 +151,7 @@
                 return this.selfPropsObj._labelType;
             },
             onlySelect () {
-                return this.selfPropsObj._onlySelect;
+                return this.isOnSearch ? true : this.selfPropsObj._onlySelect;
             },
             originLabels () {
                 return this.selfPropsObj._originLabels;
@@ -171,7 +171,7 @@
             clickInput () {
                 if (this.finalCanEdit) {
                     if (!this.renderList) {
-                        if (this.isCore) {
+                        if (this.controlKey === "_default") {
                             this.listData = this.originLabels.map(item => {
                                 return {
                                     ...item,

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

@@ -57,7 +57,7 @@
                 <!-- 上 已选择项 -->
                 <div class="list-selected">
                     <span class="list-selected-label">
-                        已选择{{ multiple ?  `(${newValList.length}个)` : "" }}：
+                        已选择{{ multipleMode ?  `(${newValList.length}个)` : "" }}：
                     </span>
 
                     <span
@@ -95,16 +95,14 @@
 
                     <template v-else>
                         <!-- 树形形式 -->
-                        <div
-                            class="list-center-tree"
-                        >
+                        <div class="list-center-tree">
                             <template v-if="allDepartmentList.length">
                                 <bri-tree-item
                                     v-for="item in allDepartmentList"
                                     :key="item._key"
                                     :value="item"
                                     :changeOnSelect="changeOnSelect"
-                                    :multiple="multiple"
+                                    :multiple="multipleMode"
                                     @on-change="changeSelect"
                                 ></bri-tree-item>
                             </template>
@@ -179,18 +177,13 @@
                     _highSearch: false,
                     _changeOnSelect: true,
                     _searchString: "",
+
                     ...this.propsObj,
                     ...this.commonDealPropsObj
                 };
             },
-            multiple () {
-                return this.selfPropsObj._multiple;
-            },
             highSearch () {
-                return this.selfPropsObj._highSearch;
-            },
-            inputIcon () {
-                return this.multiple ? "ios-people" : "ios-person";
+                return this.isOnSearch ? true : this.selfPropsObj._highSearch;
             },
             changeOnSelect () {
                 return this.selfPropsObj._changeOnSelect;
@@ -198,6 +191,9 @@
             searchString () {
                 return this.selfPropsObj._searchString;
             },
+            inputIcon () {
+                return this.multipleMode ? "ios-people" : "ios-person";
+            },
 
             modalPropsObj () {
                 return {
@@ -259,7 +255,7 @@
             /* ---------- 弹框里 --------- */
             // 弹窗 -选项变化
             changeSelect (selectItem) {
-                this.newValList = this.multiple
+                this.newValList = this.multipleMode
                     ? this.selectKeys.includes(selectItem._key)
                         ? this.newValList.filter(item => item._key !== selectItem._key)
                         : [...this.newValList, selectItem]

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

@@ -120,7 +120,7 @@
                                 >
                                     <!-- 上 全选 -->
                                     <div
-                                        v-if="multiple"
+                                        v-if="multipleMode"
                                         class="content-users-list-checkAll"
                                     >
                                         <Checkbox
@@ -292,15 +292,11 @@
                     ...this.commonDealPropsObj
                 };
             },
-
-            multiple () {
-                return this.selfPropsObj._multiple;
-            },
             highSearch () {
-                return this.selfPropsObj._highSearch;
+                return this.isOnSearch ? true : this.selfPropsObj._highSearch;
             },
             inputIcon () {
-                return this.multiple ? "ios-people" : "ios-person";
+                return this.multipleMode ? "ios-people" : "ios-person";
             },
 
             curCheckAll () {
@@ -379,7 +375,7 @@
                 }
             },
             clickSelectUserItem (curUserItem, bool) {
-                if (this.multiple) {
+                if (this.multipleMode) {
                     if (this.newValList.some(newItem => newItem._key === curUserItem._key)) {
                         this.newValList = this.newValList.filter(newItem => newItem._key !== curUserItem._key);
                     } else {
@@ -442,21 +438,27 @@
                         searchString: this.propsObj.searchString
                     },
                     callback: data => {
-                        let depart = [{
-                            is_leaf: true,
-                            level: 1,
-                            name: "全部",
-                            _key: ""
-                        }];
-                        if (this.highSearch) {
-                            depart.unshift({
+                        this.departmentList = [
+                            ...(
+                                this.highSearch
+                                    ? [
+                                        {
+                                            is_leaf: true,
+                                            level: 1,
+                                            name: "高级选项",
+                                            _key: "_highSearch"
+                                        }
+                                    ]
+                                    : []
+                            ),
+                            {
                                 is_leaf: true,
                                 level: 1,
-                                name: "高级选项",
-                                _key: "_highSearch"
-                            });
-                        }
-                        this.departmentList = depart.concat(data.list);
+                                name: "全部",
+                                _key: ""
+                            },
+                            ...data.list
+                        ];
                     }
                 });
             }

package/src/components/controls/special/DshBack.vue

@@ -34,3 +34,9 @@
         }
     };
 </script>
+
+<style lang="less" scoped>
+    .DshBack {
+
+    }
+</style>

package/src/components/controls/special/DshUndeveloped.vue

@@ -33,3 +33,9 @@
         methods: {}
     };
 </script>
+
+<style lang="less" scoped>
+    .DshUndeveloped {
+
+    }
+</style>

package/src/components/form/DshAdvSearch.vue

@@ -71,18 +71,17 @@
                             </template>
 
                             <!-- 动态筛选字段，出现是有条件的  -->
-                            <dsh-select
+                            <dsh-checkbox
                                 v-else-if="conditionItem.parameterType === 'dynamicText'"
                                 class="DshAdvSearch-conditions-item-control"
                                 :value="conditionItem"
                                 :propsObj="{
                                     _name: `${conditionItem.formItem._name}的动态参数`,
                                     _key: 'fieldParams',
-                                    _multiple: true,
                                     _data: conditionItem.dynamicList
                                 }"
                                 @change="change(conditionItem, arguments)"
-                            ></dsh-select>
+                            ></dsh-checkbox>
 
                             <!-- 为空和不为空时 啥不显示 -->
                             <div
@@ -350,3 +349,156 @@
         }
     };
 </script>
+
+<style lang="less" scoped>
+    .DshAdvSearch {
+        #title {
+            font-weight: 400;
+            color: #999999;
+            font-size: 14px;
+        }
+
+        &-title {
+            #title();
+        }
+
+        &-logic {
+            margin: 5px 0px 10px;
+            .dsh-flex-row-start-center();
+
+            &-title {
+                #title();
+            }
+            &-option {
+                flex: 1;
+                min-width: 100px;
+                margin-left: 20px;
+            }
+        }
+
+        &-conditions {
+            &-delete {
+                display: none;
+                padding: 3px;
+                position: absolute;
+                top: 6px;
+                right: 2px;
+                color: red;
+            }
+
+            &-loop,
+            &-item {
+                position: relative;
+
+                &:hover,
+                &-active {
+                    .DshAdvSearch-conditions-delete {
+                        display: inline-block;
+                    }
+                }
+            }
+
+            &-loop {
+                padding: 10px;
+                margin: 6px;
+                border: 1px solid @placeholderColor;
+                background-color: #F4F8FF;
+            }
+
+            &-item {
+                padding: 0!important;
+                margin-bottom: 10px!important;
+                cursor: pointer;
+
+                .DshFormUnit-label-right {
+                    flex: 6;
+                }
+
+                &-loading {
+                    margin: 5px 0px;
+                    text-align: center;
+                    font-size: 16px;
+                    color: @textColor;
+                }
+
+                &-control {
+                    .dsh-margin-bottom5();
+                }
+
+                &-blank {
+                    text-align: center;
+                    line-height: 30px;
+                    color: @placeholderColor;
+                }
+
+                &-extra {
+                    text-align: right;
+                    padding-right: 10px;
+
+                    .extra {
+                        &-dynamic {
+                            width: 90px;
+                            display: inline-block;
+                        }
+
+                        &-operator {
+                            .dsh-margin-right10();
+
+                            &-wrap {
+                                display: inline-block;
+                                padding: 5px;
+
+                                &:hover {
+                                    background-color: #E8F3FD;
+                                }
+                            }
+
+                            &-name {
+                                display: inline-block;
+                                min-width: 36px;
+                            }
+
+                            &-icon {
+                                .dsh-margin-left5();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        &-btns {
+            width: 100%;
+            margin-top: 15px;
+            .dsh-flex-row-start-center();
+
+            &-field {
+                flex: 3;
+
+                &-list {
+                    width: 330px;
+                }
+
+                &-create {
+                    #btn-style();
+                }
+            }
+
+            &-loop {
+                flex: 1;
+                margin-left: 12px;
+
+                &-create {
+                    #btn-style();
+                }
+            }
+        }
+
+        &-nodata {
+            margin: 20px 0px;
+            text-align: center;
+            font-size: 16px;
+            color: #B8BECC;
+        }
+    }
+</style>