bri-components 1.2.26 → 1.2.28

package/src/components/form/{DshAdvSearchForm.vue → DshAdvSearch.vue}

@@ -1,12 +1,12 @@
 <template>
-    <div class="DshAdvSearchForm">
+    <div class="DshAdvSearch">
         <!-- 无可筛选字段 -->
         <template v-if="searchFormList.length">
             <!-- 筛选逻辑 -->
-            <div class="DshAdvSearchForm-logic">
-                <div class="DshAdvSearchForm-logic-title">筛选逻辑</div>
+            <div class="DshAdvSearch-logic">
+                <div class="DshAdvSearch-logic-title">筛选逻辑</div>
                 <dsh-select
-                    class="DshAdvSearchForm-logic-option"
+                    class="DshAdvSearch-logic-option"
                     :value="value"
                     :propsObj="selfLogicPropsObj"
                     @change="change"
@@ -14,14 +14,14 @@
             </div>
 
             <!-- 筛选条件 -->
-            <div class="DshAdvSearchForm-title">筛选条件</div>
-            <div class="DshAdvSearchForm-conditions">
+            <div class="DshAdvSearch-title">筛选条件</div>
+            <div class="DshAdvSearch-conditions">
                 <template v-for="(conditionItem, conditionIndex) in value.conditions">
                     <!-- 'and', 'or' 循环模式 -->
                     <div
                         v-if="['and', 'or'].includes(conditionItem.logic)"
                         :key="`${conditionItem._id}andor`"
-                        class="DshAdvSearchForm-conditions-loop"
+                        class="DshAdvSearch-conditions-loop"
                     >
                         <dsh-advSearch-form
                             :isInner="true"
@@ -35,7 +35,7 @@
                         <!-- 删除 -->
                         <dsh-icons
                             slot="corner"
-                            class="DshAdvSearchForm-conditions-delete"
+                            class="DshAdvSearch-conditions-delete"
                             :list="$getOperationList(['deleteContion'])"
                             @click="$dispatchEvent($event, conditionItem, conditionIndex, value.conditions)"
                         />
@@ -45,7 +45,7 @@
                     <dsh-form-unit
                         v-else-if="['field', undefined].includes(conditionItem.logic)"
                         :key="`${conditionItem._id}field`"
-                        class="DshAdvSearchForm-conditions-item"
+                        class="DshAdvSearch-conditions-item"
                         :formData="conditionItem"
                         :formItem="conditionItem.formItem"
                         height="80"
@@ -66,14 +66,14 @@
 
                                 <div
                                     v-else
-                                    class="DshAdvSearchForm-conditions-item-loading"
+                                    class="DshAdvSearch-conditions-item-loading"
                                 >加载中……</div>
                             </template>
 
                             <!-- 动态筛选字段，出现是有条件的  -->
                             <dsh-select
                                 v-else-if="conditionItem.parameterType === 'dynamicText'"
-                                class="DshAdvSearchForm-conditions-item-control"
+                                class="DshAdvSearch-conditions-item-control"
                                 :value="conditionItem"
                                 :propsObj="{
                                     _name: `${conditionItem.formItem._name}的动态参数`,
@@ -87,7 +87,7 @@
                             <!-- 为空和不为空时 啥不显示 -->
                             <div
                                 v-else-if="['isnull', 'notnull', 'nosize', 'size', 'nolist', 'list'].includes(conditionItem.fieldOperator)"
-                                class="DshAdvSearchForm-conditions-item-blank"
+                                class="DshAdvSearch-conditions-item-blank"
                             >请选择右上角条件</div>
                         </template>
 
@@ -95,7 +95,7 @@
                         <div
                             v-if="!conditionItem.__isDelete__"
                             slot="extra"
-                            class="DshAdvSearchForm-conditions-item-extra"
+                            class="DshAdvSearch-conditions-item-extra"
                         >
                             <!-- 动态or固定 筛选条件，出现是有条件的 -->
                             <dsh-select
@@ -128,7 +128,7 @@
                         <!-- 删除 -->
                         <dsh-icons
                             slot="corner"
-                            class="DshAdvSearchForm-conditions-delete"
+                            class="DshAdvSearch-conditions-delete"
                             :list="$getOperationList(['deleteContion'])"
                             @click="$dispatchEvent($event, conditionItem, conditionIndex, value.conditions)"
                         />
@@ -153,26 +153,26 @@
             </div>
 
             <!-- 按钮s -->
-            <div class="DshAdvSearchForm-btns">
+            <div class="DshAdvSearch-btns">
                 <!-- 添加筛选项 -->
                 <dsh-dropdown
-                    class="DshAdvSearchForm-btns-field"
-                    menuClass="DshAdvSearchForm-btns-field-list"
+                    class="DshAdvSearch-btns-field"
+                    menuClass="DshAdvSearch-btns-field-list"
                     :list="searchFormList"
                     :useSearch="true"
                     trigger="click"
                     @click="$dispatchEvent(operationMap.createContion, false, $event)"
                 >
                     <dsh-buttons
-                        itemClass="DshAdvSearchForm-btns-field-create"
+                        itemClass="DshAdvSearch-btns-field-create"
                         :list="$getOperationList(['createContion'])"
                     ></dsh-buttons>
                 </dsh-dropdown>
 
                 <!-- 添加循环层 -->
                 <dsh-buttons
-                    class="DshAdvSearchForm-btns-loop"
-                    itemClass="DshAdvSearchForm-btns-loop-create"
+                    class="DshAdvSearch-btns-loop"
+                    itemClass="DshAdvSearch-btns-loop-create"
                     :list="$getOperationList(['createLoopContion'])"
                     @click="$dispatchEvent($event, true)"
                 ></dsh-buttons>
@@ -182,7 +182,7 @@
         <!-- 无可筛选字段 -->
         <div
             v-else
-            class="DshAdvSearchForm-nodata"
+            class="DshAdvSearch-nodata"
         >
             当前无可筛选的字段
         </div>
@@ -193,7 +193,7 @@
     import searchMixin from "./searchMixin.js";
 
     export default {
-        name: "DshAdvSearchForm",
+        name: "DshAdvSearch",
         mixins: [
             searchMixin
         ],

package/src/components/list/BriFlatTable.vue

@@ -151,7 +151,7 @@
                 return !!this.oldListData.length;
             },
             filterColumns () {
-                return this.columns.filter(colItem => colItem._displayType !== "hide" && this.$isAdvRelyShow(colItem, this.outObj));
+                return this.columns.filter(colItem => this.$isAdvRelyShow(colItem, this.outObj));
             },
             showColumns () {
                 const operationList = this.$getOperationList(["delete"]);

package/src/components/unit/DshFormUnit.vue

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

package/src/index.js

@@ -8,21 +8,20 @@ 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 DshListUnit from "./components/unit/DshListUnit.vue";
-
 // controls
 import BriControlInput from "./components/controls/BriControlInput.vue";
 import DshInput from "./components/controls/base/DshInput.vue";
@@ -33,6 +32,7 @@ import DshCascader from "./components/controls/base/DshCascader/DshCascader.vue"
 
 // other
 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";
 
@@ -52,7 +52,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";
@@ -89,7 +89,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,15 +100,15 @@ const map = {
     DshCropper,
 
     // list
+    BriTable,
     DshBox,
-    DshTable,
     DshList,
-    BriTable,
+    DshTable,
     DshPage,
 
     // form
     DshForm,
-    DshAdvSearchForm,
+    DshAdvSearch,
     DshDefaultSearch,
     // unit
     DshListUnit,
@@ -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,
-
     // controls
+    BriControlInput,
     DshInput,
     DshNumber,
     DshSelect,
     DshCheckbox,
     DshCascader,
 
+    // other
+    BriLoading,
+    BriIframe,
+    BriSvg,
+    DshAvatar,
+
+    // small
+    BriButton,
+    BriDrawer,
+    BriTooltip,
+    DshButtons,
+    DshDropdown,
+    DshIcons,
+    DshModal,
+    DshSteps,
+    DshTabs,
+    DshTags,
+    DshTitle,
+    DshRender,
+    DshListRender,
+
+    /* 只局部导出的 */
+    Error500,
+    Error403,
+    Error404,
+
+    BriFlatTable,
+    // DshCascaderTable,
+
+    BriCard,
+    BriTree,
+    BriTreeItem,
+
+    DshFormUnit,
+
     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,7 +17,7 @@
 
 // form
 @import "./form/DshForm.less";
-@import "./form/DshAdvSearchForm.less";
+@import "./form/DshAdvSearch.less";
 @import "./form/DshDefaultSearch.less";
 // unit
 @import "./unit/DshFormUnit.less";

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

@@ -45,9 +45,11 @@
             &-edit {
                 color: @textColor;
             }
+
             &-show {
                 color: @contentColor;
             }
+
             &-sign {
                 #dsh-sign-change();
             }