bri-components 1.4.49 → 1.4.51

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.4.49",
+    "version": "1.4.51",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",
@@ -32,7 +32,7 @@
     "dependencies": {
         "ali-oss": "^6.13.1",
         "axios": "^0.23.0",
-        "bri-datas": "^1.1.94",
+        "bri-datas": "^1.2.31",
         "jshint": "^2.12.0",
         "jsonlint": "^1.6.3",
         "minio": "7.1.0",

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

@@ -75,6 +75,7 @@
 
 <script>
     import controlMixin from "../../mixins/controlMixin.js";
+    import { dateDynSearchs } from "../../../../data/index.js";
 
     export default {
         name: "DshDaterange",
@@ -85,165 +86,15 @@
         data () {
             return {
                 open0: false,
-                open1: false,
-
-                dynDate: [
-                    {
-                        _key: "dyn_today_start",
-                        name: "今天",
-                        numbers: [0],
-                        dateTypes: ["date", "datetime"]
-                    },
-                    {
-                        _key: "dyn_today_end",
-                        name: "今天",
-                        numbers: [1],
-                        dateTypes: ["date", "datetime"]
-                    },
-                    {
-                        _key: "dyn_now",
-                        name: "现在",
-                        numbers: [0, 1],
-                        dateTypes: ["date", "datetime"]
-                    },
-                    {
-                        _key: "dyn_yesterday",
-                        name: "昨天",
-                        numbers: [0],
-                        dateTypes: ["date", "datetime"]
-                    },
-                    {
-                        _key: "dyn_subtract_3_days",
-                        name: "三天前",
-                        numbers: [0],
-                        dateTypes: ["date", "datetime"]
-                    },
-                    {
-                        _key: "dyn_add_3_days",
-                        name: "三天后",
-                        numbers: [1],
-                        dateTypes: ["date", "datetime"]
-                    },
-                    {
-                        _key: "dyn_subtract_7_days",
-                        name: "七天前",
-                        numbers: [0],
-                        dateTypes: ["date", "datetime"]
-                    },
-                    {
-                        _key: "dyn_add_7_days",
-                        name: "七天后",
-                        numbers: [1],
-                        dateTypes: ["date", "datetime"]
-                    },
-                    {
-                        _key: "dyn_subtract_30_days",
-                        name: "三十天前",
-                        numbers: [0],
-                        dateTypes: ["date", "datetime"]
-                    },
-                    {
-                        _key: "dyn_add_30_days",
-                        name: "三十后",
-                        numbers: [1],
-                        dateTypes: ["date", "datetime"]
-                    },
-
-                    // 月
-                    {
-                        _key: "last_month_start",
-                        name: "上月初",
-                        numbers: [0],
-                        dateTypes: ["month", "date", "datetime"]
-                    },
-                    {
-                        _key: "dyn_month_start",
-                        name: "上月末",
-                        numbers: [1],
-                        dateTypes: ["month", "date", "datetime"]
-                    },
-                    {
-                        _key: "dyn_month_start",
-                        name: "月初",
-                        numbers: [0],
-                        dateTypes: ["month", "date", "datetime"]
-                    },
-                    {
-                        _key: "dyn_month_end",
-                        name: "月末",
-                        numbers: [1],
-                        dateTypes: ["month", "date", "datetime"]
-                    },
-                    {
-                        _key: "dyn_nextmonth_start",
-                        name: "下月初",
-                        numbers: [0],
-                        dateTypes: ["month", "date", "datetime"]
-                    },
-                    {
-                        _key: "dyn_nextmonth_end",
-                        name: "下月末",
-                        numbers: [1],
-                        dateTypes: ["month", "date", "datetime"]
-                    },
-                    {
-                        _key: "last_month_21",
-                        name: "上月21日",
-                        numbers: [0],
-                        dateTypes: ["month", "date", "datetime"]
-                    },
-                    {
-                        _key: "dyn_month_21",
-                        name: "本月21日",
-                        numbers: [0, 1],
-                        dateTypes: ["month", "date", "datetime"]
-                    },
-
-                    // 季度、年
-                    {
-                        _key: "dyn_quarter_start",
-                        name: "本季初",
-                        numbers: [0],
-                        dateTypes: ["month", "date", "datetime"]
-                    },
-                    {
-                        _key: "dyn_quarter_end",
-                        name: "本季末",
-                        numbers: [1],
-                        dateTypes: ["month", "date", "datetime"]
-                    },
-                    {
-                        _key: "dyn_year_start",
-                        name: "年初",
-                        numbers: [0],
-                        dateTypes: ["year", "date", "datetime"]
-                    },
-                    {
-                        _key: "dyn_year_end",
-                        name: "年末",
-                        numbers: [1],
-                        dateTypes: ["year", "date", "datetime"]
-                    },
-                    {
-                        _key: "dyn_nextyear_start",
-                        name: "次年初",
-                        numbers: [0],
-                        dateTypes: ["year", "date", "datetime"]
-                    },
-                    {
-                        _key: "dyn_nextyear_end",
-                        name: "次年末",
-                        numbers: [1],
-                        dateTypes: ["year", "date", "datetime"]
-                    }
-                ]
+                open1: false
             };
         },
         computed: {
             selfPropsObj () {
                 return {
                     _icon: "ios-calendar-outline",
-                    _useShortcuts: true,
+                    _useShortcuts: true, // 是否使用动态筛选
+                    _dynSearchKeys: [], // 动态筛选条件列表
                     _transferClassName: "DshDaterange-dropdown",
 
                     ...this.propsObj,
@@ -256,6 +107,16 @@
             useShortcuts () {
                 return this.selfPropsObj._useShortcuts;
             },
+            dynSearchKeys () {
+                return this.selfPropsObj._dynSearchKeys;
+            },
+            dynSearchList () {
+                return this.dynSearchKeys.length
+                    ? this.dynSearchKeys.map(dynSearchKey =>
+                        dateDynSearchs.find(dynSearchItem => dynSearchItem._key === dynSearchKey) || { _key: dynSearchKey }
+                    )
+                    : dateDynSearchs;
+            },
             options0 () {
                 return this.getOptions(0);
             },
@@ -311,12 +172,12 @@
             getVal (index) {
                 const val = this.value[this.controlKey][index];
 
-                return this.isDynDateKey(val)
+                return this.isDynSearch(val)
                     ? val
                     : this.$transformDateCompatible(val, this.subType);
             },
             setVal (val, index) {
-                const newVal = this.isDynDateKey(val) ? val : this.$transformDate(val, "-", this.subType);
+                const newVal = this.isDynSearch(val) ? val : this.$transformDate(val, "-", this.subType);
                 this.value[this.controlKey] = index === 0
                     ? [newVal, this.value[this.controlKey][1] || ""]
                     : [this.value[this.controlKey][0] || "", newVal];
@@ -329,7 +190,7 @@
 
                 return {
                     shortcuts: this.useShortcuts
-                        ? this.dynDate
+                        ? this.dynSearchList
                             .filter(dynItem => dynItem.numbers.includes(index) && dynItem.dateTypes.includes(this.subType))
                             .map(dynItem => ({
                                 text: dynItem.name,
@@ -340,7 +201,7 @@
                         const curDateStr = this.$transformDate(date, "/", this.subType);
 
                         return compareDateStr
-                            ? this.isDynDateKey(compareDateStr)
+                            ? this.isDynSearch(compareDateStr)
                                 ? true
                                 : !this.$isComparedAccord(curDateStr, compareDateStr, compareOperator, "date", this.subType, this.subType)
                             : false;
@@ -348,12 +209,12 @@
                 };
             },
             getShowVal (val) {
-                return this.isDynDateKey(val)
-                    ? (this.dynDate.find(dynItem => dynItem._key === val) || { name: `"${val}"dnDate不存在` }).name
+                return this.isDynSearch(val)
+                    ? (this.dynSearchList.find(dynItem => dynItem._key === val) || { name: `"${val}"动态条件不存在` }).name
                     : this.$transformDate(val, "-", this.subType);
             },
-            isDynDateKey (dynKey) {
-                return this.dynDate.some(dynItem => dynItem._key === dynKey);
+            isDynSearch (dynKey) {
+                return this.dynSearchList.some(dynItem => dynItem._key === dynKey);
             }
         }
     };

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

@@ -7,7 +7,7 @@
         <i-input
             class="DshInput-edit"
             v-model="value[controlKey]"
-            :type="inputType"
+            :type="subType"
             :placeholder="selfPropsObj._placeholder"
             :readonly="selfPropsObj._readonly"
             :disabled="disabled"
@@ -44,10 +44,10 @@
     >
         <!-- 有值 -->
         <template v-if="!$isEmptyData(curVal)">
-            <!-- 高度自由时 单元格-表格字段内，详情页-独占一行宽度时 -->
+            <!-- 高度自由时（单元格-内容高度自由，详情页-独占一行） -->
             <template v-if="isHeightAuto">
                 <a
-                    v-if="inputType === 'url'"
+                    v-if="subType === 'url'"
                     :class="{
                         ...commonClass2,
                         'DshInput-show-auto': true,
@@ -64,13 +64,13 @@
                         ...commonClass2,
                         'DshInput-show-auto': true,
                         'DshInput-show-auto-detail': isDetailShow,
-                        'DshInput-show-auto-text': ['text', 'textarea'].includes(inputType)
+                        'DshInput-show-auto-text': ['text', 'textarea'].includes(subType)
                     }"
                     v-html="showVal"
                 ></div>
             </template>
 
-            <!-- 表格和查看页 里的查看 -->
+            <!-- 单元格的查看 和 详情页的查看 -->
             <bri-tooltip
                 v-else
                 :content="showVal"
@@ -78,7 +78,7 @@
                 :transfer="true"
             >
                 <a
-                    v-if="inputType === 'url'"
+                    v-if="subType === 'url'"
                     :class="{
                         ...commonClass2,
                         'DshInput-show-ellipsis': true,
@@ -154,18 +154,15 @@
                     ...this.commonDealPropsObj
                 };
             },
-            inputType () {
+            // 子类型，只在type="text"有效
+            subType () {
                 return ["textarea", "email", "password", "url", "number", "tel"].includes(this.controlType)
                     ? this.controlType
-                    : ["text"].includes(this.controlType) && ["url"].includes(this.subType)
+                    : ["text"].includes(this.controlType) && ["url"].includes(this.selfPropsObj._textType)
                         ? "url"
                         : ["serialNumber"].includes(this.controlType)
                             ? "text"
                             : "text";
-            },
-            // 子类型，只在type="text"有效
-            subType () {
-                return this.selfPropsObj._textType;
             }
         },
         created () {},

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

@@ -45,20 +45,15 @@
                 </Progress>
             </div>
 
-            <!-- 单元格的查看-非进度条模式  和 详情页的查看 -->
-            <template v-else>
-                <bri-tooltip
-                    :content="showVal"
-                    maxWidth="200"
-                    :transfer="true"
-                >
-                    <div :class="{
+            <!-- 单元格的查看-非进度条模式 和 详情页的查看 -->
+            <div
+                v-else
+                :class="{
                         ...commonClass,
-                    }">
-                        {{ showVal }}
-                    </div>
-                </bri-tooltip>
-            </template>
+                    }"
+            >
+                {{ showVal }}
+            </div>
         </template>
     </div>
 

package/src/components/controls/extra/DshColor.vue

@@ -21,7 +21,7 @@
 
 <script>
     import controlMixin from "../mixins/controlMixin.js";
-    import { resourceData } from "bri-datas";
+    import { resourceData } from "../../../data/index.js";
 
     export default {
         name: "DshColor",

package/src/components/list/BriTree.vue

@@ -41,7 +41,7 @@
 </template>
 
 <script>
-    import { resourceData } from "bri-datas";
+    import { resourceData } from "../../data/index.js";
 
     const loop = (arr) => {
         return arr.map(item => {

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

@@ -199,7 +199,7 @@
 </template>
 
 <script>
-    import { resourceData } from "bri-datas";
+    import { resourceData } from "../../../data/index.js";
 
     export default {
         name: "DshPanel",

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

@@ -321,7 +321,7 @@ export default {
             });
         },
         quickChangeVal (operationItem, row, rowIndex, column, params) {
-            if (this.isUseQuickChange({ row, rowIndex, column })) {
+            if (["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._type)) {
                 this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
                 this.dealSameRowsVal({ row, rowIndex, column });
 
@@ -329,7 +329,7 @@ export default {
             }
         },
         changeVal (operationItem, row, rowIndex, column, params) {
-            if (!this.isUseQuickChange({ row, rowIndex, column })) {
+            if (!["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._type)) {
                 this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
                 this.dealSameRowsVal({ row, rowIndex, column });
 
@@ -385,19 +385,22 @@ export default {
 
             return rowspan;
         },
-        // 是都满足使用quickChange
-        isUseQuickChange ({ row, rowIndex, column }) {
-            return ["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._type) &&
-                this.mergeRowColKeys.includes(column._key) &&
-                this.rowspanMap[this.getMixKey(row, column)] > 1;
-        },
+        // // 是都满足使用quickChange
+        // isUseQuickChange ({ row, rowIndex, column }) {
+        //     return ["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._type) &&
+        //         this.mergeRowColKeys.includes(column._key) &&
+        //         this.rowspanMap[this.getMixKey(row, column)] > 1;
+        // },
         // 合并单元格的行，某列的值全部跟着修改
         dealSameRowsVal ({ row, rowIndex, column }, list = this.allListData) {
-            const indexInAll = list.findIndex(dataItem => dataItem._id === row._id);
-            list.slice(indexInAll + 1, indexInAll + this.rowspanMap[this.getMixKey(row, column)])
-                .forEach(rowItem => {
-                    rowItem[column._key] = this.$deepCopy(row[column._key]);
-            });
+            if (this.mergeRowColKeys.includes(column._key) && this.rowspanMap[this.getMixKey(row, column)] > 1) {
+                const indexInAll = list.findIndex(dataItem => dataItem._id === row._id);
+                list.slice(indexInAll + 1, indexInAll + this.rowspanMap[this.getMixKey(row, column)])
+                    .forEach(rowItem => {
+                        console.log(rowItem[column._key]);
+                        rowItem[column._key] = this.$deepCopy(row[column._key]);
+                });
+            }
         }
     }
 };

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

@@ -856,12 +856,17 @@ export default {
         },
         // 输入框值改变立即
         quickChangeVal (operationItem, row, rowIndex, column, params) {
-            // 啥也不做，平级表格合并单元格时用这个方法
+            if (["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._type)) {
+                this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
+                this.change("quickChangeVal", row, rowIndex, column, ...params);
+            }
         },
         // 输入框值改变
         changeVal (operationItem, row, rowIndex, column, params) {
-            this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
-            this.change("changeVal", row, rowIndex, column, ...params);
+            if (!["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._type)) {
+                this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
+                this.change("changeVal", row, rowIndex, column, ...params);
+            }
         },
         change (eventType, row, rowIndex, column, ...params) {
             this.$emit("change", this.tableDataObj, eventType, column, row, rowIndex, ...params);

package/src/data/index.js

@@ -0,0 +1,9 @@
+import {
+    resourceData, regionData, benjiRegionData, userIndustryData,
+    dateDynSearchs
+} from "bri-datas";
+
+export {
+    resourceData, regionData, benjiRegionData, userIndustryData,
+    dateDynSearchs
+};