bri-components 1.3.31 → 1.3.33

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

@@ -1,9 +1,11 @@
 import DshListUnit from "../../unit/DshListUnit.vue";
+import quoteListModal from "./quoteListModal.vue";
 
 export default {
     mixins: [],
     components: {
-        DshListUnit
+        DshListUnit,
+        quoteListModal
     },
     props: {
         canEdit: {
@@ -38,15 +40,26 @@ export default {
     },
     data () {
         return {
-            showRuleMessage: false, // 显示校验文字
-            ruleRecordMap: {},
+            initFlag: true,
+            showRuleMessage: false, // 进行全体校验
+            ruleRecordMap: {}, // 单元格是否发生校验的记录映射
 
-            isEnlarge: false,
-            enlargeFlag: true, // 为重渲染膜态框内容而用
+            dshRenderName: undefined,
+            showQuoteModal: false,
             showImportModal: false,
-            timer: null,
+            exportTimer: null,
+            isEnlarge: false,
+            isEnlargeFlag: true, // 为重渲染膜态框内容而用
 
             topOperationMap: {
+                canQuote: {
+                    name: "引用",
+                    type: "canQuote",
+                    icon: "ios-copy",
+                    size: "small",
+                    btnType: "text",
+                    event: "clickQuote"
+                },
                 canImport: {
                     name: "导入",
                     type: "canImport",
@@ -100,10 +113,31 @@ export default {
         };
     },
     computed: {
+        dshRender () {
+            return this[this.dshRenderName];
+        },
+        parentDataId () {
+            return this.parentObj._id;
+        },
         selfRowDefault () {
             return this.$filterObj(this.filterColumns, this.rowDefault);
         },
 
+        controlKey () {
+            return this.propsObj._key;
+        },
+        controlType () {
+            return this.propsObj._type;
+        },
+        controlName () {
+            return this.propsObj._name;
+        },
+        modKey () {
+            return this.propsObj.modKey;
+        },
+        screenKey () {
+            return this.propsObj.screenKey;
+        },
         commonPropsObj () {
             return {
                 // isShare: false, // 是否是分享页在用
@@ -120,6 +154,8 @@ export default {
                 _disabledOldDataRow: false, // 置灰老数据行包含删除
                 _isImport: false, // 导入
                 _isExport: false, // 导出
+                _isQuote: false, // 引用
+                _quoteListFields: [], // 引用列表的显示字段
                 ...this.propsObj,
 
                 _contentHeight: this.propsObj._contentHeight || 500 // 表格最大高度
@@ -161,6 +197,12 @@ export default {
         disabledOldDataRow () {
             return this.selfPropsObj._disabledOldDataRow;
         },
+        isQuote () {
+            return this.selfPropsObj._isQuote;
+        },
+        quoteListFields () {
+            return this.selfPropsObj._quoteListFields;
+        },
         isImport () {
             return this.selfPropsObj._isImport;
         },
@@ -170,16 +212,32 @@ export default {
 
         modalPropsObj () {
             return {
-                title: this.propsObj._key,
+                title: this.controlName,
                 fullscreen: true,
                 showSlotClose: false,
                 closable: true
             };
         },
+        quoteParams () {
+            return {
+                screenKey: this.screenKey,
+                fields: [...this.quoteListFields, this.controlKey, "createdAt"],
+                advSearch: {
+                    logic: "and",
+                    conditions: [
+                        {
+                            fieldKey: "_id",
+                            fieldOperator: "ne",
+                            fieldValue: [this.parentDataId]
+                        }
+                    ]
+                }
+            };
+        },
         importParams () {
             return {
-                _key: this.propsObj._key,
-                _id: this.parentObj._id
+                _id: this.parentDataId,
+                _key: this.controlKey
             };
         },
 
@@ -207,14 +265,15 @@ export default {
                 undefined,
                 this.canEdit
                     ? [
-                        "canEnlarge",
+                        ...(this.isQuote ? ["canQuote"] : []),
                         ...(this.isImport ? ["canImport"] : []),
                         ...(this.isExport ? ["canExport"] : []),
+                        "canEnlarge",
                         ...(this.disabledBtns ? ["changeVal"] : this.baseOperationBtns)
                     ]
                     : [
-                        "canEnlarge",
-                        ...(this.isExport ? ["canExport"] : [])
+                        ...(this.isExport ? ["canExport"] : []),
+                        "canEnlarge"
                     ]
             );
         }
@@ -222,7 +281,7 @@ export default {
     watch: {
         isEnlarge (bool) {
             setTimeout(() => {
-                this.enlargeFlag = bool;
+                this.isEnlargeFlag = bool;
             }, 0);
         }
     },
@@ -234,10 +293,17 @@ export default {
 
             return this.listData.every((row, rowIndex) => this.getRowRuleResult(row, rowIndex));
         },
+        // 重置
+        reset () {
+            this.initFlag = true;
+            this.showRuleMessage = false;
+            this.ruleRecordMap = {};
+        },
 
-        // 打开全屏模态框
-        clickEnlarge (operationItem) {
-            this.isEnlarge = true;
+        // 点击引用
+        clickQuote () {
+            this.dshRenderName = "quoteModalRender";
+            this.showQuoteModal = true;
         },
         // 点击导入
         clickImport () {
@@ -247,10 +313,88 @@ export default {
         clickExport (operationItem) {
             this.handleExport(operationItem);
         },
+        // 打开全屏模态框
+        clickEnlarge (operationItem) {
+            this.isEnlarge = true;
+        },
+
+        // 引用模态框渲染函数
+        quoteModalRender (h, params) {
+            return this.showQuoteModal
+                ? h("quote-list-modal", {
+                    props: {
+                        value: this.showQuoteModal,
+                        propsObj: this.propsObj,
+                        listParams: this.quoteParams
+                    },
+                    on: {
+                        input: bool => {
+                            this.showQuoteModal = bool;
+                        },
+                        confirm: this.quoteCb
+                    }
+                })
+                : undefined;
+        },
+        // 引用回调
+        quoteCb (dataObj) {
+            if (dataObj) {
+                const cb = () => {
+                    this.$Message.success("引用成功！");
+                    this.reset();
+                    this.selfReset && this.selfReset();
 
-        // 导入成功回调
+                    if (["flatTable"].includes(this.controlType)) {
+                        this.parentObj[this.controlKey] = {
+                            ...dataObj[this.controlKey],
+                            list: dataObj[this.controlKey].list.map(item => ({
+                                ...item,
+                                __readonly__: true
+                            }))
+                        };
+                    } else if (["cascaderTable"].includes(this.controlType)) {
+                        const transformData = (data = []) => {
+                            const loop = (list = []) =>
+                                list.map(item => ({
+                                    ...item,
+                                    children: item.children && item.children.length ? loop(item.children) : item.children,
+                                    __readonly__: true
+                                }));
+
+                            return loop(data);
+                        };
+
+                        this.parentObj[this.controlKey] = {
+                            ...dataObj[this.controlKey],
+                            tree: transformData(dataObj[this.controlKey].tree)
+                        };
+                    }
+
+                    this.change("quote");
+                };
+
+                const isEmpty = this.$isEmptyData(dataObj[this.controlKey]) ||
+                    (["flatTable"].includes(this.controlType)
+                        ? !dataObj[this.controlKey].list || !dataObj[this.controlKey].list.length
+                        : ["cascaderTable"].includes(this.controlType)
+                            ? !dataObj[this.controlKey].tree || !dataObj[this.controlKey].tree.length
+                            : false);
+                if (isEmpty) {
+                    this.$Modal.confirm({
+                        title: "提示",
+                        content: "该数据下此内容为空，无法引用！",
+                        onOk: () => { }
+                    });
+                } else {
+                    cb();
+                }
+            } else {
+                this.$Message.error("未选择引用数据！");
+            }
+        },
+        // 导入回调
         importCb (data) {
-            this.parentObj[this.propsObj._key] = data;
+            this.parentObj[this.controlKey] = data;
             this.change("import");
         },
         // 接口 -导出
@@ -260,19 +404,16 @@ export default {
             this.$https({
                 url: {
                     module: "sheet",
-                    name: this.isDshFlatTable ? "exportFlatTableExcel" : "exportCascaderTableExcel",
-                    params: {
-                        modKey: this.propsObj.modKey
-                    }
+                    name: ["flatTable"].includes(this.controlType) ? "exportFlatTableExcel" : "exportCascaderTableExcel"
                 },
                 params: {
-                    screenKey: this.propsObj.screenKey,
-                    _key: this.propsObj._key,
-                    _id: this.parentObj._id
+                    screenKey: this.screenKey,
+                    _id: this.parentObj._id,
+                    _key: this.controlKey
                 },
                 callback: data => {
                     this.getJobStatus(operationItem, data.jobId, data.excel_url);
-                    this.timer = setInterval(() => {
+                    this.exportTimer = setInterval(() => {
                         this.getJobStatus(operationItem, data.jobId, data.excel_url);
                     }, 1000);
                 }
@@ -290,7 +431,7 @@ export default {
                 },
                 callback: data => {
                     operationItem.disabled = false;
-                    clearInterval(this.timer);
+                    clearInterval(this.exportTimer);
 
                     if (data.status === "completed") {
                         window.location.href = data.url;
@@ -302,7 +443,7 @@ export default {
                 },
                 error: data => {
                     operationItem.disabled = false;
-                    this.timer = null;
+                    this.exportTimer = null;
                 }
             });
         },
@@ -324,12 +465,12 @@ export default {
             }
         },
         getRowCanEdit (row) {
-            return this.canEdit && ( // 是否是编辑状态
-                this.disabledOldDataRow ? !!row.__isCreate__ : true); // 是否让老数据行置灰
+            return this.canEdit && // 是编辑状态
+                (this.disabledOldDataRow ? !row.__old__ : true) && // 老数据行不置灰／置灰时是新增数据
+                !row.__readonly__; // 不能为只读数据
         },
         getColCanEdit (col, row) {
-            return (col.dependRowCanEdit ? row.canEdit !== false : true) && // 在老数据行里某些列不可编辑
-                (row.__old__ ? col._oldCanEdit : true) && // 在老数据行不可编辑（除_oldCanEdit=true的外）
+            return (col._oldReadonly ? !row.__old__ : true) && // 老数据行里某些列不可编辑
                 (["number"].includes(col._type) && ![undefined, null, "", "no"].includes(col._summaryType) ? row.isLeaf !== false : true) && // 级联表格 -“需要计的数字列 且 不是叶子行的”不可编辑（必须用isLeaf !== false判断，因为牵扯内部表格也在用）
                 col._enterType !== "calculate" && // 计算的不可编辑
                 col._readonly !== true; // 不能为只读

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

@@ -151,8 +151,9 @@
             }
         }
         
-        &-show {
-            
+        &-show { // 级联表格会生效 自己写的table
+            height: 40px;
+            padding: 4px 16px;
         }
         &-edit {
             padding: 4px 16px 12px 16px!important;
@@ -161,7 +162,7 @@
         &-visible {
             @keyframes slideDown {
                 from {
-                    top: -40px;
+                    top: -49px;
                     opacity: 0.9;
                 }
                 
@@ -174,20 +175,7 @@
             animation: slideDown .2s linear;
         }
         &-hide {
-            // @keyframes slideDown2 {
-            //     from {
-            //         top: 0px;
-            //         opacity: 1;
-            //     }
-
-            //     to {
-            //         top: -40px;
-            //         opacity: 0.9;
-            //     }
-            // }
-            
             display: none!important;
-            // animation: slideDown2 .2s linear;
         }
 
         &-index {

package/src/styles/global/variables.less

@@ -81,3 +81,6 @@
 // 老版本待优化
 @resourceColor         : #3D84EE,#F4A135, #32B5A5, #A3CF26, #C36625,  #793CB7, #E94829,
                        #E8BB1F, #52A829, #37B653, #1DD9E6,  #1457BC, #4B5CC4, #7471F7, #C434DB, #252F36;
+
+
+@titleFontFamily: SourceHanSansCN-Bold, SourceHanSansCN; // title字体