bri-components 1.4.9 → 1.4.10

package/package.json

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

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

@@ -126,6 +126,7 @@
                     "backColor", // 背景颜色
                     "link", // 插入链接
                     "list", // 列表
+                    "table", // 表格
                     "justify", // 对齐方式
                     "quote", // 引用
                     "image", // 插入图片
@@ -164,6 +165,7 @@
                 editor.create();
                 if (!this.finalCanEdit)editor.disable();
                 this.editor = editor;
+                this.handleEdit();
             },
             handleEdit () {
                 if (this.finalCanEdit) {

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

@@ -30,9 +30,18 @@
         <!-- 查看 -->
         <template v-else>
             <!-- 单元格的查看 进度条模式 -->
-            <template v-if="isUnitShow && selfPropsObj._showProgress">
-                <Progress :percent="progressNum" />
-            </template>
+            <div
+                v-if="selfPropsObj._showProgress"
+                class="DshNumber-show"
+            >
+                <Progress
+                    :percent="progressNum"
+                    :stroke-width="strokeWidth"
+                    :stroke-color="[statusColor, statusColor]"
+                >
+                    <span>{{ progressStr }}</span>
+                </Progress>
+            </div>
 
             <!-- 单元格和查看页的查看 -->
             <template v-else>
@@ -82,6 +91,11 @@
         computed: {
             selfPropsObj () {
                 return {
+                    _strokeWidth: 12, // 参数还没配置
+                    _overflowColor: "#87d068",
+                    _compeleteColor: "#87d068",
+                    _lessColor: "#108ee9",
+
                     ...this.propsObj,
                     ...this.commonDealPropsObj
                 };
@@ -131,6 +145,16 @@
             },
 
             // 进度条方式使用(此处先这样，实际是进度条使用要受0-100的数值范围限制)
+            strokeWidth () {
+                return this.selfPropsObj._strokeWidth;
+            },
+            statusColor () {
+                return this.curVal > 100
+                    ? this.selfPropsObj._overflowColor
+                    : this.curVal === 100
+                        ? this.selfPropsObj._compeleteColor
+                        : this.selfPropsObj._lessColor;
+            },
             progressNum () {
                 return this.$isEmptyData(this.curVal) || this.curVal < 0
                     ? 0
@@ -138,6 +162,9 @@
                         ? 100
                         : Math.round(this.curVal * 100) / 100;
             },
+            progressStr () {
+                return `${this.$isEmptyData(this.curVal) ? 0 : Math.round(this.curVal * 100) / 100}%`;
+            },
             showVal () {
                 return this.$isEmptyData(this.curVal)
                     ? this.emptyShowVal
@@ -163,5 +190,23 @@
                 color: @textColor;
             }
         }
+
+        &-show {
+            .ivu-progress-show-info {
+                display: flex;
+                flex-direction: row;
+                align-items: center;
+
+                .ivu-progress-outer {
+                    padding-right: 0px;
+                    margin-right: 0px;
+                }
+
+                .ivu-progress-text {
+                    width: 55px;
+                    text-align: center;
+                }
+            }
+        }
     }
 </style>

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

@@ -249,6 +249,7 @@ export default {
 
                 _disabledBtns: false, // 禁用增删按钮
                 _showCreateBtnColKeys: [], // 显示增删图标的列
+                _useInsertInOperationCol: false, // 操作列出现插入行按钮
                 _disabledFootCreateBtn: false, // 禁用底部新增按钮
                 _disabledDeleteDftRow: false, // 默认的数据行禁止删除
                 _disabledDeleteOldRow: false, // 保存的数据行禁止删除
@@ -343,6 +344,9 @@ export default {
         showCreateBtnColKeys () {
             return this.selfPropsObj._showCreateBtnColKeys || []; // 配置端有问题，高级依赖时值成undefined了
         },
+        useInsertInOperationCol () {
+            return this.selfPropsObj._useInsertInOperationCol;
+        },
         disabledFootCreateBtn () {
             return this.isDftSet ? false : this.selfPropsObj._disabledFootCreateBtn;
         },
@@ -530,8 +534,8 @@ export default {
                 align: "center",
                 _fixed: "right",
                 fixed: "right",
-                _width: 210,
-                width: 210,
+                _width: 100 + (this.rowOperationList.length - 1) * 110,
+                width: 100 + (this.rowOperationList.length - 1) * 110,
                 renderBodyCell: ({ row, rowIndex, column }, h) => {
                     return this.operationTdCellRender(h, { row, rowIndex, column });
                 }
@@ -697,7 +701,11 @@ export default {
             );
         },
         rowOperationList () {
-            return this.$getOperationList(["canInsert", "canDelete"]);
+            const btns = [
+                ...(this.useInsertInOperationCol ? ["canInsert"] : []),
+                "canDelete"
+            ];
+            return this.$getOperationList(btns);
         }
     },
     watch: {
@@ -1042,7 +1050,7 @@ export default {
                             e.stopPropagation();
                         }
                     }
-            });
+                });
         },
         topSearchRender (h) {
             return this.searchFormList.length
@@ -1332,7 +1340,7 @@ export default {
         getRowDelBtnCanEdit (row, rowIndex) {
             return row.__readonly__ !== true && // 不能为只读数据
                 (this.disabledDeleteDftRow ? row.__isDefault__ !== true : true) && // 默认数据可删除
-            (this.disabledDeleteOldRow ? row.__old__ !== true : true); // 老数据可删除
+                (this.disabledDeleteOldRow ? row.__old__ !== true : true); // 老数据可删除
         },
         // 行内容是否可编辑
         getRowCanEdit (row, rowIndex) {