bri-components 1.1.2 → 1.1.3

package/src/components/controls/{base → special}/DshBack.vue

@@ -13,12 +13,12 @@
 
     export default {
         name: "DshBack",
-        mixins: [controlMixin],
+        mixins: [
+            controlMixin
+        ],
         props: {},
         data () {
-            return {
-
-            };
+            return {};
         },
         computed: {
             modForm () {

package/src/components/controls/{base → special}/DshUndeveloped.vue

@@ -9,7 +9,9 @@
 
     export default {
         name: "DshUndeveloped",
-        mixins: [controlMixin],
+        mixins: [
+            controlMixin
+        ],
         props: {},
         data () {
             return {};

package/src/components/form/DshAdvSearchForm.vue

@@ -103,7 +103,7 @@
                                 class="extra-dynamic"
                                 :value="conditionItem"
                                 :propsObj="parameterPropsObj"
-                                @change="change(conditionItem, arguments)"
+                                @change="parameterChange(conditionItem, arguments)"
                             ></dsh-select>
 
                             <!-- operators 筛选条件 -->
@@ -328,6 +328,15 @@
 
                 this.change(conditionItem);
             },
+            // 动态文本和固定文本切换类型
+            parameterChange (conditionItem) {
+                if (conditionItem.parameterType === "fixedText") {
+                    conditionItem.fieldParams = [];
+                } else if (conditionItem.parameterType === "dynamicText") {
+                    conditionItem.fieldValue = [];
+                }
+                this.change();
+            },
             // 发生改动
             change (conditionItem) {
                 const advSearchObj = {

package/src/components/form/DshForm.vue

@@ -110,15 +110,19 @@
                     return [];
                 }
             },
-            monitorFormList: Array,
+
             allFormList: {
                 type: Array,
                 default () {
                     return [];
                 }
             },
-            changedFields: Array,
-
+            changedFields: {
+                type: Array,
+                default () {
+                    return [];
+                }
+            },
             height: [String, Number],
             rowStyle: {
                 type: Object,
@@ -133,6 +137,9 @@
                 }
             },
             formControlClass: String,
+
+            /* 本组件使用的 */
+            monitorFormList: Array,
             showRules: {
                 type: Boolean,
                 default: true

package/src/components/list/BriFlatTable.vue

@@ -199,7 +199,7 @@
                                         scopedSlots: {
                                             default: props => h("dsh-unit", {
                                                 props: {
-                                                    isUnit: !this.getUnitCanEdit(column, row),
+                                                    canEdit: this.getUnitCanEdit(column, row),
                                                     formData: row,
                                                     formItem: this.resetCol(item),
                                                     rowIndex: rowIndex,
@@ -214,7 +214,7 @@
                                     })
                                     : h("dsh-unit", {
                                         props: {
-                                            isUnit: !this.getUnitCanEdit(column, row),
+                                            canEdit: this.getUnitCanEdit(column, row),
                                             formData: row,
                                             formItem: this.resetCol(item),
                                             rowIndex: rowIndex,
@@ -267,7 +267,7 @@
                                             },
                                             on: {
                                                 click: (operationItem) => {
-                                                    this.$dispatchEvent(operationItem, params.row, params.index, this.listData);
+                                                    this.$dispatchEvent(operationItem, params.row, params.rowIndex, this.listData);
                                                 }
                                             }
                                         });
@@ -378,7 +378,7 @@
 
             /* --------------- 工具方法 ------------- */
             resetCol (col) {
-                let obj = {
+                let resetMap = {
                     select: {
                         _optionKind: "dropdown"
                     },
@@ -388,7 +388,7 @@
                 };
                 return {
                     ...col,
-                    ...(obj[col._type] || {}),
+                    ...(resetMap[col._type] || {}),
                     isShare: this.isShare
                 };
             },

package/src/components/list/BriTable.vue

@@ -34,12 +34,7 @@
         ></ve-table>
 
         <!-- loading -->
-        <div
-            v-if="isLoading"
-            class="bri-table-empty bri-table-loading"
-        >
-            <slot name="loading">正在加载中，请稍后...</slot>
-        </div>
+        <ZLoading v-if="isLoading" />
         <!-- empty -->
         <div
             v-else-if="!data.length"
@@ -123,10 +118,12 @@
             // 自定义表格事件，也可配置鼠标事件
             eventCustomOption () {
                 return {
-                    bodyRowEvents: ({ row, rowIndex }) => {
+                    bodyCellEvents: ({ row, column, rowIndex }) => {
                         return {
                             click: (event) => {
-                                this.$emit("click-row", row, rowIndex, event);
+                                if (!["checkbox"].includes(column.type)) {
+                                    this.$emit("click-row", row, rowIndex, event);
+                                }
                             },
                             dblclick: (event) => {
                                 this.$emit("db-click-row", row, rowIndex, event);
@@ -139,6 +136,7 @@
             // 全选配置项
             checkboxOption () {
                 return {
+                    selectedRowKeys: [],
                     // 行选择改变事件
                     selectedRowChange: ({ row, isSelected, selectedRowKeys }) => {
                         this.$emit(

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

@@ -61,11 +61,11 @@
                         <!-- 右 val -->
                         <div class="unit-value dsh-ellipsis">
                             <dsh-td-render
-                                v-if="colItem.render"
+                                v-if="colItem.renderBodyCell"
                                 :row="dataItem"
                                 :column="colItem"
                                 :index="0"
-                                :render="colItem.render"
+                                :render="colItem.renderBodyCell"
                             ></dsh-td-render>
 
                             <div

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

@@ -273,13 +273,13 @@
                             @click="clickRow(dataItem, dataIndex)"
                         >
                             <div
-                                v-if="colItem.render"
+                                v-if="colItem.renderBodyCell"
                                 class="td-content"
                             >
                                 <dsh-td-render
                                     :row="dataItem"
                                     :index="dataIndex"
-                                    :render="colItem.render"
+                                    :render="colItem.renderBodyCell"
                                 ></dsh-td-render>
                             </div>
 
@@ -323,7 +323,7 @@
                                 <dsh-td-render
                                     :row="dataItem"
                                     :index="dataIndex"
-                                    :render="operationCol.render"
+                                    :render="operationCol.renderBodyCell"
                                 ></dsh-td-render>
                             </div>
                         </td>
@@ -413,11 +413,7 @@
                     _name: "操作",
                     type: "expend",
                     width: 150,
-                    titleAlign: "center",
-                    columnAlign: "center",
-                    componentName: "dsh-td-render",
-                    isFrozenRight: true,
-                    render: (h, params) => {
+                    renderBodyCell: (params, h) => {
                         return this.operationList.length < 3
                             ? h("dsh-buttons", {
                                 props: {

package/src/components/list/DshCascaderTable.vue

@@ -149,7 +149,7 @@
                                                 :style="getTdStyle(col, row)"
                                             >
                                                 <dsh-unit
-                                                    :isUnit="!canEdit"
+                                                    :canEdit="canEdit"
                                                     :rowIndex="rowIndex"
                                                     :formData="row[col.nodeKey]"
                                                     :formItem="col"

package/src/components/small/DshControlDefine.vue

@@ -18,7 +18,7 @@
                     :list="val"
                     @delete="deleteTag"
                     :propsObj="{
-                        closable: canEdit,
+                        closable: canEdit && propsObj.canEdit,
                         size: selfPropsObj._multiplerow ? 'medium' : 'default'
                     }"
                 ></dsh-tags>

package/src/components/small/DshModal.vue

@@ -143,137 +143,3 @@
         }
     };
 </script>
-
-<style lang="less">
-    .DshModal {
-        &-header {
-            width: 100%;
-            height: 100%;
-        }
-        &-close {
-            padding: 2px;
-            position: absolute;
-            top: 10px;
-            right: 10px;
-            cursor: pointer;
-        }
-
-        &-default,
-        &-middle,
-        &-large,
-        &-small {
-            .ivu-modal-wrap {
-                .ivu-modal {
-                    margin: auto;
-                    position: absolute;
-                    top: 0px;
-                    bottom: 0px;
-                    left: 0px;
-                    right: 0px;
-                    .ivu-modal-content {
-                        width: 100%;
-                        height: 100%;
-                        display: flex;
-                        flex-direction: column;
-                        .ivu-modal-close {}
-
-                        .ivu-modal-header {
-                            width: 100%;
-                            height: 44px;
-                            padding: 10px 40px 10px 16px;
-                        }
-                        .ivu-modal-body {
-                            width: 100%;
-                            flex: 1;
-                            min-height: 200px;
-                            padding: 0px;
-                            overflow: auto;
-                        }
-                        .ivu-modal-footer {
-                            width: 100%;
-                            height: 50px;
-                        }
-                    }
-                }
-            }
-        }
-
-        &-default {
-            .ivu-modal-wrap {
-                .ivu-modal {
-                    width: 750px !important;
-                    height: 550px !important;
-                    max-height: 100%;
-                    max-width: 100%;
-                }
-            }
-        }
-        &-small {
-             .ivu-modal-wrap {
-                 .ivu-modal {
-                    width: 500px !important;
-                    height: 400px !important;
-                    max-height: 100%;
-                    max-width: 100%;
-                    .ivu-modal-content{
-                        .DshModal-close {
-                            top: 20px;
-                            right: 24px;
-                            color: rgba(0,0,0,0.6);
-                            font-size: 16px!important;
-                        }
-
-                        .ivu-modal-header {
-                            width: 100%;
-                            height: 44px;
-                            padding: 20px 24px 0px 24px;
-                            border-bottom: none;
-                            &-inner {
-                                color: rgba(0,0,0,0.9);
-                                font-size: 16px;
-                                font-weight: 500;
-                                line-height: 24px;
-                                height: 24px;
-                            }
-                        }
-                        .ivu-modal-body {
-                            padding: 16px 24px 20px;
-                        }
-                    }
-                }
-            }
-        }
-        &-middle {
-             .ivu-modal-wrap {
-                 .ivu-modal {
-                    width: 1000px !important;
-                    height: 800px !important;
-                    max-height: 100%;
-                    max-width: 100%;
-                }
-            }
-        }
-        &-large {
-             .ivu-modal-wrap {
-                 .ivu-modal {
-                    width: 80% !important;
-                    height: 90% !important;
-                    min-width: 1000px !important;
-                    max-height: 100%;
-                    max-width: 100%;
-                }
-            }
-        }
-        &-auto {
-             .ivu-modal-wrap {
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                 .ivu-modal {
-                    top: 0px;
-                    max-height: 100%;
-                }
-            }
-        }
-    }
-</style>

package/src/components/unit/DshFormItem.vue

@@ -3,7 +3,7 @@
         :class="[
             {
                 'DshFormItem': true,
-                'DshFormItem-required': formItem._required && canEdit,
+                'DshFormItem-required': canEdit && formItem._required,
                 'DshFormItem-line': formItem._line,
             },
             formControlClass,
@@ -23,17 +23,13 @@
             :style="labelStyle"
         >
             <!-- 左 -->
-            <span
-                class="DshFormItem-label-left"
-                :style="labelLeftStyle"
-            >
+            <span class="DshFormItem-label-left">
                 <Ctooltip
                     :content="formItem._name"
                     transfer
                 >
                     <span :class="{
                         'DshFormItem-label-name': true,
-                        'dsh-ellipsis': true,
                         'DshFormItem-label-name-edit': canEdit,
                         'DshFormItem-label-name-show': !canEdit
                     }">
@@ -109,9 +105,11 @@
             unitMixin
         ],
         props: {
-            canEdit: {
-                type: Boolean,
-                default: true
+            allFormList: {
+                type: Array,
+                default () {
+                    return [];
+                }
             },
             changedFields: {
                 type: Array,
@@ -119,7 +117,6 @@
                     return [];
                 }
             },
-
             // 实际最精确值是74px（label:30px, control:32px, 上下padding各: 6px，因为ivu-form-item-content里line-height: 32px导致有问题，故先76px
             height: {
                 type: [String, Number],

package/src/components/unit/DshUnit.vue

@@ -16,7 +16,7 @@
         <template v-else>
             <component
                 :is="componentNameMap[formItem._type]"
-                :isUnit="isUnit"
+                :canEdit="canEdit"
                 :value="formData"
                 :propsObj="{
                     ...formItem,
@@ -40,10 +40,6 @@
             unitMixin
         ],
         props: {
-            isUnit: {
-                type: Boolean,
-                default: true
-            },
             indexStr: String,
             rowIndex: Number,
             parentData: {
@@ -67,11 +63,5 @@
         .ivu-input {
             font-size: 12px;
         }
-
-        .DshLabels-searchResult {
-            position:absolute;
-            top: 32px !important;
-            left:0;
-        }
     }
 </style>

package/src/components/unit/unitMixin.js

@@ -3,17 +3,20 @@ import { componentNameMap, registerComponents } from "../controls/controlMap.js"
 export default {
     components: registerComponents(),
     props: {
-        formData: Object,
-        formItem: {
+        canEdit: {
+            type: Boolean,
+            default: true
+        },
+        formData: {
             type: Object,
             default () {
                 return {};
             }
         },
-        allFormList: {
-            type: Array,
+        formItem: {
+            type: Object,
             default () {
-                return [];
+                return {};
             }
         }
     },

package/src/index.js

@@ -29,7 +29,6 @@ import DshUnit from "./components/unit/DshUnit.vue";
 import DshFormItem from "./components/unit/DshFormItem.vue";
 
 // controls
-import controlShow from "./components/controls/base/controlShow.vue";
 import DshInput from "./components/controls/base/DshInput.vue";
 import DshNumber from "./components/controls/base/DshNumber/DshNumber.vue";
 import DshSelect from "./components/controls/base/DshSelect.vue";
@@ -91,12 +90,11 @@ import YUploadImage from "./components/controls/base/ZUpload/YUploadImage.vue";
 import DshCoordinates from "./components/controls/base/DshCoordinates.vue";
 import DshEditor from "./components/controls/base/DshEditor.vue";
 import DshDivider from "./components/controls/base/DshDivider.vue";
-import DshLabels from "./components/controls/base/DshLabels.vue";
-import DshPackage from "./components/controls/base/DshPackage.vue";
-
-import DshBack from "./components/controls/base/DshBack.vue";
-import DshUndeveloped from "./components/controls/base/DshUndeveloped.vue";
 
+/* 不挂载全局 */
+import DshPackage from "./components/controls/senior/DshPackage.vue";
+import DshBack from "./components/controls/special/DshBack.vue";
+import DshUndeveloped from "./components/controls/special/DshUndeveloped.vue";
 // other
 import ZIframe from "./components/other/ZIframe.vue";
 
@@ -122,7 +120,6 @@ const map = {
     DshUnit,
     DshFormItem,
 
-    controlShow,
     DshInput,
     DshNumber,
     DshSelect,
@@ -213,7 +210,6 @@ export {
     DshUnit,
     DshFormItem,
 
-    controlShow,
     DshInput,
     DshNumber,
     DshSelect,
@@ -271,9 +267,8 @@ export {
     DshCoordinates,
     DshEditor,
     DshDivider,
-    DshLabels,
-    DshPackage,
 
+    DshPackage,
     DshBack,
     DshUndeveloped,
 

package/src/styles/common/control.less

@@ -8,6 +8,48 @@
     line-height: 24px;
 }
 
+// // 表单模式
+// .control {
+//     &-show {
+//         border: none;
+//         background-color: transparent;
+//     }
+
+//     &-edit {
+//         height: 32px;
+//         border: 1px solid @borderColor;
+//         border-radius: @borderRadius;
+//         background: @inputBg;
+//         line-height: 32px;
+//         color: @textColor;
+//         cursor: pointer;
+//     }
+
+//     &-placeholder {
+//         color: @placeholderColor;
+//     }
+
+//     &-readonly {
+//         border: 1px solid @border-readonly;
+//         border-radius: @borderRadius;
+//         background: @inputBg-readonly;
+//         line-height: 32px;
+//         color: @textColor-readonly;
+//     }
+
+//     &-disabled {
+//         color: @textColor-disabled;
+//         border: 1px solid @border-disabled;
+//         background: @inputBg-disabled;
+//         border-radius: @borderRadius;
+//         cursor: not-allowed;
+//     }
+
+//     &-notext {
+//         color: @placeholderColor;
+//     }
+// }
+
 // 表单模式
 .control-show {
     border: none;
@@ -15,40 +57,35 @@
 }
 .control-edit {
     height: 32px;
-    color: @textColor;
     border: 1px solid @borderColor;
-    background: @inputBg;
     border-radius: @borderRadius;
+    background: @inputBg;
     line-height: 32px;
     cursor: pointer;
+    color: @textColor;
 }
 .control-placeholder {
     color: @placeholderColor;
 }
 .control-readonly {
-    color: @textColor-readonly;
     border: 1px solid @border-readonly;
-    background: @inputBg-readonly;
     border-radius: @borderRadius;
+    background: @inputBg-readonly;
+    line-height: 32px;
+    color: @textColor-readonly;
 }
 .control-disabled {
-    color: @textColor-disabled;
     border: 1px solid @border-disabled;
-    background: @inputBg-disabled;
     border-radius: @borderRadius;
+    background: @inputBg-disabled;
     cursor: not-allowed;
+    color: @textColor-disabled;
 }
 .control-notext {
     color: @placeholderColor;
 }
 
 // 暂时移到这里，部分需要删除
-.control-show-text {
-    display: inline-block;
-    width: 100%;
-    height: 100%;
-}
-
 .control-nodata-text {
     color: @placeholderColor ;
     font-weight: 400;

package/src/styles/components/controls/BriLabels.less

@@ -1,4 +1,5 @@
 .BriLabels {
+    display: flex;
     width: 100%;
 
     &-dropdown {
@@ -110,7 +111,8 @@
         align-items: center;
         height: 32px;
         overflow-y: hidden;
-        &-item{
+
+        &-item {
             .unit-show();
             .dsh-ellipsis();
             display: inline-flex;
@@ -118,7 +120,7 @@
             height: fit-content;
             padding: 0 8px;
             background-color: @borderColor;
-            color: rgba(0,0,0,0.9);
+            color: rgba(0, 0, 0, 0.9);
             font-size: 12px;
             font-weight: 400;
             line-height: 24px;