bri-components 1.2.49 → 1.2.51

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

@@ -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 {
 
     }

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>

package/src/components/form/DshDefaultSearch.vue

@@ -1,10 +1,5 @@
 <template>
-    <div
-        class="DshDefaultSearch bri-scrollbar6"
-        :style="{
-            'margin-bottom': canUseFold ? '20px' : undefined
-        }"
-    >
+    <div class="DshDefaultSearch">
         <!-- 筛选表单 -->
         <div
             class="DshDefaultSearch-form"
@@ -15,34 +10,34 @@
         >
             <Row :gutter="10">
                 <template v-for="conditionItem in conditionList">
-                    <Col
+                    <i-col
                         :key="conditionItem._id"
                         :span="conditionItem.formItem._span"
                     >
-                    <dsh-form-unit
-                        :key="conditionItem._id"
-                        class="DshDefaultSearch-item"
-                        :formData="conditionItem"
-                        :formItem="conditionItem.formItem"
-                        height="46"
-                        :labelStyle="labelStyle"
-                        :rowStyle="rowStyle"
-                        @change="change(conditionItem, arguments)"
-                    >
-                        <span
-                            slot="label"
-                            class="DshDefaultSearch-item-name"
+                        <dsh-form-unit
+                            :key="conditionItem._id"
+                            class="DshDefaultSearch-form-item"
+                            :formData="conditionItem"
+                            :formItem="conditionItem.formItem"
+                            height="46"
+                            :labelStyle="labelStyle"
+                            :rowStyle="rowStyle"
+                            @change="change(conditionItem, arguments)"
                         >
-                            {{ conditionItem.formItem._name }}
-                        </span>
-                    </dsh-form-unit>
-                    </Col>
+                            <span
+                                slot="label"
+                                class="DshDefaultSearch-form-item-name"
+                            >
+                                {{ conditionItem.formItem._name }}
+                            </span>
+                        </dsh-form-unit>
+                    </i-col>
 
                     <!-- 换行 -->
                     <div
                         v-if="conditionItem.formItem._wrap"
                         :key="conditionItem._id + '_wrap'"
-                        style="width:100%"
+                        style="width: 100%"
                     ></div>
                 </template>
             </Row>
@@ -53,11 +48,10 @@
             v-if="canUseFold"
             class="DshDefaultSearch-fold"
         >
-            <!-- <div class="DshDefaultSearch-fold-zhanwei"></div> -->
             <Icon
                 :class="[
                     'DshDefaultSearch-fold-icon',
-                    isSpreadStatus ? 'arrow-up' : 'arrow-down'
+                    `DshDefaultSearch-fold-icon-${isSpreadStatus ? 'up' : 'down'}`
                 ]"
                 custom="bico-font bico-shuangjiantou"
                 @click="toggleSpreadStatus"
@@ -99,16 +93,16 @@
                     width: "calc(100% - 12px)"
                 },
                 labelStyle: {
-                    textAlign: "center",
+                    width: this.labelWidth + "px",
+                    height: "32px",
                     margin: 0,
-                    color: "#666666",
-                    border: "1px solid rgba(229, 229, 229, 1)",
-                    background: "rgba(245, 245, 245, 1)",
                     padding: "5px 10px",
+                    border: "1px solid rgba(229, 229, 229, 1)",
                     borderRight: "none",
-                    height: "32px",
+                    backgroundColor: "rgba(245, 245, 245, 1)",
                     boxSizing: "border-box",
-                    width: this.labelWidth + "px"
+                    textAlign: "center",
+                    color: "#666666"
                 }
             };
         },
@@ -141,7 +135,7 @@
             },
             // 判断是否符合折叠情形，showRowNum为null时候不使用展开/收合，为0时候就是一行不露出来
             canUseFold () {
-                return this.showRowNum == null
+                return this.showRowNum == undefined
                     ? false
                     : this.allRowNum > this.showRowNum;
             }
@@ -165,9 +159,11 @@
             getFormItem (formItem) {
                 return {
                     ...this.formatFormItem(formItem),
+                    onDftSearch: true,
 
                     _line: true,
                     _useColor: false,
+                    _optionKind: "dropdown",
 
                     ...(
                         // date、daterange类型的(formItem._type基本不会为daterange)
@@ -175,12 +171,6 @@
                             ? {
                                 _useShortcuts: false
                             }
-                            // select、checkbox、以及switch（都会转成checkbox）类型的
-                            : ["switch", "select", "checkbox"].includes(formItem._type)
-                                ? {
-                                    _optionKind: "dropdown",
-                                    _useColor: false
-                                }
                             // labels类型的
                             : ["labels"].includes(formItem._type)
                                 ? {
@@ -201,3 +191,57 @@
         }
     };
 </script>
+
+<style lang="less" scoped>
+    .DshDefaultSearch {
+        background: #fff;
+        .dsh-flex-col-start-stretch();
+
+        &-form {
+            z-index: 2;
+
+            &-item {
+                padding: 6px 0px;
+                margin-top: 0px;
+                margin-bottom: 0px;
+
+                &-name {}
+            }
+        }
+
+        &-fold {
+            text-align: center;
+
+            &-icon {
+                width: 48px;
+                height: 20px;
+                background: #fff;
+                box-shadow: 0 0 16px 0 rgba(51, 51, 51, 0.1);
+                text-align: center;
+                line-height: 20px;
+                font-size: 14px;
+                color: #999999;
+                cursor: pointer;
+
+                &-up {
+                    transform: rotate(180deg);
+                }
+
+                &-down {
+
+                }
+            }
+        }
+    }
+</style>
+<style lang="less">
+    .DshDefaultSearch {
+        input,
+        .ivu-select-selection,
+        .ivu-input-number,
+        .BriControlInput,
+        .DshDaterange-item {
+            border-radius: 0px!important;
+        }
+    }
+</style>

package/src/components/form/DshForm.vue

@@ -392,3 +392,27 @@
         }
     };
 </script>
+
+<style lang="less" scoped>
+    .DshForm {
+        padding-bottom: 5px;
+
+        &-item-FormItem {
+            margin-bottom: 0px;
+        }
+    }
+</style>
+<style lang="less">
+    .DshForm {
+        .ivu-form-item-content {
+            line-height: normal;
+
+            .ivu-form-item-error-tip {
+                top: calc(100% - 8px);
+                left: 16px;
+                padding-top: 0px;
+                font-size: 12px;
+            }
+        }
+    }
+</style>

package/src/components/form/searchMixin.js

@@ -131,33 +131,20 @@ export default {
         },
         // 格式化表单配置，适合需要
         formatFormItem (formItem) {
-            const fieldData = this.fieldMap[formItem._type];
-
             return {
                 ...formItem,
-                ...(fieldData.searchProps || {}),
+                onSearch: true,
+
                 _key: "fieldValue",
                 __realKey__: formItem._key,
                 _description: undefined,
                 _required: false,
                 _br: false,
                 _wrap: false,
+
+                _multiple: true,
                 _enterType: undefined,
-                canEdit: true,
-                _data: ["switch"].includes(formItem._type)
-                    ? [
-                        {
-                            _key: "true",
-                            name: formItem._openText,
-                            color: "#87e8de"
-                        },
-                        {
-                            _key: "false",
-                            name: formItem._closeText,
-                            color: "#87e8de"
-                        }
-                    ]
-                    : formItem._data
+                canEdit: true
             };
         },
 

package/src/components/other/BriGantt.vue

@@ -238,8 +238,8 @@
             </div>
 
             <!-- 底部滚动条 -->
-            <!-- <div class="briGantt-scrollbar">
-                <div class="briGantt-scrollbar-main bri-scrollbar"
+            <!-- <div class="briGantt-scroll">
+                <div class="briGantt-scroll-main"
                     ref="briGanttScrollbar"
                     :style="{ width: clientWidth + 'px' }"
                     v-on:scroll="handleScroll($event, [{ ref: 'briGanttTimer', direction: 'scrollLeft' }, { ref:'briGanttArea', direction:'scrollLeft' }, { ref:'briGanttBlue', direction:'scrollLeft' }])">

package/src/components/unit/DshFormUnit.vue

@@ -59,12 +59,13 @@
             >
                 <slot name="extra">
                     <bri-tooltip
+                        v-if="formItem._description"
                         :content="formItem._description"
                         transfer
                         style="height: 14px;"
                     >
-                        <span class="DshFormUnit-label-description dsh-ellipsis">
-                            {{ formItem._description && `* ${formItem._description}` }}
+                        <span class="DshFormUnit-label-description">
+                            {{ `* ${formItem._description}` }}
                         </span>
                     </bri-tooltip>
                 </slot>
@@ -158,3 +159,111 @@
         }
     };
 </script>
+
+<style lang="less" scoped>
+    .DshFormUnit {
+        margin: 3px 6px; // 不可轻易改margin的左右值，上面style的width根据他calc
+        padding: 0px 10px 10px;
+
+        &-label {
+            min-width: 0px;
+            padding: 5px 0px 5px;
+            line-height: 20px;
+            font-size: @smallSize;
+            display: flex;
+            align-items: center;
+
+            &-left {
+                flex: 2;
+                min-width: 150px;
+                position: relative;
+            }
+
+            &-right {
+                flex: 1;
+                min-width: 0px;
+                text-align: right;
+            }
+
+            &-name {
+                font-size: @textSize;
+                .dsh-ellipsis();
+
+                &-edit {
+                    color: @textColor;
+                }
+
+                &-show {
+                    color: @contentColor;
+                }
+
+                &-sign {
+                    #dsh-sign-change();
+                }
+            }
+
+            &-description {
+                .dsh-ellipsis();
+                color: #60c0ec;
+            }
+        }
+
+        &-control {
+            min-height: 32px;
+        }
+
+        &-line {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+
+            .DshFormUnit-label {
+                max-width: 280px;
+                font-size: @textSize;
+                overflow: hidden;
+                margin: 0px;
+                margin-right: 8px;
+
+                // fixedbug:line模式下显示必填
+                margin-left: -10px;
+                padding-left: 10px;
+
+                &-left {
+                    flex: 1;
+                    min-width: 40px;
+                }
+
+                &-right {
+                    flex: none;
+                    max-width: 50%;
+                    min-width: 0px;
+                    text-align: right;
+                }
+            }
+
+            .DshFormUnit-control {
+                flex: 1;
+                min-width: 50px;
+                display: flex;
+                justify-content: flex-end;
+                align-items: center;
+            }
+        }
+
+        &-required {
+            .DshFormUnit-label-name:before {
+                position: absolute;
+                left: -10px;
+
+                content: '*';
+                display: inline-block;
+                width: 6px;
+                line-height: 1.5;
+                font-family: SimSun;
+                font-weight: 500;
+                font-size: @textSize;
+                color: #E94829;
+            }
+        }
+    }
+</style>

package/src/components/unit/DshListUnit.vue

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