bri-components 1.3.83 → 1.3.85

package/package.json

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

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

@@ -9,8 +9,8 @@
             :disabled="selfPropsObj._disabled"
             :loading="selfPropsObj.loading"
             :size="selfPropsObj._size"
-            :true-color="selfPropsObj._openColor"
-            :false-color="selfPropsObj._closeColor"
+            :true-color="propsObj._openColor || $appData.themeColor"
+            :false-color="propsObj._closeColor || '#ccc'"
             :true-value="selfPropsObj._openValue"
             :false-value="selfPropsObj._closeValue"
         >
@@ -49,7 +49,9 @@
                 <dsh-tags
                     :class="{
                         ...commonClass,
-                        'DshSwitch-show-ellipsis': true
+                        'DshSwitch-show-ellipsis': true,
+                        'DshSwitch-open': this.curVal,
+                        'DshSwitch-close': !this.curVal
                     }"
                     :list="[curValObj]"
                     itemClass="DshSwitch-show-ellipsis-tag"

package/src/components/controls/controlMap.js

@@ -38,11 +38,12 @@ const componentNameMap = {
     flatTable: "flatTable",
     cascaderTable: "cascaderTable",
 
-    back: "DshBack",
-    undefined: "DshUndeveloped",
-
     themeColor: "themeColor",
     themeIcon: "themeIcon",
+    color: "DshColor",
+
+    back: "DshBack",
+    undefined: "DshUndeveloped",
 
     ...controlConfig.componentNameMap
 };
@@ -70,13 +71,14 @@ const pathMap = {
         flatTable: "./senior/flatTable.vue",
         cascaderTable: "./senior/cascaderTable"
     },
+    extra: {
+        themeColor: "./extra/themeColor.vue",
+        themeIcon: "./extra/themeIcon.vue",
+        DshColor: "./extra/DshColor.vue"
+    },
     special: {
         DshBack: "./special/DshBack.vue",
         DshUndeveloped: "./special/DshUndeveloped.vue"
-    },
-    extra: {
-        themeColor: "./extra/themeColor.vue",
-        themeIcon: "./extra/themeIcon.vue"
     }
 };
 

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

@@ -0,0 +1,81 @@
+<template>
+    <div class="DshColor">
+        <ColorPicker
+            class="DshColor-picker"
+            v-model="curVal"
+            :disabled="selfPropsObj._disabled"
+            :format="selfPropsObj._format"
+            :editable="selfPropsObj._editable"
+            :alpha="selfPropsObj._alpha"
+            :hue="selfPropsObj._hue"
+            :recommend="selfPropsObj._recommend"
+            :colors="colors"
+            :size="selfPropsObj._size"
+            :transfer="selfPropsObj._transfer"
+            @on-change="change"
+            @on-active-change="onActiveChange"
+            @on-open-change="onOpenChange"
+        />
+    </div>
+</template>
+
+<script>
+    import controlMixin from "../mixins/controlMixin.js";
+    import { resourceData } from "bri-datas";
+
+    export default {
+        name: "DshColor",
+        mixins: [
+            controlMixin
+        ],
+        components: {},
+        props: {},
+        data () {
+            return {};
+        },
+        computed: {
+            selfPropsObj () {
+                return {
+                    _disabled: false,
+                    _editable: true, // 是否可以输入色值
+                    _alpha: false, // 是否支持透明度选择
+                    _hue: true, // 是否支持色彩选择
+                    _recommend: true, // 是否显示推荐的颜色预设
+                    _colors: Object.values(resourceData.colorMap).slice(1), // 自定义颜色预设
+                    _size: "default", // 尺寸，可选值为large、small、default或者不设置
+                    _transfer: true,
+                    ...this.propsObj,
+
+                    _format: this.propsObj._format || (this.propsObj._alpha ? "rgb" : "hex") // 颜色的格式，可选值 hsl、hsv、hex、rgb；开启alpha时为rgb，其它为hex
+                };
+            },
+            colors () {
+                return this.selfPropsObj._colors;
+            }
+        },
+        created () {},
+        methods: {
+            // 面板中当前显示的颜色发生改变时触发
+            onActiveChange () {
+
+            },
+            // 下拉框展开或收起时触发
+            onOpenChange () {
+
+            }
+        }
+    };
+</script>
+
+<style lang="less" scoped>
+    .DshColor {
+        &-picker {
+            width: 100%;
+        }
+    }
+</style>
+<style lang="less">
+    .ivu-color-picker-transfer {
+        max-width: 360px;
+    }
+</style>

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

@@ -139,7 +139,7 @@ export default {
             return ["users", "departments", "select", "checkbox", "regions", "cascaders", "switch", "labels", "refSelect"].includes(this.controlType);
         },
         commonDealPropsObj () {
-            const selectControlTypes = ["date", "switch", "select", "checkbox", "file", "region", "regions", "cascader", "cascaders", "coordinates", "users", "departments"];
+            const selectControlTypes = ["coordinates", "date", "switch", "select", "checkbox", "file", "region", "regions", "cascader", "cascaders", "users", "departments", "reference"];
             return {
                 // TODO: 此处的请输入可能还有请选择之类的，待处理
                 _placeholder: this.canEdit && this.propsObj._enterType !== "calculate"

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

@@ -170,7 +170,7 @@ export default {
         // 获取某项的class集合 --flat方式在用
         getItemClass (item) {
             return [
-                this.useColor
+                this.useColor && !(item.color || "").includes("#")
                     ? this.colorMap[item.color] ? item.color : "color-default"
                     : undefined,
                 item.class
@@ -178,7 +178,9 @@ export default {
         },
         // 获取某项的颜色相关style --flat方式在用
         getItemColorStyle (item) {
-            const color = this.colorMap[item.color] || this.colorMap["color-default"];
+            const color = (item.color || "").includes("#")
+                ? item.color
+                : this.colorMap[item.color] || this.colorMap["color-default"];
             return this.useColor
                 ? {
                     backgroundColor: this.$getColor(color, 0.1),

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

@@ -16,8 +16,6 @@ export default {
         basePropsObj () {
             return {
                 loading: false, // 是否为加载状态
-                _openColor: this.$appData.themeColor, // 打开时的背景色
-                _closeColor: "#ccc", // 关闭时的背景色
                 _openValue: true, // 打开时对应的值
                 _closeValue: false, // 关闭时对应的值
 
@@ -25,22 +23,36 @@ export default {
                 ...this.commonDealPropsObj,
 
                 _openText: this.propsObj._openText || "是", // 此行放在 ...this.propsObj的下面目的是，处理_openText为空字符串的情况
-                _closeText: this.propsObj._closeText || "否"
+                _closeText: this.propsObj._closeText || "否",
+                _openColor: this.propsObj._openColor || "#37C45E", // 打开时的背景色
+                _closeColor: this.propsObj._closeColor || "#E83636" // 关闭时的背景色
             };
         },
+        openText () {
+            return this.selfPropsObj._openText;
+        },
+        closeText () {
+            return this.selfPropsObj._closeText;
+        },
+        openColor () {
+            return this.selfPropsObj._openColor;
+        },
+        closeColor () {
+            return this.selfPropsObj._closeColor;
+        },
         mulPropsObj () {
             return {
                 _optionKind: "flat",
                 _data: [
                     {
                         _key: "true",
-                        name: this.selfPropsObj._openText,
-                        color: this.selfPropsObj._openColor
+                        name: this.openText,
+                        color: this.openColor
                     },
                     {
                         _key: "false",
-                        name: this.selfPropsObj._closeText,
-                        color: this.selfPropsObj._closeColor
+                        name: this.closeText,
+                        color: this.closeColor
                     }
                 ],
 
@@ -49,14 +61,15 @@ export default {
         },
 
         curValObj () {
+            const color = this.curVal === true ? this.openColor : this.closeColor;
             return !this.$isEmptyData(this.curVal)
                 ? {
                     _key: "1",
                     name: this.showVal,
                     style: {
                         ...this.tagStyle,
-                        backgroundColor: this.curVal === true ? "#d3f3dc" : "#FDEDED",
-                        color: this.curVal === true ? "#37C45E" : "#E83636"
+                        backgroundColor: this.$getColor(color, 0.1),
+                        color: color
                     }
                 }
                 : undefined;
@@ -65,8 +78,8 @@ export default {
             return this.$isEmptyData(this.curVal)
                 ? this.emptyShowVal
                 : this.curVal === true
-                    ? this.selfPropsObj._openText
-                    : this.selfPropsObj._closeText;
+                    ? this._openText
+                    : this._closeText;
         }
     },
     created () { },

package/src/components/form/DshDefaultSearch.vue

@@ -109,7 +109,9 @@
         },
         computed: {
             canSearchFormList () {
-                return this.formList.filter(formItem => this.$formHasAbility(formItem, "canDefaultSearch"));
+                return this.formList.filter(formItem =>
+                    this.$formHasAbility(formItem, "canDefaultSearch") && formItem._displayType !== "hide"
+                );
             },
 
             // 总span

package/src/components/form/DshForm.vue

@@ -184,7 +184,6 @@
             formControlClass: String,
 
             /* 本组件使用 -不传递子组件的 */
-            monitorFormList: Array,
             showRules: {
                 type: Boolean,
                 default: true
@@ -229,7 +228,7 @@
             },
             // 初始化监测 -监测所有字段
             initMonitor () {
-                (this.monitorFormList || this.formList).forEach(formItem => {
+                (this.allFormList || this.formList).forEach(formItem => {
                     this.$set(this.formData, formItem._key, this.formData[formItem._key]);
                 });
             },

package/src/components/form/searchMixin.js

@@ -60,7 +60,10 @@ export default {
     },
     computed: {
         canSearchFormList () {
-            return this.formList.filter(formItem => this.$formHasAbility(formItem, "canSearch"));
+            return this.formList.filter(formItem =>
+                this.$formHasAbility(formItem, "canSearch") &&
+                (this.mode === "set" ? true : formItem._displayType !== "hide")
+            );
         },
         dynamicFieldsMap () {
             return this.$arrToCategoryArr(this.dynamicFormList);
@@ -220,15 +223,15 @@ export default {
                     return {
                         _id: this.$ObjectID().str,
                         logic: "field",
-                        fieldKey: fieldKey,
-                        fieldType: fieldType,
-                        fieldOperator: fieldOperator,
+                        fieldKey,
+                        fieldType,
+                        fieldOperator,
                         fieldValue: [],
                         fieldSearch: {
                             logic: "and",
                             conditions: []
                         },
-                        parameterType: parameterType,
+                        parameterType,
                         fieldParams: [],
                         chainFieldKey: "",
                         ...initContion,
@@ -236,11 +239,11 @@ export default {
                         // 下面的是前端所用
                         dynamicList: dynamicList,
                         parameterTypeName: parameterTypeName,
-                        operators: operators,
+                        operators,
                         fieldOperatorName: fieldOperatorName,
                         formItem: this.getFormItem(curFormItem),
                         subFormList: curFormItem._subForm || [],
-                        finished: false // 标记 reference类型请求form数据 是否完成状态
+                        finished: !operators.some(operator => ["subSearch"].includes(operator._key)) // 子集条件的 请求form数据 是否完成状态
                     };
                 } else {
                     return {
@@ -315,13 +318,12 @@ export default {
                     this.getModData(conditionItem.formItem, data => {
                         conditionItem.finished = true;
                         conditionItem.subFormList = (data.screens.find(screenItem =>
-                            this.mode === "set" ? screenItem.screenType === "all" : screenItem._key === conditionItem.formItem._screen
+                            this.mode === "set"
+                                ? screenItem.screenType === "all"
+                                : screenItem._key === conditionItem.formItem._screen
                         ) || { form: [] }).form;
                     });
                 }
-            } else if (["subTableSearch", "cascaderTableSearch", "treeTableSearch"].includes(conditionItem.fieldOperator)) {
-                conditionItem.finished = true;
-                conditionItem.subFormList = conditionItem.formItem._subForm;
             }
         },
         // 加载 reference数据

package/src/components/list/BriTable.vue

@@ -187,11 +187,9 @@
         },
         mounted () {},
         methods: {
-            // hidden columns
             hideColumnsByKeys (keys = []) {
                 this.$refs.briTable.hideColumnsByKeys(keys);
             },
-            // show cloumns
             showColumnsByKeys (keys = []) {
                 this.$refs.briTable.showColumnsByKeys(keys);
             }

package/src/components/list/DshFlatTable.vue

@@ -23,7 +23,7 @@
                     :canEdit="getRowCanEdit(row)"
                     :formData="row"
                     :formList="getRowFormList(row)"
-                    :allFormList="columns"
+                    :allFormList="getRowFormList(row)"
                     :inTableType="inTableType"
                     :allListRows="allListData"
                     :rowIndex="rowIndex"

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

@@ -105,6 +105,7 @@ export default {
     computed: {
         selfPropsObj () {
             return {
+                _treeForm: [],
                 ...this.commonPropsObj,
 
                 _contentHeight: this.propsObj._contentHeight || 400 // 表格最大高度
@@ -113,7 +114,7 @@ export default {
 
         allTreeData () {
             // console.log("allTreeData");
-            return this.getCalcuedTree(this.data, this.treeColumns, this.columns);
+            return this.getCalcuedTree(this.data, this.treeColumns, this.selfColumns);
         },
         allListData () {
             return this.$getTreeFlatArr(this.data, node => !(node.children && node.children.length));
@@ -156,7 +157,7 @@ export default {
                         loop(node.children);
                     } else {
                         // 根节点下所有表格字段加上监测，注入到节点对象中，必须$set，牵扯_rely值再出现并没有检测
-                        this.columns.forEach(subFormItem => {
+                        this.selfColumns.forEach(subFormItem => {
                             this.$set(node, subFormItem._key, node[subFormItem._key]);
                         });
                     }
@@ -812,7 +813,7 @@ export default {
         },
         getSummaryVal (col, row) {
             if (col._calField && col._operator) {
-                const calFieldFormItem = this.columns.find(item => item._key === col._calField);
+                const calFieldFormItem = this.selfColumns.find(item => item._key === col._calField);
 
                 if (calFieldFormItem) {
                     let loop = (nodes, arr) => {

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

@@ -28,16 +28,16 @@ export default {
                 ? []
                 : this.useSummary && this.allListData.length
                     ? [
-                        this.filterColumns.reduce((obj, col) => {
+                        this.filterColumns.reduce((obj, column) => {
                             return {
                                 ...obj,
-                                [col._key]: col._type === "number" && ![undefined, null, "", "no"].includes(col._summaryType)
+                                [column._key]: column._type === "number" && column._summaryType
                                     ? this.$calNumList(
-                                        this.allListData.map(item => item[col._key]),
-                                        col._summaryType,
-                                        { ...col, _defaultDigit: 2 }
+                                        this.allListData.map(item => item[column._key]),
+                                        column._summaryType,
+                                        { ...column, _defaultDigit: 2 }
                                     )
-                                    : (obj[col._key] || "--")
+                                    : (obj[column._key] || "--")
                             };
                         }, {
                             _id: this.$ObjectID().str,

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

@@ -1,3 +1,5 @@
+import { resourceData } from "bri-datas";
+
 export default {
     mixins: [],
     components: {},
@@ -11,19 +13,36 @@ export default {
         };
     },
     computed: {
+        selfColumns () {
+            return this.columns.map(column => {
+                // 层级表格类型，level字段的进行特殊处理（_treeForm加工成_data）
+                return column._key === "level"
+                    ? {
+                        ...column,
+                        _data: this.selfPropsObj._treeForm.map((treeFormItem, treeFormIndex) => ({
+                            name: treeFormItem._name,
+                            _key: (treeFormIndex + 1),
+                            color: Object.keys(resourceData.colorMap)[treeFormIndex + 1]
+                        }))
+                    }
+                    : column;
+            });
+        },
         selfPropsObj () {
             return {
-                _maxLevel: 3, // 最大级数
-                ...this.commonPropsObj
+                _treeForm: [],
+                ...this.commonPropsObj,
+
+                _maxLevel: this.commonPropsObj._maxLevel || 3 // 最大级数
             };
         },
         maxLevel () {
-            return this.selfPropsObj._maxLevel || 3;
+            return this.selfPropsObj._maxLevel;
         },
 
         allTreeData () {
             // console.log("allTreeData");
-            return this.getCalcuedTree(this.data, this.columns);
+            return this.getCalcuedTree(this.data, this.selfColumns);
         },
         allListData () {
             // console.log("allListData");
@@ -38,7 +57,7 @@ export default {
                         this.filterColumns.reduce((obj, column) => {
                             return {
                                 ...obj,
-                                [column._key]: column._type === "number" && ![undefined, null, "", "no"].includes(column._summaryType)
+                                [column._key]: column._type === "number" && column._summaryType
                                     ? this.$calNumList(
                                         this.allListData
                                             .filter(item => item.level === 1)
@@ -322,13 +341,13 @@ export default {
 
         /* ------ 工具方法 ------- */
         // 加工树形数据
-        getCalcuedTree (treeData = [], columns = []) {
+        getCalcuedTree (treeData = [], cols = []) {
             const loop = (list = [], parentRow) =>
                 list.forEach((row) => {
                     // 递归到叶子节点前 从上往下执行 要处理的
-                    columns.reduce((newRow, column) => {
+                    cols.reduce((newRow, column) => {
                         if (["number", "date"].includes(column._type)) {
-                            if (![undefined, null, "", "no"].includes(column._summaryType)) {
+                            if (column._summaryType) {
                                 // 不做处理，_summaryType和_writeSort互反，更安全的判断
                             }
                             else if (["upToDown"].includes(column._writeSort) && column._noLimitWrite !== true) {
@@ -349,9 +368,9 @@ export default {
                         loop(row.children, row);
 
                         // 递归到叶子节点后到 从下往上执行 要处理的（非叶子节点）
-                        columns.reduce((newRow, column) => {
+                        cols.reduce((newRow, column) => {
                             if (["number", "date"].includes(column._type)) {
-                                if (![undefined, null, "", "no"].includes(column._summaryType)) {
+                                if (column._summaryType) {
                                     const val = ["number"].includes(column._type)
                                         ? this.$calNumList(
                                             newRow.children.map(subRow => subRow[column._key]),
@@ -383,9 +402,9 @@ export default {
                         row.isLeaf = true;
 
                         // 递归到叶子节点后到 从下往上执行 要处理的（叶子节点）
-                        columns.reduce((newRow, column) => {
+                        cols.reduce((newRow, column) => {
                             if (["number", "date"].includes(column._type)) {
-                                if (![undefined, null, "", "no"].includes(column._summaryType)) {
+                                if (column._summaryType) {
                                     this.$set(newRow, column._key, newRow[column._key]);
                                 }
                                 else if (["downToUp"].includes(column._writeSort) && column._noLimitWrite !== true) {

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

@@ -191,6 +191,13 @@ export default {
         allScreenKey () {
             return this.propsObj.allScreenKey;
         },
+        selfColumns () {
+            return this.columns;
+        },
+        filterColumns () {
+            // console.log("filterColumns");
+            return this.selfColumns.filter(col => this.$isAdvRelyShow(col, this.allListData, this.parentObj, true));
+        },
 
         commonPropsObj () {
             return {
@@ -277,29 +284,10 @@ export default {
         disabledOldDataRow () {
             return this.selfPropsObj._disabledOldDataRow;
         },
-
-        isImport () {
-            return this.selfPropsObj._isImport;
-        },
-        isExport () {
-            return this.selfPropsObj._isExport;
-        },
-        isQuote () {
-            return this.selfPropsObj._isQuote;
-        },
-        quoteDisabledColKeys () {
-            return this.selfPropsObj._quoteDisabledColKeys;
-        },
-        quoteListFields () {
-            return this.selfPropsObj._quoteListFields;
-        },
-        quoteAdvSearch () {
-            return this.$transformAdvSearch(this.selfPropsObj._quoteAdvSearch, this.allFormList, this.parentObj);
-        },
-
         hideColKeys () {
             return this.selfPropsObj._hideColKeys || [];
         },
+
         searchLabelWidth () {
             return this.selfPropsObj._searchLabelWidth;
         },
@@ -313,13 +301,12 @@ export default {
             return this.searchList.map(searchItem => searchItem._key);
         },
         searchFormList () {
-            return this.$filterList(this.searchListFields, this.columns).map(formItem => ({
+            return this.$filterList(this.searchListFields, this.selfColumns).map(formItem => ({
                 ...formItem,
                 ...this.searchListMap[formItem._key],
                 _name: formItem._name
             }));
         },
-
         tableAdvSearch () {
             return this.$transformAdvSearch(this.selfPropsObj._tableAdvSearch, this.allFormList, this.parentObj);
         },
@@ -383,7 +370,7 @@ export default {
             return this.parentObj._id;
         },
         selfRowDefault () {
-            return this.columns.reduce((obj, column) => {
+            return this.selfColumns.reduce((obj, column) => {
                 const defaultVal = this.rowDefault[column._key];
                 const initDftVal = this.initDftValMap[column._type];
 
@@ -433,53 +420,6 @@ export default {
                 }
             };
         },
-        modalPropsObj () {
-            return {
-                mode: "fullscreen",
-                title: this.controlName
-            };
-        },
-        quoteParams () {
-            return {
-                screenKey: this.allScreenKey,
-                fields: [
-                    ...this.quoteListFields,
-                    this.controlKey,
-                    "createdAt"
-                ],
-                advSearch: {
-                    logic: "and",
-                    conditions: [
-                        {
-                            fieldKey: "_id",
-                            fieldOperator: "ne",
-                            fieldValue: [this.parentDataId]
-                        },
-                        this.quoteAdvSearch
-                    ]
-                }
-            };
-        },
-        importParams () {
-            return {
-                _id: this.parentDataId,
-                _key: this.controlKey,
-                importType: this.inTableType
-            };
-        },
-        exportParams () {
-            return {
-                screenKey: this.screenKey,
-                _id: this.parentDataId,
-                _key: this.controlKey,
-                advSearch: this.finalTableAdvSearch
-            };
-        },
-
-        filterColumns () {
-            // console.log("filterColumns");
-            return this.columns.filter(col => this.$isAdvRelyShow(col, this.allListData, this.parentObj, true));
-        },
         contentColumns () {
             // console.log("contentColumns");
             return this.filterColumns.map(colItem => ({
@@ -511,7 +451,7 @@ export default {
                                             canEdit: unitCanEdit,
                                             formData: row,
                                             formItem: column,
-                                            allFormList: this.columns,
+                                            allFormList: this.selfColumns,
                                             inTableType: this.inTableType,
                                             allListRows: this.allListData,
                                             rowIndex: rowIndex,
@@ -530,7 +470,7 @@ export default {
                                     canEdit: unitCanEdit,
                                     formData: row,
                                     formItem: column,
-                                    allFormList: this.columns,
+                                    allFormList: this.selfColumns,
                                     inTableType: this.inTableType,
                                     allListRows: this.allListData,
                                     rowIndex: rowIndex,
@@ -603,6 +543,67 @@ export default {
             };
         },
 
+        isImport () {
+            return this.selfPropsObj._isImport;
+        },
+        importParams () {
+            return {
+                _id: this.parentDataId,
+                _key: this.controlKey,
+                importType: this.inTableType
+            };
+        },
+        isExport () {
+            return this.selfPropsObj._isExport;
+        },
+        exportParams () {
+            return {
+                screenKey: this.screenKey,
+                _id: this.parentDataId,
+                _key: this.controlKey,
+                advSearch: this.finalTableAdvSearch
+            };
+        },
+        isQuote () {
+            return this.selfPropsObj._isQuote;
+        },
+        quoteDisabledColKeys () {
+            return this.selfPropsObj._quoteDisabledColKeys;
+        },
+        quoteListFields () {
+            return this.selfPropsObj._quoteListFields;
+        },
+        quoteAdvSearch () {
+            return this.$transformAdvSearch(this.selfPropsObj._quoteAdvSearch, this.allFormList, this.parentObj);
+        },
+        quoteParams () {
+            return {
+                screenKey: this.allScreenKey,
+                fields: [
+                    ...this.quoteListFields,
+                    this.controlKey,
+                    "createdAt"
+                ],
+                advSearch: {
+                    logic: "and",
+                    conditions: [
+                        {
+                            fieldKey: "_id",
+                            fieldOperator: "ne",
+                            fieldValue: [this.parentDataId]
+                        },
+                        this.quoteAdvSearch
+                    ]
+                }
+            };
+        },
+        modalPropsObj () {
+            return {
+                mode: "fullscreen",
+                title: this.controlName
+            };
+        },
+
         topOperationBtns () {
             return Object.keys(this.topOperationMap);
         },
@@ -1031,7 +1032,7 @@ export default {
                 // 校验必填不通过 => 校验对比
                 const resultObj = {};
                 this.$getFieldRuleResult(col, row, resultObj) &&
-                    this.$normalComparedFunc(col, row, this.columns, this.parentObj, this.allFormList, this.inTableType, resultObj) &&
+                    this.$normalComparedFunc(col, row, this.selfColumns, this.parentObj, this.allFormList, this.inTableType, resultObj) &&
                     this.$levelComparedFunc(col, row, this.allListData, this.inTableType, resultObj);
 
                 return resultObj;
@@ -1057,7 +1058,7 @@ export default {
         getColCanEdit (col, row) {
             return (
                 ["treeTable"].includes(this.inTableType) && ["number", "date"].includes(col._type)
-                    ? ![undefined, null, "", "no"].includes(col._summaryType)
+                    ? col._summaryType
                         ? row.isLeaf === true
                         : ["downToUp", "upToDown"].includes(col._writeSort)
                             ? col._noLimitWrite === true
@@ -1068,6 +1069,7 @@ export default {
                             : true
                     : true
             ) &&
+                !(["cascaderTable"].includes(this.controlType) && ["level", "children"].includes(col._key)) && // 级联表格类型，固定字段不编辑
                 (col._oldReadonly ? row.__old__ !== true : true) && // 老数据行里某些列不可编辑
                 (row.__isQuote__ ? !this.quoteDisabledColKeys.includes(col._key) : true) && // 引用过来的数据是否可编辑
                 col._enterType !== "calculate" && // 计算的不可编辑
@@ -1081,7 +1083,7 @@ export default {
                 this.$isAdvRelyShow(col, row, this.parentObj, true);
         },
         getRowFormList (row) {
-            return this.columns.map(column => {
+            return this.selfColumns.map(column => {
                 column = this.$transformDynamicProperty(column, row, this.parentObj);
                 const unitCanEdit = this.getColCanEdit(column, row);
 

package/src/index.js

@@ -9,12 +9,12 @@ import CN from "vue-easytable/libs/locale/lang/zh-CN.js";
 
 // list
 import BriTable from "./components/list/BriTable.vue";
-import DshFlatTable from "./components/list/DshFlatTable.vue";
 import DshBox from "./components/list/DshBox/DshBox.vue";
 import DshList from "./components/list/DshBox/DshList.vue";
 import DshTable from "./components/list/DshBox/DshTable.vue";
 import DshPage from "./components/list/DshPage.vue";
 import DshCrossTable from "./components/list/DshBox/DshCrossTable.vue";
+import DshFlatTable from "./components/list/DshFlatTable.vue";
 // import DshCascaderTable from "./components/list/DshCascaderTable.vue";
 // import DshTreeTable from "./components/list/DshTreeTable.vue";
 
@@ -84,6 +84,8 @@ import selectUsers from "./components/controls/senior/selectUsers/selectUsers.vu
 import departMenu from "./components/controls/senior/selectUsers/departMenu.vue";
 import selectDepartments from "./components/controls/senior/selectDepartments.vue";
 
+import DshColor from "./components/controls/extra/DshColor.vue";
+
 // import DshBack from "./components/controls/special/DshBack.vue";
 // import DshUndeveloped from "./components/controls/special/DshUndeveloped.vue";
 
@@ -188,6 +190,9 @@ export {
     DshTable,
     DshPage,
     DshCrossTable,
+    DshFlatTable,
+    // DshCascaderTable,
+    // DshTreeTable,
 
     // form
     DshForm,
@@ -212,6 +217,8 @@ export {
     DshColorPanel,
 
     // small
+    DshRender,
+    DshListRender,
     BriButton,
     BriDrawer,
     BriTooltip,
@@ -223,18 +230,12 @@ export {
     DshTabsSet,
     DshTags,
     DshTitle,
-    DshRender,
-    DshListRender,
 
     /* 只局部导出的 */
     Error500,
     Error403,
     Error404,
 
-    DshFlatTable,
-    // DshCascaderTable,
-    // DshTreeTable,
-
     BriCard,
     BriTree,
     BriTreeItem,
@@ -249,13 +250,17 @@ export {
     DshCoordinates,
     DshEditor,
     DshDivider,
+
     DshPackage,
-    // DshBack,
-    // DshUndeveloped,
     selectUsers,
     departMenu,
     selectDepartments,
 
+    DshColor,
+
+    // DshBack,
+    // DshUndeveloped,
+
     DshMenuNav,
     BriCode,
     BriCollapseTree,

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

@@ -20,8 +20,13 @@
         height: 100%;
 
         @keyframes spin {
-            from { transform: rotate(0deg); }
-            to { transform: rotate(360deg); }
+            from {
+                transform: rotate(0deg);
+            }
+
+            to {
+                transform: rotate(360deg);
+            }
         }
 
         .BriLoading-main {
@@ -31,16 +36,18 @@
 
             &-loading {
                 border-radius: 50%;
-                background: conic-gradient(#5EC4CF 50%, white);
+                background: conic-gradient(@themeColor 50%, white);
                 --mask: radial-gradient(closest-side, transparent 70%, black 71%);
                 -webkit-mask-image: var(--mask);
                 mask-image: var(--mask);
                 animation: spin 1s linear infinite;
             }
+
             &-loadingText {
                 margin-top: 8px;
                 color: @themeColor;
             }
+
             &-noText {
                 color: @textColor;
                 margin-top: 16px;

package/src/utils/table.js

@@ -161,7 +161,7 @@ const transformToColumns = function (form, {
 
                 ...col
             };
-        });
+    });
 };
 
 export default {