bri-components 1.2.50 → 1.2.51

package/src/components/form/DshDefaultSearch.vue

@@ -1,10 +1,5 @@
 <template>
-    <div
-        class="DshDefaultSearch"
-        :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="item"
-                        :formData="conditionItem"
-                        :formItem="conditionItem.formItem"
-                        height="46"
-                        :labelStyle="labelStyle"
-                        :rowStyle="rowStyle"
-                        @change="change(conditionItem, arguments)"
-                    >
-                        <span
-                            slot="label"
-                            class="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>
@@ -55,8 +50,8 @@
         >
             <Icon
                 :class="[
-                    'icon',
-                    isSpreadStatus ? 'icon-arrow-up' : 'icon-arrow-down'
+                    'DshDefaultSearch-fold-icon',
+                    `DshDefaultSearch-fold-icon-${isSpreadStatus ? 'up' : 'down'}`
                 ]"
                 custom="bico-font bico-shuangjiantou"
                 @click="toggleSpreadStatus"
@@ -98,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"
                 }
             };
         },
@@ -140,7 +135,7 @@
             },
             // 判断是否符合折叠情形，showRowNum为null时候不使用展开/收合，为0时候就是一行不露出来
             canUseFold () {
-                return this.showRowNum == null
+                return this.showRowNum == undefined
                     ? false
                     : this.allRowNum > this.showRowNum;
             }
@@ -164,7 +159,7 @@
             getFormItem (formItem) {
                 return {
                     ...this.formatFormItem(formItem),
-                    isOnDftSearch: true,
+                    onDftSearch: true,
 
                     _line: true,
                     _useColor: false,
@@ -199,48 +194,40 @@
 
 <style lang="less" scoped>
     .DshDefaultSearch {
-        position: relative;
         background: #fff;
+        .dsh-flex-col-start-stretch();
 
         &-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;
+            &-item {
+                padding: 6px 0px;
+                margin-top: 0px;
+                margin-bottom: 0px;
 
                 &-name {}
             }
         }
 
-        //展开图标
         &-fold {
-            width: 100%;
             text-align: center;
-            position: absolute;
-            bottom: -24px;
-            left: 0px;
 
-            .icon {
+            &-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);
+                text-align: center;
+                line-height: 20px;
                 font-size: 14px;
                 color: #999999;
                 cursor: pointer;
 
-                &-arrow-up {
+                &-up {
                     transform: rotate(180deg);
                 }
 
-                &-arrow-down {
+                &-down {
 
                 }
             }
@@ -249,37 +236,12 @@
 </style>
 <style lang="less">
     .DshDefaultSearch {
-        // 输入框/下拉框
         input,
         .ivu-select-selection,
-        .ivu-cascader-size-default,
-        .DshCascader-multiple-input,
+        .ivu-input-number,
+        .BriControlInput,
         .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";
-            }
+            border-radius: 0px!important;
         }
     }
 </style>

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>
@@ -161,8 +162,8 @@
 
 <style lang="less" scoped>
     .DshFormUnit {
-        margin: 3px 6px;
-        padding: 2px 10px 8px;
+        margin: 3px 6px; // 不可轻易改margin的左右值，上面style的width根据他calc
+        padding: 0px 10px 10px;
 
         &-label {
             min-width: 0px;
@@ -202,6 +203,7 @@
             }
 
             &-description {
+                .dsh-ellipsis();
                 color: #60c0ec;
             }
         }
@@ -217,7 +219,6 @@
 
             .DshFormUnit-label {
                 max-width: 280px;
-                // min-width: 100px;
                 font-size: @textSize;
                 overflow: hidden;
                 margin: 0px;
@@ -251,17 +252,17 @@
 
         &-required {
             .DshFormUnit-label-name:before {
+                position: absolute;
+                left: -10px;
+
                 content: '*';
                 display: inline-block;
+                width: 6px;
                 line-height: 1.5;
                 font-family: SimSun;
-                font-size: @smallTitleSize;
                 font-weight: 500;
-                color: #E94829;
-                position: absolute;
-                left: -10px;
-                width: 6px;
                 font-size: @textSize;
+                color: #E94829;
             }
         }
     }

package/src/styles/components/controls/base/DshInput.less

@@ -10,20 +10,4 @@
             min-height: 32px;
         }
     }
-}
-
-.ivu-input {
-    .bri-control-edit();
-    cursor: text;
-
-    &[disabled] {
-        .bri-control-disabled();
-        &:hover {
-            border-color: @border-disabled;
-        }
-        &::-webkit-input-placeholder {
-            color: @placeholder-disabled-color;
-        }
-    }
-    
 }

package/src/styles/index.less

@@ -1,10 +1,12 @@
 @import "~vue-easytable/packages/theme-default/index.less"; // 引入官方提供的less样式入口文件
 @import "~view-design/src/styles/index.less"; // 第三方组件库样式
+
 @import "./reset-easytable.less"; // 重置easytable样式
-@import "./reset-iview.less"; // 重置iview样式
+@import "./reset-iview-variables.less"; // 重置iview样式-变量
+@import "./reset-iview-controls.less"; // 重置iview样式-控件相关
+@import "./reset-iview-other.less"; // 重置iview样式-其它
 @import "./reset.less"; // 重置样式
-
 // @import "./global/global.less"; // 全局公共css
-@import "./iconfont/iconfont.css"; // 字体图标样式
 
+@import "./iconfont/iconfont.css"; // 字体图标样式
 @import "./components/index.less"; // 组件样式

package/src/styles/reset-iview-controls.less

@@ -0,0 +1,104 @@
+.ivu-input {
+    .bri-control-edit();
+    cursor: text;
+
+    &[disabled] {
+        .bri-control-disabled();
+        &:hover {
+            border-color: @border-disabled;
+        }
+        &::-webkit-input-placeholder {
+            color: @placeholder-disabled-color;
+        }
+    }
+    
+}
+
+.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;
+        }
+
+        &-down-inner,
+        &-up-inner {
+            color: @contentColor;
+        }
+
+        &:hover {
+            background-color: @hoverBg;
+
+            .ivu-input-number-handler-down-inner,
+            .ivu-input-number-handler-up-inner {
+                color: @textColor;
+            }
+        }
+    }
+}
+
+.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;
+        }
+    }
+}

package/src/styles/{reset-iview.less → reset-iview-variables.less}

@@ -32,50 +32,4 @@
 // @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;
-        }
-    }
-}
+  

package/src/abolish/BriTransfer.less

@@ -1,65 +0,0 @@
-.BriTransfer {
-    .ivu-transfer {
-        &-list {
-            width: 200px;
-            height: 346px;
-
-            &-header {
-                background-color: #fff;
-                border-radius: 4px 4px 0 0;
-            }
-
-            &-body {
-                border-radius: 0 0 4px 4px;
-            }
-
-            &-content-not-found {
-                margin-top: 138px;
-            }
-
-            &-content-item {
-                display: flex;
-                margin: 4px 8px;
-                padding: 5px 12px;
-                border-radius: 4px;
-
-                &:hover {
-                    background-color: #E8F3FD;
-                }
-
-                &:has(.ivu-checkbox-wrapper-checked) {
-                    background-color: @theme-focus ;
-                }
-
-                >span {
-                    word-break: normal;
-                    display: block;
-                    white-space: pre-wrap;
-                    word-wrap: break-word;
-                    overflow: hidden;
-                }
-            }
-        }
-
-        &-operation {
-            .ivu-btn-primary {
-                width: 24px;
-                height: 24px;
-                border-radius: 4px;
-                display: flex;
-                justify-content: center;
-                align-items: center;
-
-                .ivu-icon {
-                    font-size: 16px;
-                }
-            }
-
-            .ivu-btn-primary[disabled] {
-                border: 1px solid #CCCCCC;
-                background: @borderColor;
-                color: @textColor-disabled;
-            }
-        }
-    }
-}

package/src/abolish/BriTransfer.vue

@@ -1,71 +0,0 @@
-<template>
-    <div class="BriTransfer">
-        <Transfer
-            :data="selfData"
-            :target-keys="targetKeys"
-            :filterable="filterable"
-            :filter-method="filterMethod"
-            :titles="titles"
-            not-found-text="暂无内容"
-            @on-change="handleChange"
-        ></Transfer>
-    </div>
-</template>
-
-<script>
-    export default {
-        name: "BriTransfer",
-        props: {
-            data: {
-                type: Array,
-                default: () => {
-                    return [];
-                }
-            },
-            value: {
-                type: Array,
-                default: () => {
-                    return [];
-                }
-            },
-            filterMethod: {
-                type: Function,
-                default: () => {
-                    return {};
-                }
-            },
-            titles: {
-                type: Array,
-                default: () => {
-                    return ["源列表", "目的列表"];
-                }
-            },
-            filterable: Boolean
-        },
-        data () {
-            return {
-                targetKeys: []
-            };
-        },
-        computed: {
-            selfData () {
-                return this.data.map(item => {
-                    return {
-                        key: item._key,
-                        label: item._name || item.name || item.realname
-                    };
-                });
-            }
-        },
-        created () {
-            this.targetKeys = this.value;
-        },
-        methods: {
-            handleChange (newTargetKeys) {
-                this.targetKeys = newTargetKeys;
-                this.$emit("input", this.targetKeys);
-                this.$emit("change", this.targetKeys);
-            }
-        }
-    };
-</script>

package/src/abolish/BriTree.less

@@ -1,57 +0,0 @@
-
-.BriTree {
-    border: 1px solid @btnCancelBg;
-    border-radius: @borderRadius;
-    width: 336px;
-    overflow: auto;
-    padding: 8px;
-    user-select: none;
-    max-width: 100%;
-    
-}
-.ivu-tree {
-    .ivu-icon-ios-arrow-forward {
-        display: inline-block;
-        width: 16px;
-        height: 16px;
-        border-radius: @borderRadius;
-        &:before {
-            content: "\F341";
-            width: 100%;
-            height: 100%;
-            .dsh-flex-row-center-center();
-        }
-        &:hover {
-            background-color: @btnCancelBgDisabled;
-        }
-    }
-    &-arrow {
-        width: auto;
-        color: @placeholderColor;
-        margin-top: 4px;
-        &-open {
-            color: @themeColor;
-        }
-    }
-    &-title {
-        color: @textColor;
-        padding: 3px 8px 4px;
-        border-radius: @borderRadius;
-        display: inline-flex;
-        width: calc(100% - 20px);
-        &:hover {
-            background-color: @bgColor;
-        }
-        &-selected {
-            color: @themeColor;
-            background-color: @theme-focus;
-        }
-    }
-    .ivu-checkbox-wrapper+.ivu-tree-title {
-        margin-left: -30px;
-        padding-left: 30px;
-    }
-    .ivu-load-loop {
-        color: @themeColor;
-    }
-}

package/src/abolish/DshCascaders.less

@@ -1,11 +0,0 @@
-.DshCascaders {
-    width: 100%;
-    &-control {
-        display: inline-block;
-        width: calc(100% - 65px);
-    }
-    &-create {
-        display: inline-block;
-        width: 60px;
-    }
-}