bri-components 1.2.54 → 1.2.56

package/src/components/controls/senior/selectUsers/selectUsers.vue

@@ -9,18 +9,15 @@
             <div @click="clickInput">
                 <slot>
                     <!-- 编辑 -->
-                    <bri-control-input
+                    <dsh-control-input
                         v-if="canEdit"
-                        :class="{
-                            ...commonClass
-                        }"
-                        :canEdit="finalCanEdit"
+                        :class="commonClass"
                         :value="curValList"
-                        :inputIcon="inputIcon"
+                        :disabled="selfPropsObj._disabled"
                         :propsObj="selfPropsObj"
                         @deleteItem="clickDeleteItem"
                         @clear="clickClear"
-                    ></bri-control-input>
+                    ></dsh-control-input>
 
                     <!-- 表格查看 -->
                     <div
@@ -283,7 +280,7 @@
         computed: {
             selfPropsObj () {
                 return {
-                    _multiple: false,
+                    _icon: this.multipleMode ? "ios-people" : "ios-person",
                     _highSearch: false,
 
                     ...this.propsObj,
@@ -293,9 +290,6 @@
             highSearch () {
                 return this.isOnSearch ? true : this.selfPropsObj._highSearch;
             },
-            inputIcon () {
-                return this.multipleMode ? "ios-people" : "ios-person";
-            },
 
             curCheckAll () {
                 return this.userList.length && this.userList.every(userItem =>

package/src/components/form/DshDefaultSearch.vue

@@ -239,7 +239,7 @@
         input,
         .ivu-select-selection,
         .ivu-input-number,
-        .BriControlInput,
+        .DshControlInput,
         .DshDaterange-item {
             border-radius: 0px!important;
         }

package/src/components/list/DshBox/DshCrossTable.vue

@@ -112,6 +112,18 @@
 
                                             <template v-else>
                                                 {{ colItem.title }}
+                                                <Tooltip
+                                                    v-if="colItem._comment"
+                                                    :content="colItem._comment"
+                                                    :transfer="true"
+                                                    placement="top-start"
+                                                    max-width="200"
+                                                >
+                                                    <Icon
+                                                        type="ios-help-circle-outline"
+                                                        size="16"
+                                                    />
+                                                </Tooltip>
                                             </template>
                                         </slot>
                                     </div>

package/src/components/unit/DshFormUnit.vue

@@ -79,6 +79,7 @@
 
             <slot>
                 <component
+                    class="DshFormUnit-control-component"
                     ref="control"
                     :is="curComponentName"
                     :canEdit="canEdit"
@@ -247,6 +248,10 @@
                 display: flex;
                 justify-content: flex-end;
                 align-items: center;
+
+                &-component {
+                    width: 100%;
+                }
             }
         }
 

package/src/index.js

@@ -25,7 +25,7 @@ import DshDefaultSearch from "./components/form/DshDefaultSearch.vue";
 import DshFormUnit from "./components/unit/DshFormUnit.vue";
 import DshListUnit from "./components/unit/DshListUnit.vue";
 // controls
-import BriControlInput from "./components/controls/BriControlInput.vue";
+import DshControlInput from "./components/controls/DshControlInput.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/DshSelect.vue";
@@ -115,7 +115,7 @@ const map = {
     DshFormUnit,
     DshListUnit,
     // controls
-    BriControlInput,
+    DshControlInput,
     DshInput,
     DshNumber,
     DshSelect,
@@ -195,7 +195,7 @@ export {
     DshFormUnit,
     DshListUnit,
     // controls
-    BriControlInput,
+    DshControlInput,
     DshInput,
     DshNumber,
     DshSelect,

package/src/components/controls/base/DshCascader/InfoCascader.vue

@@ -1,345 +0,0 @@
-<template>
-    <div class="InfoCascader">
-        <dsh-modal
-            v-model="modalVal"
-            mode="middle"
-            :propsObj="modalPropsObj"
-        >
-            <dsh-input
-                class="InfoCascader-search"
-                :value="searchData"
-                :propsObj="searchPropsObj"
-            ></dsh-input>
-
-            <div class="InfoCascader-content">
-                <div class="InfoCascader-content-left">
-                    <Tree
-                        v-if="show"
-                        expand-node
-                        :data="treeData"
-                    ></Tree>
-                </div>
-
-                <div class="InfoCascader-content-right">
-                    <div class="InfoCascader-content-right-title">
-                        {{ curName }}说明
-                    </div>
-                    <p
-                        class="InfoCascader-content-right-content"
-                        v-html="description"
-                    ></p>
-                </div>
-            </div>
-
-            <div class="InfoCascader-footer">
-                <dsh-buttons
-                    class="InfoCascader-footer-btns"
-                    :list="$getOperationList(['canCancel', 'canConfirm'])"
-                    @click="$dispatchEvent($event)"
-                ></dsh-buttons>
-            </div>
-        </dsh-modal>
-    </div>
-</template>
-
-<script>
-    export default {
-        name: "InfoCascader",
-        props: {
-            showModal: {
-                type: Boolean,
-                default: false
-            },
-
-            value: {
-                type: Array,
-                default () {
-                    return [];
-                }
-            },
-            data: {
-                type: Array,
-                default () {
-                    return [];
-                }
-            },
-            propsObj: {
-                type: Object,
-                default () {
-                    return {};
-                }
-            }
-        },
-        data () {
-            return {
-                searchData: {
-                    search: ""
-                },
-                searchPropsObj: {
-                    _key: "search",
-                    _name: "关键字搜索"
-                },
-                curSelect: {},
-
-                show: true,
-                curName: "",
-                description: "",
-
-                operationMap: {
-                    canCancel: {
-                        name: "取消",
-                        type: "canCancel",
-                        class: "z-default",
-                        event: "clickCancel"
-                    },
-                    canConfirm: {
-                        name: "确定",
-                        btnType: "primary",
-                        type: "clickConfirm",
-                        event: "clickConfirm",
-                        class: "z-primary"
-                    }
-                }
-            };
-        },
-        computed: {
-            modalVal: {
-                get () {
-                    return this.showModal;
-                },
-                set (val) {
-                    this.$emit("close", val);
-                }
-            },
-
-            modalPropsObj () {
-                return {
-                    title: this.propsObj._name
-                };
-            },
-            selfPropsObj () {
-                return {
-                    ...this.propsObj
-                };
-            },
-            saveKey () {
-                return this.selfPropsObj._saveKey;
-            },
-            resourceKey () {
-                return this.selfPropsObj._resourceKey;
-            },
-
-            initData () {
-                return this.loop(this.data, null);
-            },
-            treeData () {
-                // 内容为空时，查询所有
-                if (!this.searchData.search) {
-                    return this.initData;
-                } else {
-                    const loop = (value, treeList) => {
-                        let newarr = [];
-                        treeList.forEach(element => {
-                            if (element.children && element.children.length) {
-                                const ab = loop(value, element.children);
-                                const obj = {
-                                    ...element,
-                                    expand: true,
-                                    children: ab
-                                };
-                                if (ab && ab.length) {
-                                    newarr.push(obj);
-                                } else if (element.title.indexOf(value) > -1) {
-                                    element.expand = true;
-                                    newarr.push(element);
-                                }
-                            } else {
-                                if (element.title.indexOf(value) > -1) {
-                                    newarr.push(element);
-                                }
-                            }
-                        });
-                        return newarr;
-                    };
-
-                    return loop(this.searchData.search, this.initData);
-                }
-            }
-        },
-        created () {
-            this.init();
-        },
-        methods: {
-            init () {
-                this.curSelect.keys = this.value;
-
-                if (this.value.length) {
-                    // 回显已选择的名称
-                    const loop = (arr) => {
-                        for (let item of arr) {
-                            if (
-                                item.keys.length === this.value.length &&
-                                item.keys.every((code, idx) => code === this.value[idx])
-                            ) {
-                                this.curName = item.name;
-                                break;
-                            }
-                            if (item.children.length) {
-                                loop(item.children);
-                            }
-                        }
-                    };
-                    loop(this.initData);
-                    this.getDescription(this.value);
-                }
-            },
-
-            clickCancel () {
-                this.$emit("close", false);
-            },
-            clickConfirm () {
-                if (this.curName) {
-                    this.$emit("input", this.curSelect.keys);
-                    this.$emit("change", this.curSelect.keys);
-                    this.$emit("close", false);
-                } else {
-                    this.$Message.warning(`请选择${this.propsObj._name}!`);
-                }
-            },
-            change (node) {
-                this.curName = node.name;
-
-                if (
-                    this.curSelect.keys &&
-                    this.curSelect.keys.length === node.keys.length &&
-                    node.keys.length &&
-                    node.keys.every((code, idx) => code === this.curSelect.keys[idx])
-                ) {
-                    this.curSelect = {};
-                } else {
-                    if (!this.propsObj._cascaderLevel || node.level == this.propsObj._cascaderLevel || !node.children.length) {
-                        this.curSelect = node;
-                    }
-                    this.getDescription(node.keys);
-                }
-            },
-
-            loop (data = [], level) {
-                return data
-                    ? data.reduce((arr, item) => {
-                        item.expand = false;
-                        if (this.value.length) {
-                            let arr = this.$getTreeLinealDatas(this.value, this.data, undefined, this.saveKey);
-                            arr.forEach(i => { i.expand = true; });
-                        }
-                        const newItem = {
-                            ...item,
-                            value: item._key,
-                            title: item.name,
-                            disabled: this.propsObj._cascaderLevel ? (item.level < this.propsObj._cascaderLevel) : true,
-                            render: (h, { root, node, data }) => {
-                                return h("span", {
-                                    class: {
-                                        "ivu-tree-title-selected": this.curSelect.keys && this.curSelect.keys.length && this.curSelect.keys.length === data.keys.length && this.curSelect.keys.every((code, idx) => code === data.keys[idx])
-                                    },
-                                    style: {
-                                        display: "inline-block",
-                                        width: "100%"
-                                    },
-                                    on: {
-                                        click: () => {
-                                            this.change(data);
-                                        }
-                                    }
-                                }, data.title);
-                            }
-                        };
-                        if (!level || level > item.level) {
-                            newItem.children = this.loop(item.children, level);
-                        }
-                        arr.push(newItem);
-
-                        return arr;
-                    }, [])
-                    : [];
-            },
-            getDescription (nodeKeys) {
-                this.$https({
-                    url: {
-                        module: "sheet",
-                        name: "getResourceDescription"
-                    },
-                    params: {
-                        resourceKey: this.resourceKey,
-                        nodeKeys
-                    },
-                    callback: data => {
-                        this.description = data;
-                    }
-                });
-            }
-        }
-    };
-</script>
-
-<style lang="less">
-    .InfoCascader {
-        height: 100%;
-
-        &-search {
-            padding: 24px 24px 0;
-            width: 100%;
-        }
-
-        &-content {
-            height: calc(100% - 142px);
-            margin: 5px 24px 24px;
-            display: flex;
-            border: 1px solid #E5E5E5;
-
-            &-left {
-                flex: 1;
-                padding: 5px 0 5px 10px;
-                overflow: auto;
-                border-right: 1px solid #E5E5E5;
-            }
-
-            &-right {
-                flex: 1;
-
-                &-title {
-                    border-bottom: 1px solid #E5E5E5;
-                    font-weight: 700;
-                    // height: 32px;
-                    // line-height: 32px;
-
-                    padding: 6px 16px;
-                }
-
-                &-content {
-                    height: calc(100% - 32px);
-                    overflow: auto;
-                    padding: 16px;
-                    white-space: pre-line;
-                }
-            }
-
-            .ivu-tree-title-selected {
-                color: #3D84EE;
-                background-color: #eee;
-            }
-
-            .ivu-tree-empty {
-                text-align: center;
-            }
-        }
-
-        &-footer {
-            &-btns {
-                display: flex;
-                justify-content: flex-end;
-                padding-right: 16px;
-            }
-        }
-    }
-</style>