bri-components 1.2.49 → 1.2.50

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,6 +1,6 @@
 <template>
     <div
-        class="DshDefaultSearch bri-scrollbar6"
+        class="DshDefaultSearch"
         :style="{
             'margin-bottom': canUseFold ? '20px' : undefined
         }"
@@ -21,7 +21,7 @@
                     >
                     <dsh-form-unit
                         :key="conditionItem._id"
-                        class="DshDefaultSearch-item"
+                        class="item"
                         :formData="conditionItem"
                         :formItem="conditionItem.formItem"
                         height="46"
@@ -31,7 +31,7 @@
                     >
                         <span
                             slot="label"
-                            class="DshDefaultSearch-item-name"
+                            class="item-name"
                         >
                             {{ conditionItem.formItem._name }}
                         </span>
@@ -53,11 +53,10 @@
             v-if="canUseFold"
             class="DshDefaultSearch-fold"
         >
-            <!-- <div class="DshDefaultSearch-fold-zhanwei"></div> -->
             <Icon
                 :class="[
-                    'DshDefaultSearch-fold-icon',
-                    isSpreadStatus ? 'arrow-up' : 'arrow-down'
+                    'icon',
+                    isSpreadStatus ? 'icon-arrow-up' : 'icon-arrow-down'
                 ]"
                 custom="bico-font bico-shuangjiantou"
                 @click="toggleSpreadStatus"
@@ -165,9 +164,11 @@
             getFormItem (formItem) {
                 return {
                     ...this.formatFormItem(formItem),
+                    isOnDftSearch: true,
 
                     _line: true,
                     _useColor: false,
+                    _optionKind: "dropdown",
 
                     ...(
                         // date、daterange类型的(formItem._type基本不会为daterange)
@@ -175,12 +176,6 @@
                             ? {
                                 _useShortcuts: false
                             }
-                            // select、checkbox、以及switch（都会转成checkbox）类型的
-                            : ["switch", "select", "checkbox"].includes(formItem._type)
-                                ? {
-                                    _optionKind: "dropdown",
-                                    _useColor: false
-                                }
                             // labels类型的
                             : ["labels"].includes(formItem._type)
                                 ? {
@@ -201,3 +196,90 @@
         }
     };
 </script>
+
+<style lang="less" scoped>
+    .DshDefaultSearch {
+        position: relative;
+        background: #fff;
+
+        &-form {
+            position: relative;
+            z-index: 2;
+
+            .item {
+                padding: 0 !important;
+                padding-bottom: 6px !important;
+                padding-top: 6px !important;
+                margin-top: 0px !important;
+                margin-bottom: 0px !important;
+
+                &-name {}
+            }
+        }
+
+        //展开图标
+        &-fold {
+            width: 100%;
+            text-align: center;
+            position: absolute;
+            bottom: -24px;
+            left: 0px;
+
+            .icon {
+                width: 48px;
+                height: 20px;
+                text-align: center;
+                line-height: 20px;
+                background: #fff;
+                box-shadow: 0 0 16px 0 rgba(51, 51, 51, 0.1);
+                font-size: 14px;
+                color: #999999;
+                cursor: pointer;
+
+                &-arrow-up {
+                    transform: rotate(180deg);
+                }
+
+                &-arrow-down {
+
+                }
+            }
+        }
+    }
+</style>
+<style lang="less">
+    .DshDefaultSearch {
+        // 输入框/下拉框
+        input,
+        .ivu-select-selection,
+        .ivu-cascader-size-default,
+        .DshCascader-multiple-input,
+        .DshDaterange-item {
+            border-radius: 0;
+
+            .ivu-select-input {
+                top: 0px!important;
+            }
+        }
+
+        .DshCascader-multiple-input {
+            height: 32px;
+            padding: 1px 6px;
+            overflow: hidden!important;
+        }
+
+        .DshFormUnit-label {
+            width: 80px;
+            margin-right: 16px;
+            text-align: right;
+
+            &-right {
+                text-align: left;
+            }
+
+            &-name {
+                font-family: "Microsoft YaHei";
+            }
+        }
+    }
+</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

@@ -158,3 +158,111 @@
         }
     };
 </script>
+
+<style lang="less" scoped>
+    .DshFormUnit {
+        margin: 3px 6px;
+        padding: 2px 10px 8px;
+
+        &-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 {
+                color: #60c0ec;
+            }
+        }
+
+        &-control {
+            min-height: 32px;
+        }
+
+        &-line {
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
+
+            .DshFormUnit-label {
+                max-width: 280px;
+                // min-width: 100px;
+                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 {
+                content: '*';
+                display: inline-block;
+                line-height: 1.5;
+                font-family: SimSun;
+                font-size: @smallTitleSize;
+                font-weight: 500;
+                color: #E94829;
+                position: absolute;
+                left: -10px;
+                width: 6px;
+                font-size: @textSize;
+            }
+        }
+    }
+</style>

package/src/components/unit/DshListUnit.vue

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

package/src/index.js

@@ -25,10 +25,10 @@ import DshFormUnit from "./components/unit/DshFormUnit.vue";
 import DshListUnit from "./components/unit/DshListUnit.vue";
 // controls
 import BriControlInput from "./components/controls/BriControlInput.vue";
-import DshInput from "./components/controls/base/DshInput.vue";
+import DshInput from "./components/controls/base/DshInput/DshInput.vue";
 import DshNumber from "./components/controls/base/DshNumber/DshNumber.vue";
-import DshSelect from "./components/controls/base/DshSelect.vue";
-import DshCheckbox from "./components/controls/base/DshCheckbox.vue";
+import DshSelect from "./components/controls/base/DshSelect/DshSelect.vue";
+import DshCheckbox from "./components/controls/base/DshSelect/DshCheckbox.vue";
 import DshCascader from "./components/controls/base/DshCascader/DshCascader.vue";
 
 // other
@@ -65,11 +65,11 @@ import BriTree from "./components/list/BriTree.vue";
 import BriTreeItem from "./components/list/BriTreeItem.vue";
 
 // controls
-import BriInputs from "./components/controls/base/BriInputs.vue";
-import DshNumberange from "./components/controls/base/DshNumberange.vue";
-import DshDate from "./components/controls/base/DshDate.vue";
-import DshDaterange from "./components/controls/base/DshDaterange.vue";
-import DshSwitch from "./components/controls/base/DshSwitch.vue";
+// import BriInputs from "./components/controls/base/DshInput/BriInputs.vue";
+// import DshNumberange from "./components/controls/base/DshNumber/DshNumberange.vue";
+import DshDate from "./components/controls/base/DshDate/DshDate.vue";
+import DshDaterange from "./components/controls/base/DshDate/DshDaterange.vue";
+import DshSwitch from "./components/controls/base/DshSwitch/DshSwitch.vue";
 import BriUpload from "./components/controls/base/BriUpload/BriUpload.vue";
 import BriUploadImage from "./components/controls/base/BriUpload/BriUploadImage.vue";
 import DshCoordinates from "./components/controls/base/DshCoordinates.vue";
@@ -232,8 +232,8 @@ export {
     BriTree,
     BriTreeItem,
 
-    BriInputs,
-    DshNumberange,
+    // BriInputs,
+    // DshNumberange,
     DshDate,
     DshDaterange,
     DshSwitch,

package/src/styles/components/index.less

@@ -15,22 +15,8 @@
 @import "./list/BriTree.less";
 @import "./list/BriTreeItem.less";
 
-// form
-@import "./form/DshForm.less";
-@import "./form/DshAdvSearch.less";
-@import "./form/DshDefaultSearch.less";
-// unit
-@import "./unit/DshFormUnit.less";
-@import "./unit/DshListUnit.less";
-
 @import "./controls/base/DshInput.less";
 @import "./controls/base/BriInputs.less";
-@import "./controls/base/DshNumber.less";
-@import "./controls/base/DshNumberange.less";
-@import "./controls/base/DshSelect.less";
-@import "./controls/base/DshCheckbox.less";
-@import "./controls/base/DshDate.less";
-@import "./controls/base/DshDaterange.less";
 @import "./controls/base/DshCascader/index.less";
 @import "./controls/base/BriUpload/index.less";
 @import "./controls/base/DshCoordinates.less";

package/src/styles/components/other/BriGantt.less

@@ -258,21 +258,10 @@
             height: 0px;
         }
     }
+    
     // table 列表映射
     &-tabledata {
         overflow-y: auto;
         border-right: none;
     }
-    // 滚动条设置
-    &-scrollbar {
-        width: 100%;
-        &-main {
-            float: right;
-            overflow: auto;
-            div {
-                height: 2px;
-            }
-        }
-
-    }
 }

package/src/styles/reset-iview.less

@@ -32,4 +32,50 @@
 // @btn-padding-base       : 0 @padding-md - 1px;
 // @btn-padding-large      : @btn-padding-base;
 // @btn-padding-small      : 0 @padding-xs - 1px;
-  
+  
+
+.ivu-select {
+    .ivu-select-selection {
+
+    }
+
+    &-disabled {
+        .ivu-select-selection {
+            .bri-control-disabled();
+
+            &:hover {
+                border-color: @border-disabled;
+            }
+        }
+
+        .ivu-select-input[disabled] {
+            color: @textColor;
+            -webkit-text-fill-color: @placeholder-disabled-color;
+        }
+    }
+
+    &-item {
+        margin: 4px 8px;
+        border-radius: @borderRadius;
+
+        &:hover {
+            background: @bgColor;
+        }
+
+        &-selected {
+            background-color: @theme-focus;
+            color: @themeColor;
+        }
+
+        &-disabled {
+            .ivu-select-selection {
+                .bri-control-disabled();
+            }
+        }
+
+        &-input[disabled] {
+            color: @textColor-disabled;
+            -webkit-text-fill-color: @textColor-disabled;
+        }
+    }
+}