bri-components 1.3.84 → 1.3.86

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.3.84",
+    "version": "1.3.86",
     "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/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

@@ -57,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)
@@ -347,7 +347,7 @@ export default {
                     // 递归到叶子节点前 从上往下执行 要处理的
                     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) {
@@ -370,7 +370,7 @@ export default {
                         // 递归到叶子节点后到 从下往上执行 要处理的（非叶子节点）
                         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]),
@@ -404,7 +404,7 @@ export default {
                         // 递归到叶子节点后到 从下往上执行 要处理的（叶子节点）
                         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

@@ -1058,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

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;