bri-components 1.2.49 → 1.2.51

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/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/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/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/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;
-    }
-}

package/src/abolish/DshCascaders.vue

@@ -1,151 +0,0 @@
-<template>
-    <div class="DshCascaders">
-        <Cascader
-            class="DshCascaders-control"
-            v-model="cascaderVal"
-            :placeholder="selfPropsObj._placeholder"
-            :data="renderCascaderData"
-            :load-data="loadData"
-            :disabled="!finalCanEdit"
-            :change-on-select="selfPropsObj._changeOnSelect"
-            :filterable="true"
-            :clearable="true"
-            :transfer="true"
-        ></Cascader>
-        <dsh-buttons
-            class="DshCascaders-create"
-            :list="$getOperationList(['createTag'])"
-            @click="$dispatchEvent($event)"
-        ></dsh-buttons>
-
-        <!-- 标签列表 -->
-        <dsh-tags
-            class="dsh-margin-top5"
-            :list="tags"
-            :propsObj="{
-                closable: true
-            }"
-            @delete="$dispatchEvent(operationMap.deleteTag, arguments)"
-        ></dsh-tags>
-    </div>
-</template>
-
-<script>
-    import { regionData } from "bri-datas";
-    import controlMixin from "../controlMixin.js";
-
-    const loop = function (data = [], level, parentCode, filterVals = []) {
-        if (data && filterVals.length) {
-            data = data.filter(item => filterVals.includes(item._key));
-        }
-        return data
-            ? data.reduce((arr, item) => {
-                const newItem = {
-                    ...item,
-                    value: item._key,
-                    label: item.name,
-                    codeArr: [ ...(parentCode || []), item._key ]
-                };
-                if (!level || level > item.level) {
-                    newItem.children = loop(item.children, level, newItem.codeArr);
-                    newItem.children.length && (newItem.loading = false); // 此代码为了所请求的级出现继续加载的箭头图标
-                } else {
-                    newItem.children = [];
-                }
-                arr.push(newItem);
-
-                return arr;
-            }, [])
-            : [];
-    };
-
-    export default {
-        name: "DshCascaders",
-        mixins: [
-            controlMixin
-        ],
-        props: {},
-        data () {
-            return {
-                cascaderVal: [],
-
-                operationMap: {
-                    createTag: {
-                        name: "添加",
-                        type: "createTag",
-                        size: "default",
-                        event: "createTag"
-                    },
-                    deleteTag: {
-                        name: "删除",
-                        type: "deleteTag",
-                        event: "deleteTag"
-                    }
-                }
-            };
-        },
-        computed: {
-            selfPropsObj () {
-                return {
-                    ...this.propsObj,
-                    ...this.commonDealPropsObj
-                };
-            },
-
-            cascaderData: {
-                get () {
-                    return loop(
-                        this.propsObj._subType === "region" ? regionData : this.propsObj._data,
-                        this.propsObj._cascaderLevel,
-                        undefined,
-                        this.propsObj._cascaderFilterVals
-                    );
-                },
-                set () {}
-            },
-            renderCascaderData () {
-                return this.cascaderData.map(item => {
-                    return {
-                        ...item,
-                        children: []
-                    };
-                });
-            },
-            tags () {
-                return this.value[this.propsObj._key].map(item => this.$getTreeLinealDatas(item, this.cascaderData, "name").join("/"));
-            }
-        },
-        created () {},
-        methods: {
-            // 动态加载数据
-            loadData (treeItem, cb) {
-                let list = this.$getTreeLinealDatas(treeItem.codeArr, this.cascaderData);
-                treeItem.children = list[list.length - 1].children.map(item => ({ ...item, children: [] }));
-
-                cb();
-            },
-
-            // 添加
-            createTag (operationItem) {
-                if (this.cascaderVal.length) {
-                    if (this.value[this.propsObj._key].some(item => JSON.stringify(item) == JSON.stringify(this.cascaderVal))) {
-                        this.$Message.error({
-                            content: `"${this.$getTreeLinealDatas(this.cascaderVal, this.cascaderData, "name").join("/")}"已选择，请勿重复选择！`,
-                            duration: 5
-                        });
-                    } else {
-                        this.value[this.propsObj._key].push([...this.cascaderVal]);
-                        this.change();
-                    }
-
-                }
-                this.cascaderVal = [];
-            },
-            // 删除
-            deleteTag (operationItem, params) {
-                this.value[this.propsObj._key].splice(params[1], 1);
-                this.change();
-            }
-        }
-    };
-</script>

package/src/abolish/DshCrumbs.vue

@@ -1,62 +0,0 @@
-<template>
-    <div :class="classes">
-        <slot></slot>
-    </div>
-</template>
-
-<script>
-    // const prefixCls = "ivu-breadcrumb";
-    const prefixCls = "dsh-crumb";
-
-    export default {
-        name: "DshCrumb",
-        props: {
-            separator: {
-                type: String,
-                default: "/"
-            }
-        },
-        computed: {
-            classes () {
-                return `${prefixCls}`;
-            },
-            linkUrl () {
-                const type = typeof this.to;
-                if (type !== "string") {
-                    return null;
-                }
-                if (this.to.includes("//")) {
-                    /* Absolute URL, we do not need to route this */
-                    return this.to;
-                }
-                const router = this.$router;
-                if (router) {
-                    const current = this.$route;
-                    const route = router.resolve(this.to, current, this.append);
-                    return route ? route.href : this.to;
-                }
-                return this.to;
-            }
-        },
-        mounted () {
-            this.updateChildren();
-        },
-        updated () {
-            this.$nextTick(() => {
-                this.updateChildren();
-            });
-        },
-        methods: {
-            updateChildren () {
-                this.$children.forEach((child) => {
-                    child.separator = this.separator;
-                });
-            }
-        },
-        watch: {
-            separator () {
-                this.updateChildren();
-            }
-        }
-    };
-</script>