bri-components 1.4.63 → 1.4.65

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.4.63",
+    "version": "1.4.65",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",

package/src/components/controls/base/DshDate/DshDate.vue

@@ -140,7 +140,7 @@
                     shortcuts: this.getShortCuts(index),
                     disabledDate: (date) => {
                         const curDateStr = this.$transformToDateStr(date, "/", this.subType);
-                        const rangeBool = this.$isWithinRange(curDateStr, this.selfPropsObj._minDate, this.selfPropsObj._maxDate, this.subType);
+                        const rangeBool = this.$isWithinRange(curDateStr, this.selfPropsObj._minDate, this.selfPropsObj._maxDate);
 
                         const selfValue = {
                             ...this.value,

package/src/components/controls/base/DshDate/DshDaterange.vue

@@ -136,7 +136,7 @@
                     shortcuts: this.getShortCuts(index),
                     disabledDate: (date) => {
                         const curDateStr = this.$transformToDateStr(date, "/", this.subType);
-                        const rangeBool = this.$isWithinRange(curDateStr, this.selfPropsObj._minDate, this.selfPropsObj._maxDate, this.subType);
+                        const rangeBool = this.$isWithinRange(curDateStr, this.selfPropsObj._minDate, this.selfPropsObj._maxDate);
 
                         return !rangeBool;
                     }

package/src/components/controls/mixins/dateMixin.js

@@ -82,7 +82,7 @@ export default {
         getVal (val) {
             return this.isDynDate(val)
                 ? val
-                : this.$transformDateCompatible(val, this.subType);
+                : this.$transformToCompatibleDate(val, this.subType);
         },
         transformVal (val) {
             return this.isDynDate(val)

package/src/components/form/searchMixin.js

@@ -306,6 +306,7 @@ export default {
                 _required: false,
                 _br: false,
                 _wrap: false,
+                _noLabel: false,
 
                 _multiple: true,
                 _enterType: undefined,

package/src/components/list/DshFlatTable.vue

@@ -74,12 +74,12 @@
         >
             <dsh-page
                 :mode="pageMode"
-                :total="total"
+                :total="selfTotal"
                 :propsObj="pagePropsObj"
                 @changePage="changePage"
                 @changePageSize="changePageSize"
             >
-                共 {{ total }} 条
+                共 {{ selfTotal }} 条
 
                 <span
                     class="DshFlatTable-sort"
@@ -184,12 +184,12 @@
                 >
                     <dsh-page
                         :mode="pageMode"
-                        :total="total"
+                        :total="selfTotal"
                         :propsObj="pagePropsObj"
                         @changePage="changePage"
                         @changePageSize="changePageSize"
                     >
-                        共 {{ total }} 条
+                        共 {{ selfTotal }} 条
 
                         <span
                             class="DshFlatTable-sort"

package/src/components/list/DshTreeTable.vue

@@ -20,28 +20,6 @@
             @changeSelect="changeSelect"
             @selectAll="changeSelect"
         ></bri-table>
-        <!-- <bri-table
-            v-show="showListData.length"
-            class="DshTreeTable-main"
-            :isLoading="isLoading"
-            :columns="showColumns"
-            :data="isLoading ? [] : renderedListData"
-            :footer-data="footerData"
-            :propsObj="tablePropsObj"
-            @changeSelect="changeSelect"
-            @selectAll="changeSelect"
-        ></bri-table>
-        <bri-table
-            v-if="!showListData.length"
-            class="DshTreeTable-main"
-            :isLoading="isLoading"
-            :columns="showColumns"
-            :data="[]"
-            :footer-data="footerData"
-            :propsObj="tablePropsObj"
-            @changeSelect="changeSelect"
-            @selectAll="changeSelect"
-        ></bri-table> -->
 
         <!-- 添加行 -->
         <dsh-render :render="createBtnRender"></dsh-render>

package/src/components/list/mixins/DshCascaderTableMixin.js

@@ -37,7 +37,7 @@ export default {
         },
         // 顶替tableBaseMixin里的
         searchTitle () {
-            return `${this.isSearching ? "筛选" : "全部"}数据，共 ${this.total} 条；`;
+            return `${this.isSearching ? "筛选" : "全部"}数据，共 ${this.selfTotal} 条；`;
         },
 
         allTreeData () {

package/src/components/list/mixins/DshFlatTableMixin.js

@@ -52,7 +52,7 @@ export default {
         },
         // 顶替tableBaseMixin里的
         searchTitle () {
-            return `${this.isSearching ? "筛选" : "全部"}数据${this.isMergeRowTable ? `，共 ${this.total}条；` : "；"}`;
+            return `${this.isSearching ? "筛选" : "全部"}数据${this.isMergeRowTable ? `，共 ${this.selfTotal}条；` : "；"}`;
         },
 
         allListData () {

package/src/components/list/mixins/tableBaseMixin.js

@@ -26,18 +26,16 @@ export default {
                 return [];
             }
         },
+        total: {
+            type: Number,
+            default: 0
+        },
         rowDefault: {
             type: Object,
             default () {
                 return {};
             }
         },
-        compareData: {
-            type: Array,
-            default () {
-                return [];
-            }
-        },
         columns: {
             type: Array,
             default () {
@@ -50,6 +48,12 @@ export default {
                 return {};
             }
         },
+        compareData: {
+            type: Array,
+            default () {
+                return [];
+            }
+        },
 
         allFormList: {
             type: Array,
@@ -485,14 +489,14 @@ export default {
                 : [];
         },
         // 全部数据 或 筛选时符合条件的数据 -总数
-        total () {
-            return this.showListData.length;
+        selfTotal () {
+            return this.total || this.showListData.length;
         },
         // 全部数据 或 筛选时符合条件的数据 -共多少分页
         PageNum () {
-            return this.total % this.pagePropsObj.pagesize > 0
-                ? Math.ceil(this.total / this.pagePropsObj.pagesize)
-                : Math.floor(this.total / this.pagePropsObj.pagesize);
+            return this.selfTotal % this.pagePropsObj.pagesize > 0
+                ? Math.ceil(this.selfTotal / this.pagePropsObj.pagesize)
+                : Math.floor(this.selfTotal / this.pagePropsObj.pagesize);
         },
 
         parentDataId () {

package/src/components/unit/DshFormUnit.vue

@@ -3,8 +3,9 @@
         :class="[
             {
                 'DshFormUnit': true,
-                'DshFormUnit-required': canEdit && formItem._required,
-                'DshFormUnit-line': formItem._line
+                [`DshFormUnit-type-${formItem._type}`]: true,
+                'DshFormUnit-line': formItem._line,
+                'DshFormUnit-required': canEdit && formItem._required
             },
             formControlClass
         ]"
@@ -308,6 +309,12 @@
             }
         }
 
+        &-type {
+            &-tag {
+                padding: 2px 10px 6px;
+            }
+        }
+
         // 左右显示时
         &-line {
             display: flex;