bri-components 1.2.19 → 1.2.21

package/src/components/form/DshForm.vue

@@ -20,7 +20,7 @@
                         :prop="formItem._key"
                         @click.native="clickControl(formItem)"
                     >
-                        <dsh-formItem
+                        <dsh-form-unit
                             ref="dshFormItem"
                             :canEdit="canEdit"
                             :formData="formData"
@@ -31,8 +31,8 @@
                             :rowStyle="rowStyle"
                             :labelStyle="labelStyle"
                             :formControlClass="formControlClass"
-                            @change="change(formItem, arguments)"
-                            @refChange="refChange(formItem, arguments)"
+                            @change="change(arguments)"
+                            @refChange="refChange(arguments)"
                             @changeField="changeField"
                         >
                             <slot
@@ -68,7 +68,7 @@
                                 :formData="formData"
                                 :allFormList="allFormList"
                             ></slot>
-                        </dsh-formItem>
+                        </dsh-form-unit>
                     </FormItem>
                 </i-col>
 
@@ -90,9 +90,13 @@
 </template>
 
 <script>
+    import DshFormUnit from "../unit/DshFormUnit.vue";
+
     export default {
         name: "DshForm",
-        components: {},
+        components: {
+            DshFormUnit
+        },
         props: {
             canEdit: {
                 type: Boolean,
@@ -214,13 +218,13 @@
                 this.$emit("changeField", ...params);
             },
             // 发生改动
-            change (formItem, params) {
-                this.forceFormValidate(formItem, params);
-                this.$emit("change", formItem, ...params);
+            change (params) {
+                this.forceFormValidate(...params);
+                this.$emit("change", ...params);
             },
             // 关联表相关的change
-            refChange (formItem, params) {
-                this.$emit("refChange", formItem, ...params);
+            refChange (params) {
+                this.$emit("refChange", ...params);
             },
 
             /* -------- 工具类 -------- */

package/src/components/form/searchMixin.js

@@ -1,5 +1,9 @@
+import DshFormUnit from "../unit/DshFormUnit.vue";
+
 export default {
-    components: {},
+    components: {
+        DshFormUnit
+    },
     props: {
         formList: {
             type: Array,

package/src/components/list/BriFlatTable.vue

@@ -20,8 +20,13 @@
 </template>
 
 <script>
+    import DshListUnit from "../unit/DshListUnit.vue";
+
     export default {
         name: "BriFlatTable",
+        components: {
+            DshListUnit
+        },
         props: {
             canEdit: {
                 type: Boolean,
@@ -199,7 +204,7 @@
                                             placement: "top"
                                         },
                                         scopedSlots: {
-                                            default: props => h("dsh-unit", {
+                                            default: props => h("dsh-list-unit", {
                                                 props: {
                                                     canEdit: this.getUnitCanEdit(column, row),
                                                     formData: row,
@@ -214,7 +219,7 @@
                                             })
                                         }
                                     })
-                                    : h("dsh-unit", {
+                                    : h("dsh-list-unit", {
                                         props: {
                                             canEdit: this.getUnitCanEdit(column, row),
                                             formData: row,
@@ -337,8 +342,7 @@
                     : {};
             }
         },
-        created () {
-        },
+        created () {},
         methods: {
             // 共外部使用
             validate () {

package/src/components/list/BriTable.vue

@@ -2,6 +2,7 @@
     <div class="bri-table">
         <ve-table
             class="bri-table-content"
+            ref="briTable"
             :class="[selfClassName, selfPropsObj.className]"
             :table-data="data"
             :footer-data="footerData"

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

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

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

@@ -276,11 +276,11 @@
                                 v-if="colItem.renderBodyCell"
                                 class="td-content"
                             >
-                                <dsh-td-render
+                                <dsh-list-render
                                     :row="dataItem"
                                     :index="dataIndex"
                                     :render="colItem.renderBodyCell"
-                                ></dsh-td-render>
+                                ></dsh-list-render>
                             </div>
 
                             <div
@@ -320,11 +320,11 @@
                             }"
                         >
                             <div class="td-content">
-                                <dsh-td-render
+                                <dsh-list-render
                                     :row="dataItem"
                                     :index="dataIndex"
                                     :render="operationCol.renderBodyCell"
-                                ></dsh-td-render>
+                                ></dsh-list-render>
                             </div>
                         </td>
                     </tr>

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

@@ -127,14 +127,14 @@
                                 }"
                             >
                                 <div class="row-item-inner dsh-ellipsis">
-                                    <dsh-td-render
+                                    <dsh-list-render
                                         v-if="col.renderBodyCell"
                                         class="ms-ellipsis"
                                         :row="row"
                                         :column="col"
                                         :index="index"
                                         :render="col.renderBodyCell"
-                                    ></dsh-td-render>
+                                    ></dsh-list-render>
 
                                     <template v-else-if="col.formatter">
                                         <div v-html="col.formatter(row, index)"></div>
@@ -150,15 +150,6 @@
                                     >
                                         <div class="list-tooltip-box">{{ row[col._key] }}</div>
                                     </Tooltip>
-
-                                    <!-- <dsh-unit
-                                        :key="col._key"
-                                        :canEdit="false"
-                                        :formData="row"
-                                        :formItem="col"
-                                        :rowIndex="index"
-                                        @change="change(row, col, arguments)"
-                                    ></dsh-unit> -->
                                 </div>
                             </div>
                         </div>
@@ -178,13 +169,10 @@
 </template>
 
 <script>
-    // import DshUnit from "../../unit/DshUnit.vue";
 
     export default {
         name: "DshList",
-        components: {
-            // DshUnit
-        },
+        components: {},
         props: {
             isLoading: {
                 type: Boolean,

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

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

package/src/components/list/DshCascaderTable.vue

@@ -149,13 +149,13 @@
                                                 :key="col._key + ''"
                                                 :style="getTdStyle(col, row)"
                                             >
-                                                <dsh-unit
+                                                <dsh-list-unit
                                                     :canEdit="canEdit"
                                                     :rowIndex="rowIndex"
                                                     :formData="row[col.nodeKey]"
                                                     :formItem="col"
                                                     @change="$dispatchEvent(operationMap.changeVal, col, row, arguments)"
-                                                ></dsh-unit>
+                                                ></dsh-list-unit>
                                             </td>
                                         </template>
                                     </tr>
@@ -178,12 +178,12 @@
 </template>
 
 <script>
-    import DshUnit from "../unit/DshUnit.vue";
+    import DshListUnit from "../unit/DshListUnit.vue";
 
     export default {
         name: "DshCascaderTable",
         components: {
-            DshUnit
+            DshListUnit
         },
         props: {
             useCol: {

package/src/components/small/BriButton.vue

@@ -19,10 +19,8 @@
 </template>
 
 <script>
-    import controlMixin from "../controls/controlMixin.js";
     export default {
         name: "BriButton",
-        mixins: [controlMixin],
         props: {
             type: {
                 type: String,
@@ -31,15 +29,22 @@
             icon: String,
             shape: String,
             size: String,
-            customIcon: String
+            customIcon: String,
+
+            propsObj: {
+                type: Object,
+                default () {
+                    return {};
+                }
+            }
         },
         data () {
             return {};
         },
         computed: {
             selfPropsObj () {
-                let defaultType = this.propsObj.btnType || this.type;
-                let setType = this.propsObj.btnType || this.type;
+                const defaultType = this.propsObj.btnType || this.type;
+                let setType = defaultType;
                 if (["cancel"].includes(defaultType)) {
                     setType = "primary";
                 } else if (["errorLine", "primaryLine"].includes(defaultType)) {
@@ -47,6 +52,7 @@
                 } else if (["linkText", "primaryText", "errorText"].includes(defaultType)) {
                     setType = "text";
                 }
+
                 return {
                     class: ["cancel", "linkText", "primaryText", "errorLine", "errorText", "primaryLine"].includes(defaultType) ? `ivu-btn-${defaultType}` : "",
                     ...this.propsObj,

package/src/components/small/{DshTdRender.js → DshListRender.js}

@@ -1,5 +1,5 @@
 export default {
-    name: "DshTdRender",
+    name: "DshListRender",
     functional: true,
     props: {
         row: Object,

package/src/components/unit/{DshFormItem.vue → DshFormUnit.vue}

@@ -2,9 +2,9 @@
     <div
         :class="[
             {
-                'DshFormItem': true,
-                'DshFormItem-required': canEdit && formItem._required,
-                'DshFormItem-line': formItem._line,
+                'DshFormUnit': true,
+                'DshFormUnit-required': canEdit && formItem._required,
+                'DshFormUnit-line': formItem._line,
             },
             formControlClass,
             formItem.formControlClass
@@ -19,19 +19,19 @@
         <!-- label -->
         <div
             v-if="!formItem._noLabel"
-            class="DshFormItem-label"
+            class="DshFormUnit-label"
             :style="labelStyle"
         >
             <!-- 左 -->
-            <span class="DshFormItem-label-left">
+            <span class="DshFormUnit-label-left">
                 <bri-tooltip
                     :content="formItem._name"
                     transfer
                 >
                     <span :class="{
-                        'DshFormItem-label-name': true,
-                        'DshFormItem-label-name-edit': canEdit,
-                        'DshFormItem-label-name-show': !canEdit
+                        'DshFormUnit-label-name': true,
+                        'DshFormUnit-label-name-edit': canEdit,
+                        'DshFormUnit-label-name-show': !canEdit
                     }">
                         <slot name="label">
                             {{ formItem._name }}
@@ -39,7 +39,7 @@
                             <!-- 有更新标记-->
                             <span
                                 v-if="changedFields.includes(formItem._key)"
-                                class="DshFormItem-label-name-sign"
+                                class="DshFormUnit-label-name-sign"
                             >！有更新</span>
                         </slot>
 
@@ -55,7 +55,7 @@
             <!-- 右 -->
             <span
                 v-if="canEdit"
-                class="DshFormItem-label-right"
+                class="DshFormUnit-label-right"
             >
                 <slot name="extra">
                     <bri-tooltip
@@ -63,7 +63,7 @@
                         transfer
                         style="height: 14px;"
                     >
-                        <span class="DshFormItem-label-description dsh-ellipsis">
+                        <span class="DshFormUnit-label-description dsh-ellipsis">
                             {{ formItem._description && `* ${formItem._description}` }}
                         </span>
                     </bri-tooltip>
@@ -72,7 +72,7 @@
         </div>
 
         <!-- 控件 -->
-        <div class="DshFormItem-control">
+        <div class="DshFormUnit-control">
             <!-- 控件位置放置的dom -->
             <slot name="control"></slot>
 
@@ -100,7 +100,7 @@
     import unitMixin from "./unitMixin.js";
 
     export default {
-        name: "DshFormItem",
+        name: "DshFormUnit",
         mixins: [
             unitMixin
         ],

package/src/components/unit/{DshUnit.vue → DshListUnit.vue}

@@ -1,16 +1,16 @@
 <template>
-    <div class="DshUnit">
+    <div class="DshListUnit">
         <template v-if="formItem._type === 'index'">
             <span>{{ indexStr || rowIndex + 1 }}</span>
         </template>
 
         <template v-else-if="formItem.render">
-            <dsh-td-render
+            <dsh-list-render
                 :column="formItem"
                 :row="formData"
                 :index="rowIndex"
                 :render="formItem.render"
-            ></dsh-td-render>
+            ></dsh-list-render>
         </template>
 
         <template v-else>
@@ -36,11 +36,16 @@
     import unitMixin from "./unitMixin.js";
 
     export default {
-        name: "DshUnit",
+        name: "DshListUnit",
         mixins: [
             unitMixin
         ],
         props: {
+            canEdit: {
+                type: Boolean,
+                default: false
+            },
+
             indexStr: String,
             rowIndex: Number,
             parentData: {
@@ -55,6 +60,10 @@
         },
         computed: {},
         created () {},
-        methods: {}
+        methods: {
+            blur (...params) {
+                this.$emit("blur", ...params);
+            }
+        }
     };
 </script>

package/src/components/unit/unitMixin.js

@@ -29,13 +29,10 @@ export default {
     created () { },
     methods: {
         change (...params) {
-            this.$emit("change", ...params);
+            this.$emit("change", this.formItem, ...params);
         },
         refChange (...params) {
-            this.$emit("refChange", ...params);
-        },
-        blur (...params) {
-            this.$emit("blur", ...params);
+            this.$emit("change", this.formItem, ...params);
         }
     }
 };

package/src/index.js

@@ -21,8 +21,7 @@ import DshForm from "./components/form/DshForm.vue";
 import DshAdvSearchForm from "./components/form/DshAdvSearchForm.vue";
 import DshDefaultSearch from "./components/form/DshDefaultSearch.vue";
 // unit
-import DshFormItem from "./components/unit/DshFormItem.vue";
-import DshUnit from "./components/unit/DshUnit.vue";
+import DshListUnit from "./components/unit/DshListUnit.vue";
 
 // controls
 import BriControlInput from "./components/controls/BriControlInput.vue";
@@ -50,7 +49,7 @@ import DshTabs from "./components/small/DshTabs.vue";
 import DshTags from "./components/small/DshTags.vue";
 import DshTitle from "./components/small/DshTitle.vue";
 import DshRender from "./components/small/render.js";
-import DshTdRender from "./components/small/DshTdRender.js";
+import DshListRender from "./components/small/DshListRender.js";
 
 /* -------------------- 局部组件 ----------------------- */
 // error
@@ -63,6 +62,9 @@ import BriCard from "./components/list/BriCard.vue";
 import BriTree from "./components/list/BriTree.vue";
 import BriTreeItem from "./components/list/BriTreeItem.vue";
 
+// unit
+import DshFormUnit from "./components/unit/DshFormUnit.vue";
+
 // controls
 import BriInputs from "./components/controls/base/BriInputs.vue";
 import DshNumberange from "./components/controls/base/DshNumberange.vue";
@@ -110,8 +112,7 @@ const map = {
     DshAdvSearchForm,
     DshDefaultSearch,
     // unit
-    DshFormItem,
-    DshUnit,
+    DshListUnit,
 
     // controls
     BriControlInput,
@@ -138,7 +139,7 @@ const map = {
     DshTags,
     DshTitle,
     DshRender,
-    DshTdRender
+    DshListRender
 };
 const install = function (Vue, opts = {}) {
     ViewUI.LoadingBar.config({
@@ -195,8 +196,9 @@ export {
     DshAdvSearchForm,
     DshDefaultSearch,
     // unit
-    DshFormItem,
-    DshUnit,
+    DshListUnit,
+
+    DshFormUnit,
 
     // controls
     DshInput,
@@ -246,7 +248,7 @@ export {
     DshTags,
     DshTitle,
     DshRender,
-    DshTdRender,
+    DshListRender,
 
     DshBtnModal
 };

package/src/styles/components/form/DshAdvSearchForm.less

@@ -57,7 +57,7 @@
             margin-bottom: 10px!important;
             cursor: pointer;
 
-            .DshFormItem-label-right {
+            .DshFormUnit-label-right {
                 flex: 6;
             }
 

package/src/styles/components/form/DshDefaultSearch.less

@@ -61,18 +61,18 @@
         overflow: hidden!important;
     }
 
-    .DshFormItem-label {
+    .DshFormUnit-label {
         width: 80px;
         text-align: right;
         margin-right: 16px;
 
-        .DshFormItem-label-left {
-            .DshFormItem-label-name {
+        .DshFormUnit-label-left {
+            .DshFormUnit-label-name {
                 font-family: "Microsoft YaHei";            
             }
         }
         
-        .DshFormItem-label-right {
+        .DshFormUnit-label-right {
             text-align: left;
         }
     }

package/src/styles/components/form/DshForm.less

@@ -7,8 +7,9 @@
         line-height: normal;
     }
     .ivu-form-item-error-tip {
-        top: 90%;
-        left: 15px;
+        top: 100%;
+        left: 16px;
+        padding-top: 0px;
         font-size: 12px;
     }
 }

package/src/styles/components/index.less

@@ -20,8 +20,8 @@
 @import "./form/DshAdvSearchForm.less";
 @import "./form/DshDefaultSearch.less";
 // unit
-@import "./unit/DshFormItem.less";
-@import "./unit/DshUnit.less";
+@import "./unit/DshFormUnit.less";
+@import "./unit/DshListUnit.less";
 
 // controls
 @import "./controls/BriControlInput.less";

package/src/styles/components/small/BriTooltip.less

@@ -1,20 +1,25 @@
 .BriTooltip {
     display: flex;
-    
-    .ivu-tooltip-arrow {
-        border-bottom-color: rgba(0, 0, 0, 0.9) !important;
+}
+
+.ivu-tooltip {
+    &-arrow {
+        border-bottom-color: @textColor !important;
     }
 
-    .ivu-tooltip-inner {
+    &-inner {
         padding: 5px 8px;
         border-radius: 4px;
-        background: rgba(0, 0, 0, 0.9);
+        line-height: 22px;
+        background: @textColor;
         font-size: 14px;
         font-weight: 400;
-        color: rgba(255, 255, 255, 0.9);
+        color: @textWhColor;
+        max-height: 350px;
+        overflow: auto;
     }
 
-    .ivu-tooltip-rel {
+    &-rel {
         width: 100%;
     }
 }