bri-components 1.1.6 → 1.2.1

package/src/components/other/DshAvatar.vue

@@ -6,18 +6,30 @@
         </template>
 
         <!-- 图片堆叠显示 -->
-        <div v-else-if="users.length > maxLength" :style="{...roundStyle}">
-            <span v-for="(user, index) in userList" :key="index" class="DshAvatar-img">
+        <div
+            v-else-if="users.length > maxLength"
+            :style="{ ...roundStyle }"
+        >
+            <span
+                v-for="(user, index) in userList"
+                :key="index"
+                class="DshAvatar-img"
+            >
                 <img :src="user && user.avatarurl || avatarSrc">
             </span>
             <span :style="{'margin-left': (userList.length + 1) * 12 + 6 + 'px'}">
-                {{userList[userList.length - 1] && userList[userList.length - 1].realname || userList[userList.length - 1] && userList[userList.length - 1].name || "吴明昊"}}
+                {{ userList[userList.length - 1] && userList[userList.length - 1].realname || userList[userList.length - 1] && userList[userList.length - 1].name }}
             </span>
         </div>
 
         <!-- 单个显示 -->
         <template v-else>
-            <div v-for="(user, index) in users" :key="index" class="DshAvatar-round" :style="{...roundStyle}">
+            <div
+                v-for="(user, index) in users"
+                :key="index"
+                class="DshAvatar-round"
+                :style="{ ...roundStyle }"
+            >
                 <div class="DshAvatar-box">
                     <div class="DshAvatar-img">
                         <img :src="user && user.avatarurl || avatarSrc">
@@ -32,7 +44,6 @@
 </template>
 
 <script>
-    // 自定义列组件
     export default {
         name: "DshAvatar",
         props: {
@@ -71,7 +82,11 @@
         },
         methods: {
             init () {
-                this.users = this.$dataType(this.rowData[this.field]) === "object" ? [this.rowData[this.field]] : (this.$dataType(this.rowData[this.field]) === "array" ? this.rowData[this.field] : []);
+                this.users = this.$dataType(this.rowData[this.field]) === "object"
+                    ? [this.rowData[this.field]]
+                    : (this.$dataType(this.rowData[this.field]) === "array"
+                        ? this.rowData[this.field]
+                        : []);
             }
         },
         watch: {
@@ -84,66 +99,3 @@
         }
     };
 </script>
-
-<style lang="less">
-    .DshAvatar {
-        position: relative;
-        span {
-            display: inline-block;
-            margin-left: 20px;
-            line-height: 22px;
-        }
-        &-img {
-            width: 22px;
-            height: 22px;
-            padding: 1px;
-            display: inline-block;
-            line-height: 20px;
-            background: #fff;
-            border-radius: 50%;
-            img {
-                width: 20px;
-                height: 20px;
-                display: inline-block;
-                border-radius: 50%;
-            }
-            &:nth-child(1) {
-                position: absolute;
-                left: 0px;
-                top: 50%;
-                margin-top: -10px;
-            }
-            &:nth-child(2) {
-                position: absolute;
-                left: 12px;
-                top: 50%;
-                margin-top: -10px;
-            }
-            &:nth-child(3) {
-                position: absolute;
-                left: 24px;
-                top: 50%;
-                margin-top: -10px;
-            }
-            &:nth-child(4) {
-                position: absolute;
-                left: 36px;
-                top: 50%;
-                margin-top: -10px;
-            }
-        }
-        &-round {
-            display: inline-block;
-            margin-right: 8px;
-        }
-        &-box {
-            position: relative;
-            img {
-                width: 20px;
-                height: 20px;
-                display: inline-block;
-                border-radius: 50%;
-            }
-        }
-    }
-</style>

package/src/components/other/DshColorPanel.vue

@@ -83,46 +83,3 @@
         }
     };
 </script>
-
-<style lang="less" scoped>
-    .DshColorPanel {
-        &-rel {
-            cursor: pointer;
-        }
-        &-list {
-            font-size: 15px;
-            display: flex;
-            width: 293px;
-            height: 72px;
-            flex-wrap: wrap;
-            justify-content: space-around;
-            align-items: center;
-            &-item {
-                padding: 6px;
-                &-big {
-                    width: 15px;
-                    height: 15px;
-                    display: inline-block;
-                    border-radius: 50%;
-                }
-                &-small {
-                    width: 12px;
-                    height: 12px;
-                    position: absolute;
-                    display: inline-block;
-                    transform: translate(1.5px,1.5px);
-                    border-radius: 50%;
-                    &:hover + span{
-                        border-width: 1px;
-                        border-style: solid;
-                    }
-                }
-            }
-        }
-    }
-</style>
-<style lang="less">
-    .DshColorPanel {
-
-    }
-</style>

package/src/components/small/{Ctooltip.vue → BriTooltip.vue}

@@ -1,6 +1,6 @@
 <template>
     <Tooltip
-        class="Ctooltip"
+        class="BriTooltip"
         style="width: 100%;"
         :disabled="disabled"
         :content="content"
@@ -24,7 +24,7 @@
 
 <script>
     export default {
-        name: "Ctooltip",
+        name: "BriTooltip",
         props: {
             content: String,
             propsObj: {

package/src/components/small/DshButtons.vue

@@ -102,7 +102,7 @@
                 v-if="moreList.length"
                 class="DshButtons-dropdown"
                 :list="moreList"
-                :trigger="'hover'"
+                trigger="hover"
                 @click="emit($event)"
             >
                 <slot name="more">
@@ -163,7 +163,7 @@
                     type: "more",
                     size: "default",
                     customIcon: "bico-gengduo",
-                    btnType: "primaryText"
+                    btnType: "linkText"
                 }
             };
         },

package/src/components/small/DshCrumbs.vue

@@ -3,6 +3,7 @@
         <slot></slot>
     </div>
 </template>
+
 <script>
     // const prefixCls = "ivu-breadcrumb";
     const prefixCls = "dsh-crumb";

package/src/components/small/DshCrumbsItem.vue

@@ -1,5 +1,5 @@
 <template>
-    <span>
+    <span class="DshCrumbItem">
         <a
             v-if="to"
             :href="linkUrl"
@@ -17,19 +17,21 @@
         >
             <slot></slot>
         </span>
+
         <span
+            v-if="!showSeparator"
             :class="separatorClasses"
             v-html="separator"
-            v-if="!showSeparator"
         ></span>
         <span
-            :class="separatorClasses"
             v-else
+            :class="separatorClasses"
         >
             <slot name="separator"></slot>
         </span>
     </span>
 </template>
+
 <script>
     const prefixCls = "dsh-crumb-item";
 

package/src/components/small/DshIcons.vue

@@ -47,17 +47,3 @@
         }
     };
 </script>
-
-<style lang="less" scoped>
-    .DshIcons {
-        display: inline-block;
-        &-item {
-            cursor: pointer;
-        }
-    }
-</style>
-<style lang="less">
-    .DshIcons {
-
-    }
-</style>

package/src/components/small/DshTags.vue

@@ -3,9 +3,10 @@
         <Tag
             v-for="(tagItem, tagIndex) in list"
             :key="tagIndex"
+            :disabled="propsObj.disabled || tagItem.disabled"
             :name="tagIndex"
             :type="propsObj.type"
-            :closable="propsObj.closable === false ? false : true"
+            :closable="closable(tagItem)"
             :checkable="propsObj.checkable"
             :checked="propsObj.checked"
             :color="propsObj.color || 'default'"
@@ -15,7 +16,7 @@
             @on-change="changeChecked"
         >
             <slot :tagItem="tagItem">
-                {{ tagItem }}
+                {{ $dataType(tagItem) === "object" ? tagItem.realname || tagItem.full_name || tagItem.name : tagItem }}
             </slot>
         </Tag>
     </div>
@@ -39,7 +40,11 @@
             }
         },
         data () {
-            return {};
+            return {
+                closable (tagItem) {
+                    return this.propsObj.disabled || tagItem.disabled ? false : (this.propsObj.closable !== false);
+                }
+            };
         },
         computed: {},
         created () {},

package/src/components/unit/DshFormItem.vue

@@ -24,7 +24,7 @@
         >
             <!-- 左 -->
             <span class="DshFormItem-label-left">
-                <Ctooltip
+                <bri-tooltip
                     :content="formItem._name"
                     transfer
                 >
@@ -49,7 +49,7 @@
                             :render="tipsRender(formItem,formData)"
                         ></dsh-render>
                     </span>
-                </Ctooltip>
+                </bri-tooltip>
             </span>
 
             <!-- 右 -->
@@ -58,7 +58,7 @@
                 class="DshFormItem-label-right"
             >
                 <slot name="extra">
-                    <Ctooltip
+                    <bri-tooltip
                         :content="formItem._description"
                         transfer
                         style="height: 14px;"
@@ -66,7 +66,7 @@
                         <span class="DshFormItem-label-description dsh-ellipsis">
                             {{ formItem._description && `* ${formItem._description}` }}
                         </span>
-                    </Ctooltip>
+                    </bri-tooltip>
                 </slot>
             </span>
         </div>

package/src/components/unit/DshUnit.vue

@@ -57,11 +57,3 @@
         methods: {}
     };
 </script>
-
-<style lang="less">
-    .DshUnit {
-        .ivu-input {
-            font-size: 12px;
-        }
-    }
-</style>

package/src/index.js

@@ -12,19 +12,18 @@ import DshBox from "./components/list/DshBox/DshBox.vue";
 import DshTable from "./components/list/DshBox/DshTable.vue";
 import DshList from "./components/list/DshBox/DshList.vue";
 
-import BriTable from "./components/list/BriTable.vue";
-import ZTree from "./components/list/ZTree.vue";
 import BriFlatTable from "./components/list/BriFlatTable.vue";
+import BriTable from "./components/list/BriTable.vue";
 import DshCascaderTable from "./components/list/DshCascaderTable.vue";
+import DshPage from "./components/list/DshPage.vue";
 
 // form
 import DshForm from "./components/form/DshForm.vue";
 import DshAdvSearchForm from "./components/form/DshAdvSearchForm.vue";
 import DshDefaultSearch from "./components/form/DshDefaultSearch.vue";
-
 // unit
-import DshUnit from "./components/unit/DshUnit.vue";
 import DshFormItem from "./components/unit/DshFormItem.vue";
+import DshUnit from "./components/unit/DshUnit.vue";
 
 // controls
 import DshInput from "./components/controls/base/DshInput.vue";
@@ -33,39 +32,32 @@ import DshSelect from "./components/controls/base/DshSelect.vue";
 import DshCheckbox from "./components/controls/base/DshCheckbox.vue";
 import DshCascader from "./components/controls/base/DshCascader/DshCascader.vue";
 
-// 其他
-import ZCode from "./components/other/ZCode.vue";
-import DshMenu from "./components/other/menu/DshMenu.vue";
-import DshMenuNav from "./components/other/menu/DshMenuNav.vue";
-import DshBtnModal from "./components/other/DshBtnModal.vue";
+// other
+import BriCode from "./components/other/BriCode.vue";
+import BriLoading from "./components/other/BriLoading.vue";
 import DshAvatar from "./components/other/DshAvatar.vue";
-import DshEditPanel from "./components/other/DshEditPanel.vue";
+import DshBtnModal from "./components/other/DshBtnModal.vue";
 import DshColorPanel from "./components/other/DshColorPanel.vue";
-import YNoPermission from "./components/other/YNoPermission.vue";
-import ZGantt from "./components/other/ZGantt.vue";
-import ZCollapseTree from "./components/other/ZCollapseTree.vue";
-import ZLoading from "./components/other/ZLoading.vue";
-import BriTransfer from "./components/other/BriTransfer.vue";
+import DshEditPanel from "./components/other/DshEditPanel.vue";
+import DshMenu from "./components/other/DshMenu.vue";
+import DshMenuNav from "./components/other/DshMenuNav.vue";
 
 // small
-import DshModal from "./components/small/DshModal.vue";
+import BriButton from "./components/small/BriButton.vue";
 import BriDrawer from "./components/small/BriDrawer.vue";
-import DshDropdown from "./components/small/DshDropdown.vue";
-import DshRender from "./components/small/render.js";
-import DshTdRender from "./components/small/DshTdRender.js";
-import DshTitle from "./components/small/DshTitle.vue";
+import BriTooltip from "./components/small/BriTooltip.vue";
 import DshButtons from "./components/small/DshButtons.vue";
-import DshIcons from "./components/small/DshIcons.vue";
-import DshTags from "./components/small/DshTags.vue";
 import DshCrumbs from "./components/small/DshCrumbs.vue";
 import DshCrumbsItem from "./components/small/DshCrumbsItem.vue";
-import DshTabs from "./components/small/DshTabs.vue";
+import DshDropdown from "./components/small/DshDropdown.vue";
+import DshIcons from "./components/small/DshIcons.vue";
+import DshModal from "./components/small/DshModal.vue";
 import DshSteps from "./components/small/DshSteps.vue";
-import Ctooltip from "./components/small/Ctooltip.vue";
-import DshPage from "./components/small/DshPage.vue";
-import DshFileShow from "./components/small/DshFileShow.vue";
-import BriButton from "./components/small/BriButton.vue";
-import BriTree from "./components/small/BriTree.vue";
+import DshTabs from "./components/small/DshTabs.vue";
+import DshTags from "./components/small/DshTags.vue";
+import DshTitle from "./components/small/DshTitle.vue";
+import DshRender from "./components/small/render.js";
+import DshTdRender from "./components/small/DshTdRender.js";
 
 /* -------------------- 局部组件 ----------------------- */
 // error
@@ -73,85 +65,86 @@ import Error500 from "./components/Error/Error500.vue";
 import Error403 from "./components/Error/Error403.vue";
 import Error404 from "./components/Error/Error404.vue";
 
+// list
+import BriCard from "./components/list/BriCard.vue";
+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 BriUpload from "./components/controls/base/BriUpload/index.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";
 import DshEditor from "./components/controls/base/DshEditor.vue";
 import DshDivider from "./components/controls/base/DshDivider.vue";
-
-/* 不挂载全局 */
 import DshPackage from "./components/controls/senior/DshPackage.vue";
 import DshBack from "./components/controls/special/DshBack.vue";
 import DshUndeveloped from "./components/controls/special/DshUndeveloped.vue";
+
 // other
-import ZIframe from "./components/other/ZIframe.vue";
-import BriSvg from "./components/other/BriSvg.vue";
+import BriCollapseTree from "./components/other/BriCollapseTree.vue";
+import BriGantt from "./components/other/BriGantt.vue";
+import BriIframe from "./components/other/BriIframe.vue";
 
 // ！！！！！！挂载全局的组件，不是别写在这
 const map = {
     DshDraggable,
     DshCropper,
 
+    // list
     DshBox,
     DshTable,
     DshList,
+
+    BriFlatTable, // 可取消全局
     BriTable,
-    ZTree,
-    BriFlatTable,
-    DshCascaderTable,
+    DshCascaderTable, // 可取消全局
+    DshPage,
 
+    // form
     DshForm,
     DshAdvSearchForm,
     DshDefaultSearch,
-
-    DshUnit,
+    // unit
     DshFormItem,
+    DshUnit,
 
+    // controls
     DshInput,
     DshNumber,
     DshSelect,
     DshCheckbox,
     DshCascader,
 
-    ZCode,
-    DshMenu,
-    DshMenuNav,
-    DshBtnModal,
+    // other
+    BriLoading,
     DshAvatar,
+    DshBtnModal,
     DshEditPanel,
     DshColorPanel,
-    YNoPermission,
-    ZGantt,
-    ZCollapseTree,
-    ZLoading,
-    BriTransfer,
+    DshMenu,
+    DshMenuNav,
 
-    DshModal,
+    // small
+    BriButton,
     BriDrawer,
-    DshDropdown,
-    DshRender,
-    DshTdRender,
-    DshTitle,
+    BriTooltip,
     DshButtons,
-    DshIcons,
-    DshTags,
     DshCrumbs,
     DshCrumbsItem,
-    DshTabs,
+    DshDropdown,
+    DshIcons,
+    DshModal,
     DshSteps,
-    Ctooltip,
-    DshPage,
-    DshFileShow,
-    BriButton,
-    BriTree,
-
-    BriSvg
+    DshTabs,
+    DshTags,
+    DshTitle,
+    DshRender,
+    DshTdRender
 };
 const install = function (Vue, opts = {}) {
     ViewUI.LoadingBar.config({
@@ -187,64 +180,37 @@ export {
     DshDraggable,
     DshCropper,
 
+    Error500,
+    Error403,
+    Error404,
+
     DshBox,
     DshTable,
     DshList,
-    BriTable,
-    ZTree,
+
+    BriCard,
     BriFlatTable,
+    BriTable,
+    BriTree,
+    BriTreeItem,
     DshCascaderTable,
+    DshPage,
 
+    // form
     DshForm,
     DshAdvSearchForm,
     DshDefaultSearch,
-
-    DshUnit,
+    // unit
     DshFormItem,
+    DshUnit,
 
+    // controls
     DshInput,
     DshNumber,
     DshSelect,
     DshCheckbox,
     DshCascader,
 
-    ZCode,
-    DshMenu,
-    DshMenuNav,
-    DshBtnModal,
-    DshAvatar,
-    DshEditPanel,
-    DshColorPanel,
-    YNoPermission,
-    ZGantt,
-    ZCollapseTree,
-    ZLoading,
-    BriTransfer,
-
-    DshModal,
-    BriDrawer,
-    DshDropdown,
-    DshRender,
-    DshTdRender,
-    DshTitle,
-    DshButtons,
-    DshIcons,
-    DshTags,
-    DshCrumbs,
-    DshCrumbsItem,
-    DshTabs,
-    DshSteps,
-    Ctooltip,
-    DshPage,
-    DshFileShow,
-    BriButton,
-    BriTree,
-
-    /* 局部 */
-    Error500,
-    Error403,
-    Error404,
-
     BriInputs,
     DshNumberange,
     DshDate,
@@ -255,11 +221,38 @@ export {
     DshCoordinates,
     DshEditor,
     DshDivider,
-
     DshPackage,
     DshBack,
     DshUndeveloped,
 
-    ZIframe,
-    BriSvg
+    // other
+    BriCode,
+    BriLoading,
+    DshAvatar,
+    DshBtnModal,
+    DshColorPanel,
+    DshEditPanel,
+    DshMenu,
+    DshMenuNav,
+
+    BriCollapseTree,
+    BriGantt,
+    BriIframe,
+
+    // small
+    BriButton,
+    BriDrawer,
+    DshButtons,
+    BriTooltip,
+    DshCrumbs,
+    DshCrumbsItem,
+    DshDropdown,
+    DshIcons,
+    DshModal,
+    DshSteps,
+    DshTabs,
+    DshTags,
+    DshTitle,
+    DshRender,
+    DshTdRender
 };