bri-components 1.2.27 → 1.2.29

package/src/components/other/{DshAvatar.vue → BriAvatar.vue}

@@ -1,5 +1,5 @@
 <template>
-    <div class="DshAvatar">
+    <div class="BriAvatar">
         <!-- 无显示 -->
         <template v-if="users.length == 0">
 
@@ -13,7 +13,7 @@
             <span
                 v-for="(user, index) in userList"
                 :key="index"
-                class="DshAvatar-img"
+                class="BriAvatar-img"
             >
                 <img :src="user && user.avatarurl || avatarSrc">
             </span>
@@ -27,11 +27,11 @@
             <div
                 v-for="(user, index) in users"
                 :key="index"
-                class="DshAvatar-round"
+                class="BriAvatar-round"
                 :style="{ ...roundStyle }"
             >
-                <div class="DshAvatar-box">
-                    <div class="DshAvatar-img">
+                <div class="BriAvatar-box">
+                    <div class="BriAvatar-img">
                         <img :src="user && user.avatarurl || avatarSrc">
                     </div>
                     <span>
@@ -45,7 +45,7 @@
 
 <script>
     export default {
-        name: "DshAvatar",
+        name: "BriAvatar",
         props: {
             rowData: {
                 type: Object

package/src/components/unit/DshFormUnit.vue

@@ -4,8 +4,7 @@
             {
                 'DshFormUnit': true,
                 'DshFormUnit-required': canEdit && formItem._required,
-                'DshFormUnit-line': formItem._line,
-                'DshFormUnit-readOnly': !canEdit
+                'DshFormUnit-line': formItem._line
             },
             formControlClass,
             formItem.formControlClass

package/src/index.js

@@ -8,21 +8,21 @@ import { VeTable, VeLocale } from "vue-easytable";
 import CN from "vue-easytable/libs/locale/lang/zh-CN.js";
 
 // list
+import BriTable from "./components/list/BriTable.vue";
+import BriFlatTable from "./components/list/BriFlatTable.vue";
 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 DshTable from "./components/list/DshBox/DshTable.vue";
 import DshPage from "./components/list/DshPage.vue";
-import BriFlatTable from "./components/list/BriFlatTable.vue";
 // import DshCascaderTable from "./components/list/DshCascaderTable.vue";
 
 // form
 import DshForm from "./components/form/DshForm.vue";
-import DshAdvSearchForm from "./components/form/DshAdvSearchForm.vue";
+import DshAdvSearch from "./components/form/DshAdvSearch.vue";
 import DshDefaultSearch from "./components/form/DshDefaultSearch.vue";
 // unit
+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";
@@ -32,9 +32,10 @@ import DshCheckbox from "./components/controls/base/DshCheckbox.vue";
 import DshCascader from "./components/controls/base/DshCascader/DshCascader.vue";
 
 // other
+import BriAvatar from "./components/other/BriAvatar.vue";
 import BriLoading from "./components/other/BriLoading.vue";
+import BriIframe from "./components/other/BriIframe.vue";
 import BriSvg from "./components/other/BriSvg.vue";
-import DshAvatar from "./components/other/DshAvatar.vue";
 
 // small
 import BriButton from "./components/small/BriButton.vue";
@@ -52,7 +53,7 @@ import DshRender from "./components/small/render.js";
 import DshListRender from "./components/small/DshListRender.js";
 
 /* -------------------- 局部组件 ----------------------- */
-// error
+// Error
 import Error500 from "./components/Error/Error500.vue";
 import Error403 from "./components/Error/Error403.vue";
 import Error404 from "./components/Error/Error404.vue";
@@ -62,9 +63,6 @@ import BriCard from "./components/list/BriCard.vue";
 import BriTree from "./components/list/BriTree.vue";
 import BriTreeItem from "./components/list/BriTreeItem.vue";
 
-// unit
-import DshFormUnit from "./components/unit/DshFormUnit.vue";
-
 // controls
 import BriInputs from "./components/controls/base/BriInputs.vue";
 import DshNumberange from "./components/controls/base/DshNumberange.vue";
@@ -89,7 +87,6 @@ import DshMenuNav from "./components/other/DshMenuNav.vue";
 import BriCode from "./components/other/BriCode.vue";
 import BriCollapseTree from "./components/other/BriCollapseTree.vue";
 import BriGantt from "./components/other/BriGantt.vue";
-import BriIframe from "./components/other/BriIframe.vue";
 import DshColorPanel from "./components/other/DshColorPanel.vue";
 
 // small
@@ -101,19 +98,19 @@ const map = {
     DshCropper,
 
     // list
+    BriTable,
     DshBox,
-    DshTable,
     DshList,
-    BriTable,
+    DshTable,
     DshPage,
 
     // form
     DshForm,
-    DshAdvSearchForm,
+    DshAdvSearch,
     DshDefaultSearch,
     // unit
+    DshFormUnit,
     DshListUnit,
-
     // controls
     BriControlInput,
     DshInput,
@@ -123,8 +120,10 @@ const map = {
     DshCascader,
 
     // other
+    BriAvatar,
     BriLoading,
-    DshAvatar,
+    BriIframe,
+    BriSvg,
 
     // small
     BriButton,
@@ -142,6 +141,8 @@ const map = {
     DshListRender
 };
 const install = function (Vue, opts = {}) {
+    const { globalMap = {} } = opts;
+
     ViewUI.LoadingBar.config({
         color: "#2d8cf0",
         failedColor: "red",
@@ -157,10 +158,9 @@ const install = function (Vue, opts = {}) {
     });
 
     // 挂载组件
-    const { globalMap } = opts;
     const componentMap = {
         ...map,
-        ...(globalMap || {})
+        ...globalMap
     };
     Object.keys(componentMap).forEach(key => {
         Vue.component(key, componentMap[key]);
@@ -175,38 +175,61 @@ export {
     DshDraggable,
     DshCropper,
 
-    Error500,
-    Error403,
-    Error404,
-
+    // list
+    BriTable,
     DshBox,
-    DshTable,
     DshList,
-    BriTable,
+    DshTable,
     DshPage,
-    BriFlatTable,
-    // DshCascaderTable,
-
-    BriCard,
-    BriTree,
-    BriTreeItem,
 
     // form
     DshForm,
-    DshAdvSearchForm,
+    DshAdvSearch,
     DshDefaultSearch,
     // unit
-    DshListUnit,
-
     DshFormUnit,
-
+    DshListUnit,
     // controls
+    BriControlInput,
     DshInput,
     DshNumber,
     DshSelect,
     DshCheckbox,
     DshCascader,
 
+    // other
+    BriAvatar,
+    BriLoading,
+    BriIframe,
+    BriSvg,
+
+    // small
+    BriButton,
+    BriDrawer,
+    BriTooltip,
+    DshButtons,
+    DshDropdown,
+    DshIcons,
+    DshModal,
+    DshSteps,
+    DshTabs,
+    DshTags,
+    DshTitle,
+    DshRender,
+    DshListRender,
+
+    /* 只局部导出的 */
+    Error500,
+    Error403,
+    Error404,
+
+    BriFlatTable,
+    // DshCascaderTable,
+
+    BriCard,
+    BriTree,
+    BriTreeItem,
+
     BriInputs,
     DshNumberange,
     DshDate,
@@ -223,32 +246,12 @@ export {
     selectUsers,
     selectDepartments,
 
-    // other
-    BriLoading,
-    BriSvg,
-    DshAvatar,
-
     DshMenuNav,
     BriCode,
     BriCollapseTree,
     BriGantt,
-    BriIframe,
     DshColorPanel,
 
     // small
-    BriButton,
-    BriDrawer,
-    DshButtons,
-    BriTooltip,
-    DshDropdown,
-    DshIcons,
-    DshModal,
-    DshSteps,
-    DshTabs,
-    DshTags,
-    DshTitle,
-    DshRender,
-    DshListRender,
-
     DshBtnModal
 };

package/src/styles/components/form/DshAdvSearchForm.less

@@ -1,4 +1,4 @@
-.DshAdvSearchForm {
+.DshAdvSearch {
     #title {
         font-weight: 400;
         color: #999999;
@@ -39,7 +39,7 @@
 
             &:hover,
             &-active {
-                .DshAdvSearchForm-conditions-delete {
+                .DshAdvSearch-conditions-delete {
                     display: inline-block;
                 }
             }

package/src/styles/components/index.less

@@ -17,12 +17,11 @@
 
 // form
 @import "./form/DshForm.less";
-@import "./form/DshAdvSearchForm.less";
+@import "./form/DshAdvSearch.less";
 @import "./form/DshDefaultSearch.less";
 // unit
 @import "./unit/DshFormUnit.less";
 @import "./unit/DshListUnit.less";
-
 // controls
 @import "./controls/BriControlInput.less";
 
@@ -52,15 +51,15 @@
 @import "./controls/special/DshUndeveloped.less";
 
 // other
+@import "./other/BriAvatar.less";
+@import "./other/BriIframe.less";
 @import "./other/BriLoading.less";
-@import "./other/DshAvatar.less";
-@import "./other/DshColorPanel.less";
 
+@import "./other/DshColorPanel.less";
 @import "./other/DshMenuNav.less";
 @import "./other/BriCode.less";
 @import "./other/BriCollapseTree.less";
 @import "./other/BriGantt.less";
-@import "./other/BriIframe.less";
 
 // small
 @import "./small/BriButton.less";

package/src/styles/components/list/BriCard.less

@@ -26,16 +26,6 @@
                 line-height: 50px;
                 text-align: center;
             }
-
-            .avatar {
-                position: absolute;
-                width: 40px;
-                height: 40px;
-                display: block;
-                border-radius: 50%;
-                left: 10px;
-                top: 5px;
-            }
         }
 
         &-active {

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

@@ -1,4 +1,4 @@
-.DshAvatar {
+.BriAvatar {
     position: relative;
 
     span {

package/src/styles/components/unit/DshFormUnit.less

@@ -102,8 +102,4 @@
             align-items: center;
         }
     }
-
-    &-readOnly {
-        border-bottom: 1px solid #E5E5E5;
-    }
 }