bri-components 1.2.20 → 1.2.22

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;
             }
 
@@ -75,7 +75,7 @@
             &-blank {
                 text-align: center;
                 line-height: 30px;
-                color: @textColor;
+                color: @placeholderColor;
             }
 
             &-extra {

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/DshModal.less

@@ -118,8 +118,8 @@
             .ivu-modal {
                 // width: 1000px !important;
                 // height: 800px !important;
-                width: 65% !important;
-                height: 80% !important;
+                width: 60% !important;
+                height: 85% !important;
                 min-width: 500px;
                 min-height: 400px;
 
@@ -167,75 +167,81 @@
     }
 }
 
+.ivu-modal-mask {
+    background-color: rgba(55, 55, 55, 0.8);
+}
 
 // 默认模态框brimodal
-// 通用样式
 .bri-modal {
-    .ivu-modal-wrap {
-        .ivu-modal {
-            &-content {
-                height: 100%;
-                display: flex;
-                flex-direction: column;
-
-                .DshModal-close,
-                .ivu-modal-close {
-                    top: 20px;
-                    right: 24px;
-                    color: @contentColor;
-                    font-size: @smallTitleSize;
-
-                    .ivu-icon-ios-close {
-                        font-size: 22px;
+    #bri-modal-common () {
+        .ivu-modal-wrap {
+            .ivu-modal {
+                &-content {
+                    height: 100%;
+                    display: flex;
+                    flex-direction: column;
+    
+                    .DshModal-close,
+                    .ivu-modal-close {
+                        top: 20px;
+                        right: 24px;
                         color: @contentColor;
+                        font-size: @smallTitleSize;
+    
+                        .ivu-icon-ios-close {
+                            font-size: 22px;
+                            color: @contentColor;
+                        }
                     }
-                }
-
-                .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-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 {
+                        flex: 1;
+                        overflow: auto;
+                        padding: 16px 24px 20px;
                     }
-                }
-
-                .ivu-modal-body {
-                    flex: 1;
-                    overflow: auto;
-                    padding: 16px 24px 20px;
                 }
             }
         }
     }
-}
-
-// 小框 无固定高度，上下居中
-.bri-modal-center {
-    .bri-modal();
+    
+    #bri-modal-common();
 
-    .ivu-modal-wrap {
-        width: 100%;
-        height: 100%;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: center;
-
-        .ivu-modal {
-            top: 0px;
+    // 小框 无固定高度，上下居中
+    &-center {
+        #bri-modal-common();
+    
+        .ivu-modal-wrap {
+            width: 100%;
+            height: 100%;
+            display: flex;
+            flex-direction: column;
+            align-items: center;
+            justify-content: center;
+    
+            .ivu-modal {
+                top: 0px;
+            }
         }
     }
+    
+    // modal内部公用样式
+    &-footer {
+        text-align: right;
+        margin-top: 16px;
+    }
 }
-
-// modal内部公用样式
-.bri-modal-footer {
-    text-align: right;
-    margin-top: 16px;
-}

package/src/styles/components/unit/{DshFormItem.less → DshFormUnit.less}

@@ -1,9 +1,9 @@
-.DshFormItem {
+.DshFormUnit {
     margin: 5px 6px;
     padding: 3px 10px;
 
     &-required {
-        .DshFormItem-label-name:before {
+        .DshFormUnit-label-name:before {
             content: '*';
             display: inline-block;
             line-height: 1.5;
@@ -67,7 +67,7 @@
         justify-content: space-between;
         align-items: center;
 
-        .DshFormItem-label {
+        .DshFormUnit-label {
             max-width: 280px;
             // min-width: 100px;
             font-size: @textSize;
@@ -92,7 +92,7 @@
             }
         }
 
-        .DshFormItem-control {
+        .DshFormUnit-control {
             flex: 1;
             min-width: 50px;
             display: flex;

package/src/styles/components/unit/DshListUnit.less

@@ -0,0 +1,3 @@
+.DshListUnit {
+
+}

package/src/utils/table.js

@@ -44,7 +44,7 @@ const transformToColumns = function (form, {
                             }
                             : {
                                 renderBodyCell: ({ row, column, rowIndex }, h) => {
-                                    return h("dsh-unit", {
+                                    return h("dsh-list-unit", {
                                         props: {
                                             canEdit: false,
                                             rowIndex: rowIndex,

package/src/styles/components/unit/DshUnit.less

@@ -1,5 +0,0 @@
-.DshUnit {
-    // .ivu-input {
-    //     font-size: 12px;
-    // }
-}