bri-components 1.2.50 → 1.2.51

package/package.json

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

package/src/components/controls/BriControlInput.vue

@@ -115,12 +115,7 @@
         .placeholder {
             flex: 1;
             min-width: 0px;
-            overflow: hidden;
-        }
-
-        .ivu-icon {
-            padding: 5px;
-            color: @placeholder-disabled-color;
+            .dsh-ellipsis();
         }
 
         .icon {
@@ -133,3 +128,11 @@
         }
     }
 </style>
+<style lang="less">
+    .BriControlInput {
+        .ivu-icon {
+            padding: 5px;
+            color: @placeholder-disabled-color;
+        }
+    }
+</style>

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

@@ -135,7 +135,7 @@
     };
 </script>
 
-<style lang="less" scoped>
+<style lang="less">
     .DshDate {
         width: 100%;
 

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

@@ -29,26 +29,19 @@
                 @on-change="changeVal($event, 0)"
                 @on-open-change="changeOpen($event, 0)"
             >
-                <div
-                    class="DshDaterange-item"
-                    @click="changeOpen(true, 0)"
-                >
-                    <span class="DshDaterange-item-name">
-                        {{ showVal0 }}
-                    </span>
-
-                    <span class="DshDaterange-item-icon">
-                        <Icon
-                            v-show="val0"
-                            type="ios-close-circle"
-                            @click.stop="clickClear('', 0)"
-                        />
-                        <Icon
-                            v-show="!val0"
-                            type="ios-calendar-outline"
-                        />
-                    </span>
-                </div>
+                <bri-control-input
+                    :class="{
+                        ...commonClass,
+                        'bri-control-nodata': this.$isEmptyData(this.showVal0),
+                        'DshDaterange-item': true
+                    }"
+                    :canEdit="finalCanEdit"
+                    :value="showVal0"
+                    inputIcon="ios-calendar-outline"
+                    :propsObj="selfPropsObj"
+                    @clear="clickClear('', 0)"
+                    @click.native="changeOpen(true, 0)"
+                ></bri-control-input>
             </DatePicker>
 
             <span class="DshDaterange-center"> — </span>
@@ -66,26 +59,19 @@
                 @on-change="changeVal($event, 1)"
                 @on-open-change="changeOpen($event, 1)"
             >
-                <div
-                    class="DshDaterange-item"
-                    @click="changeOpen(true, 1)"
-                >
-                    <span class="DshDaterange-item-name">
-                        {{ showVal1 }}
-                    </span>
-
-                    <span class="DshDaterange-item-icon">
-                        <Icon
-                            v-show="val1"
-                            type="ios-close-circle"
-                            @click.stop="clickClear('', 1)"
-                        />
-                        <Icon
-                            v-show="!val1"
-                            type="ios-calendar-outline"
-                        />
-                    </span>
-                </div>
+                <bri-control-input
+                    :class="{
+                        ...commonClass,
+                        'bri-control-nodata': this.$isEmptyData(this.showVal1),
+                        'DshDaterange-item': true
+                    }"
+                    :canEdit="finalCanEdit"
+                    :value="showVal1"
+                    inputIcon="ios-calendar-outline"
+                    :propsObj="selfPropsObj"
+                    @clear="clickClear('', 1)"
+                    @click.native="changeOpen(true, 1)"
+                ></bri-control-input>
             </DatePicker>
         </template>
     </div>
@@ -224,28 +210,13 @@
             };
         },
         computed: {
-            val0: {
-                get () {
-                    return this.getVal(0);
-                },
-                set (val) {
-                    this.setVal(val, 0);
-                }
-            },
-            val1: {
-                get () {
-                    return this.getVal(1);
-                },
-                set (val) {
-                    this.setVal(val, 1);
-                }
-            },
-
             selfPropsObj () {
                 return {
                     _useShortcuts: true,
+
                     ...this.propsObj,
                     ...this.commonDealPropsObj,
+
                     _type: "date"
                 };
             },
@@ -255,18 +226,34 @@
             useShortcuts () {
                 return this.selfPropsObj._useShortcuts;
             },
-
             options0 () {
                 return this.getOptions(0);
             },
             options1 () {
                 return this.getOptions(1);
             },
+
+            val0: {
+                get () {
+                    return this.getVal(0);
+                },
+                set (val) {
+                    this.setVal(val, 0);
+                }
+            },
+            val1: {
+                get () {
+                    return this.getVal(1);
+                },
+                set (val) {
+                    this.setVal(val, 1);
+                }
+            },
             showVal0 () {
-                return this.getShowVal(0);
+                return this.getShowVal(this.val0);
             },
             showVal1 () {
-                return this.getShowVal(1);
+                return this.getShowVal(this.val1);
             }
         },
         created () {},
@@ -328,9 +315,7 @@
                     }
                 };
             },
-            getShowVal (index) {
-                const val = this[`val${index}`];
-
+            getShowVal (val) {
                 return this.isDynDateKey(val)
                     ? (this.dynDate.find(dynItem => dynItem._key === val) || { name: `"${val}"dnDate不存在` }).name
                     : this.$transformDate(val, "-", this.subType);
@@ -342,56 +327,27 @@
     };
 </script>
 
-<style lang="less" scoped>
+<style lang="less">
     .DshDaterange {
         width: 100%;
+        display: flex;
+        align-items: center;
 
         &-left,
         &-right {
-            width: 47%;
-            float: left;
-            background-color: #ffffff;
+            flex: 7;
+            min-width: 0px;
         }
 
         &-center {
-            width: 3%;
+            flex: 1;
+            min-width: 10px;
             text-align: center;
             color: @textColor;
-            overflow: hidden;
-            line-height: 30px;
-            float: left;
-            margin: 0 1.5%;
         }
 
         &-item {
-            height: 32px;
-            border: 1px solid @borderColor;
-            border-radius: 4px;
-            overflow: hidden;
-            position: relative;
 
-            &-name {
-                display: inline-block;
-                width: 100%;
-                height: 100%;
-                line-height: 30px;
-                overflow: hidden;
-                padding-right: 32px;
-                padding-left: 7px;
-                white-space: nowrap;
-                text-overflow: ellipsis;
-            }
-
-            &-icon {
-                position: absolute;
-                right: 0px;
-                top: 0px;
-                display: inline-block;
-                width: 32px;
-                height: 100%;
-                text-align: center;
-                line-height: 30px;
-            }
         }
     }
 </style>

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

@@ -188,7 +188,7 @@
     };
 </script>
 
-<style lang="less" scoped>
+<style lang="less">
     .DshEditor {
         width: 100%;
 

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

@@ -121,9 +121,7 @@
                     },
 
                     ...this.propsObj,
-                    ...this.commonDealPropsObj,
-
-                    _disabled: this.propsObj._disabled || ["serialNumber"].includes(this.controlType) || !this.finalCanEdit
+                    ...this.commonDealPropsObj
                 };
             },
             inputType () {

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

@@ -149,7 +149,7 @@
     };
 </script>
 
-<style lang="less" scoped>
+<style lang="less">
     .DshNumber {
         width: 100%;
 
@@ -163,45 +163,4 @@
             }
         }
     }
-</style>
-<style lang="less">
-    .ivu-input-number {
-        width: 100%;
-
-        .ivu-input-number-input {
-            color: @textColor;
-        }
-
-        &-disabled {
-            .ivu-input-number-input {
-                opacity: 1;
-                background: @inputBg-disabled;
-                color: @textColor;
-                &::-webkit-input-placeholder {
-                    color: @placeholder-disabled-color;
-                }
-            }
-        }
-
-        &-handler {
-            &-wrap {
-                border-left: none;
-            }
-            &-down {
-                border: none;
-            }
-            &:hover {
-                background-color: @hoverBg;
-
-                .ivu-input-number-handler-down-inner,
-                .ivu-input-number-handler-up-inner {
-                    color: @textColor;
-                }
-            }
-            &-down-inner,
-            &-up-inner {
-                color: @contentColor;
-            }
-        }
-    }
-</style>
+</style>

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

@@ -126,7 +126,7 @@
     };
 </script>
 
-<style lang="less" scoped>
+<style lang="less">
     .DshNumberange {
         width: 100%;
         display: flex;
@@ -134,25 +134,25 @@
 
         &-left,
         &-right {
-            flex: 1;
+            flex: 7;
+            flex: 7;
+            min-width: 0px;
         }
 
         &-center {
-            width: 30px;
+            flex: 1;
+            min-width: 10px;
             text-align: center;
             color: @textColor;
         }
 
         &-suffix {
-            padding-right: 24px;
-            padding-left: 8px;
+            padding-right: 8px;
+            padding-left: 2px;
             line-height: 30px;
             white-space: nowrap;
         }
-    }
-</style>
-<style lang="less">
-    .DshNumberange {
+
         input {
             text-overflow: ellipsis;
             overflow: hidden;

package/src/components/controls/base/DshSelect/selectMixin.js

@@ -26,9 +26,7 @@ export default {
                 _customData: [],
 
                 ...this.propsObj,
-                ...this.commonDealPropsObj,
-
-                _disabled: this.propsObj._disabled || !this.finalCanEdit
+                ...this.commonDealPropsObj
             };
         },
         showType () {

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

@@ -72,11 +72,6 @@
     };
 </script>
 
-<style lang="less" scoped>
-    .DshSwitch {
-
-    }
-</style>
 <style lang="less">
     .DshSwitch {
 

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

@@ -25,13 +25,11 @@ export default {
                 ...this.commonDealPropsObj,
 
                 _openText: this.propsObj._openText || "是", // 此行放在 ...this.propsObj的下面目的是，处理_openText为空字符串的情况
-                _closeText: this.propsObj._closeText || "否",
-                _disabled: this.propsObj._disabled || !this.finalCanEdit
+                _closeText: this.propsObj._closeText || "否"
             };
         },
         mulPropsObj () {
             return {
-                ...this.propsObj,
                 _optionKind: "flat",
                 _data: [
                     {
@@ -44,7 +42,9 @@ export default {
                         name: this.selfPropsObj._closeText,
                         color: this.selfPropsObj._closeColor
                     }
-                ]
+                ],
+
+                ...this.propsObj
             };
         },
         showStyle () {

package/src/components/controls/controlMixin.js

@@ -90,7 +90,7 @@ export default {
         },
         // 是否为多选模式
         multipleMode () {
-            return ["numberange", "daterange", "checkbox", "regions", "cascaders"].includes(this.controlType) || !!this.propsObj._multiple;
+            return ["texts", "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"];
@@ -99,7 +99,8 @@ export default {
                 _placeholder: this.canEdit && this.propsObj._enterType !== "calculate"
                     ? (this.propsObj._placeholder || `请${selectControlTypes.includes(this.controlType) ? "选择" : "输入"}${this.propsObj._name}`)
                     : undefined,
-                _clearable: this.finalCanEdit && (this.propsObj._clearable === undefined ? true : this.propsObj._clearable)
+                _clearable: this.finalCanEdit && (this.propsObj._clearable === undefined ? true : this.propsObj._clearable),
+                _disabled: this.propsObj._disabled || ["serialNumber"].includes(this.controlType) || !this.finalCanEdit
             };
         },
         commonClass () {
@@ -133,6 +134,9 @@ export default {
         isOnSearch () {
             return !!this.propsObj.onSearch;
         },
+        isOnDftSearch () {
+            return !!this.propsObj.onDftSearch;
+        },
         isUnitUpdate () {
             return this.isInTable && !!this.canEdit;
         },

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

@@ -35,7 +35,7 @@
     };
 </script>
 
-<style lang="less" scoped>
+<style lang="less">
     .DshBack {
 
     }

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

@@ -34,7 +34,7 @@
     };
 </script>
 
-<style lang="less" scoped>
+<style lang="less">
     .DshUndeveloped {
 
     }