bri-components 1.1.1 → 1.1.2

package/package.json

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

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

@@ -12,12 +12,13 @@
         >
             <div
                 :class="{
+                    'control-edit': true,
                     'BriLabels-dropdown-show':true,
                     'BriLabels-dropdown-show-active':listVisible
                 }"
                 @click="clickInput"
             >
-                <div>
+                <div class="BriLabels-dropdown-show-list">
                     <Tag
                         v-for="item in val"
                         :key="item._key"
@@ -51,14 +52,16 @@
                             {{item.name}}
                             <span class="BriLabels-dropdown-item-show-icons">
                                 <Icon
+                                    v-if="!item.coreLabel"
                                     class="BriLabels-dropdown-item-show-icons-edit"
                                     custom="bri bri-bianji"
                                     @click.stop="clickEdit(item)"
                                 />
-                                <Icon
+                                <!-- 暂时不需要删除 -->
+                                <!-- <Icon
                                     class="BriLabels-dropdown-item-show-icons-del"
                                     custom="bri bri-shanchu"
-                                />
+                                /> -->
                             </span>
                         </div>
                         <div
@@ -79,7 +82,18 @@
                             </Input>
                         </div>
                     </DropdownItem>
-                    sds
+                    <div class="BriLabels-dropdown-btnWrap">
+                        <bri-button
+                            class="BriLabels-dropdown-add"
+                            :propsObj="{
+                                btnType: 'default',
+                                icon:'md-add'
+                            }"
+                            @click="addLabel"
+                        >
+                            添加选项
+                        </bri-button>
+                    </div>
                 </DropdownMenu>
             </template>
         </Dropdown>
@@ -89,14 +103,23 @@
             class="BriLabels-view"
         >
             <template v-if="val.length">
-                <Tag
-                    v-for="tagItem in val"
-                    :key="tagItem._key"
-                    size="medium"
-                    class="BriLabels-view-tag"
+                <Ctooltip
+                    placement="top"
+                    :transfer="true"
+                    maxWidth="200"
+                    :content="showValStr"
                 >
-                    {{ tagItem.name }}
-                </Tag>
+                    <div class="dsh-ellipsis">
+                        <div
+                            v-for="item in val"
+                            :key="item._key"
+                            size="medium"
+                            class="BriLabels-view-item"
+                        >
+                            {{ item.name }}
+                        </div>
+                    </div>
+                </Ctooltip>
             </template>
 
             <div
@@ -124,7 +147,8 @@
             return {
                 listData: [],
                 listVisible: false,
-                inputIcon: "ios-arrow-down"
+                inputIcon: "ios-arrow-down",
+                renderList: false
             };
         },
         computed: {
@@ -151,7 +175,6 @@
             }
         },
         created () {
-            this.init();
         },
         methods: {
             init () {
@@ -188,6 +211,10 @@
             },
             clickInput () {
                 if (!this.finalCanEdit) return;
+                if (!this.renderList) {
+                    this.init();
+                }
+                this.renderList = true;
                 this.listVisible = !this.listVisible;
                 if (this.listVisible) {
                     this.inputIcon = "ios-arrow-up";
@@ -210,11 +237,20 @@
                 e.stopPropagation();
             },
             confirmEdit (item) {
+                if (item.name == "") return;
                 item.isEdit = false;
                 this.$forceUpdate();
             },
             handleCancel (item) {
                 this.val = this.val.filter(i => i._key != item._key);
+            },
+            addLabel () {
+                this.listData.push({
+                    _key: this.$randomB36("Labels"),
+                    isEdit: true,
+                    name: "",
+                    labelType: this.selfPropsObj._labelType
+                });
             }
         },
         watch: {

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

@@ -1,10 +1,10 @@
 <template>
     <div class="DshCoordinates">
         <Ctooltip
+            :content="curValName"
             placement="top"
             :transfer="true"
             maxWidth="200"
-            :content="currentVal"
         >
             <!-- 编辑模式 -->
             <div
@@ -37,10 +37,13 @@
             </div>
 
             <!-- 查看模式 -->
-            <span v-else :class="{
+            <span
+                v-else
+                :class="{
                         ...commonClass,
                         'DshCoordinates-show': !isUnit
-                        }">
+                        }"
+            >
                 {{ showText }}
             </span>
         </Ctooltip>
@@ -178,7 +181,7 @@
                     this.value[this.controlKey] = val;
                 }
             },
-            currentVal () {
+            curValName () {
                 return this.curVal && this.curVal.name;
             },
             curLnglat: {

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

@@ -2,24 +2,34 @@
     <div class="DshEditor">
         <!-- 有值、无值 可编辑 -->
         <template v-if="isUnit">
-            <div v-if="value[controlKey]" class="DshEditor-unit">
+            <div
+                v-if="value[controlKey]"
+                class="DshEditor-unit"
+            >
                 <span class="DshEditor-unit-text">
                     富文本
                 </span>
             </div>
-            <span v-else class="control-notext">
+            <span
+                v-else
+                class="control-notext"
+            >
                 -
             </span>
         </template>
 
         <template v-else-if="finalCanEdit">
-            <div class="DshEditor-show DshEditor-edit"
+            <div
+                class="DshEditor-show DshEditor-edit"
                 :class="value[controlKey] ? '': 'DshEditor-edit-placeholder'"
                 v-show="showType === 'show'"
                 v-html="editVal"
                 @click="handleEdit"
             ></div>
-            <div v-show="showType=='edit'" class="DshEditor-wrap">
+            <div
+                v-show="showType=='edit'"
+                class="DshEditor-wrap"
+            >
                 <div
                     ref="toolbar"
                     class="toolbar"
@@ -37,7 +47,8 @@
             </div>
         </template>
 
-        <div v-else
+        <div
+            v-else
             class="DshEditor-show"
             :class="$isDisabled(canEdit, selfPropsObj) ? 'DshEditor-show-disabled' : value[controlKey] ? '' : 'DshEditor-show-nodata'"
             v-show="showType === 'show'"

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

@@ -32,6 +32,13 @@
             slot="append"
         >{{ selfPropsObj._append }}</span>
         </Input>
+        <!-- textarea特殊处理 -->
+        <p
+            v-else-if="subType === 'textarea' && showVal"
+            :class="['control-show-text', 'DshInput-textarea-show']"
+            v-text="showVal"
+        >
+        </p>
 
         <!-- 查看模式 -->
         <control-show

package/src/components/controls/controlMap.js

@@ -33,7 +33,7 @@ const componentNameMap = {
     coordinates: "DshCoordinates",
     editor: "DshEditor",
     tag: "DshDivider",
-    labels: "DshLabels",
+    labels: "BriLabels",
     package: "DshPackage",
     flatTable: "flatTable",
     cascaderTable: "cascaderTable",
@@ -62,7 +62,7 @@ const pathMap = {
         DshCoordinates: "./base/DshCoordinates.vue",
         DshEditor: "./base/DshEditor.vue",
         DshDivider: "./base/DshDivider.vue",
-        DshLabels: "./base/DshLabels.vue",
+        BriLabels: "./base/BriLabels.vue",
         DshPackage: "./base/DshPackage.vue",
         flatTable: "./senior/flatTable.vue",
         cascaderTable: "./senior/cascaderTable",

package/src/components/controls/controlMixin.js

@@ -1,9 +1,5 @@
 export default {
     props: {
-        canEdit: {
-            type: Boolean,
-            default: true
-        },
         value: {
             type: Object,
             default () {
@@ -16,33 +12,37 @@ export default {
                 return {};
             }
         },
+
+        /* 表单形式用到的 */
+        canEdit: {
+            type: Boolean,
+            default: true
+        },
+        /* 列表形式用到的 */
         isUnit: {
             type: Boolean,
             default: false
+        },
+        parentData: {
+            type: Array,
+            default () {
+                return [];
+            }
         }
     },
     data () {
         return {};
     },
     computed: {
-        compKey () {
-            return this.propsObj.compKey;
-        },
-        appKey () {
-            return this.propsObj.appKey;
-        },
-        entityKey () {
-            return this.propsObj.entityKey;
-        },
-        inTable () {
-            return !!this.propsObj.inTable;
-        },
-        isShare () {
-            return !!this.propsObj.isShare;
-        },
         controlKey () {
             return this.propsObj._key;
         },
+        curVal () {
+            return this.value[this.controlKey];
+        },
+        showText () {
+            return this.curVal || (this.isUnit ? "-" : "暂无内容");
+        },
 
         finalCanEdit () {
             return this.$canEdit(this.canEdit, this.propsObj);
@@ -57,9 +57,6 @@ export default {
                 _clearable: this.finalCanEdit && (this.propsObj._clearable === undefined ? true : this.propsObj._clearable)
             };
         },
-        currentVal () {
-            return this.value[this.controlKey];
-        },
         commonClass () {
             return {
                 "dsh-ellipsis": true,
@@ -67,11 +64,28 @@ export default {
                 "control-disabled": this.$isDisabled(this.canEdit, this.propsObj),
                 // "control-readonly": this.$isReadonly(this.canEdit, this.propsObj),
                 "control-show": !this.canEdit,
-                "control-notext": !this.currentVal
+                "control-notext": !this.curVal
             };
         },
-        showText () {
-            return this.currentVal || (this.isUnit ? "-" : "暂无内容");
+
+        // 部分控件或部分条件下 才使用的属性
+        compKey () {
+            return this.propsObj.compKey;
+        },
+        appKey () {
+            return this.propsObj.appKey;
+        },
+        entityKey () {
+            return this.propsObj.entityKey;
+        },
+        inTable () {
+            return !!this.propsObj.inTable;
+        },
+        stopModInit () {
+            return this.inTable;
+        },
+        isShare () {
+            return !!this.propsObj.isShare;
         }
     },
     methods: {

package/src/components/controls/senior/cascaderTable.vue

@@ -1,54 +1,43 @@
 <template>
-    <div class="cascaderTable" :id="`cascaderTable${controlKey}`">
+    <div
+        class="cascaderTable"
+        :id="`cascaderTable${controlKey}`"
+    >
         <!-- 表格查看 -->
-        <span v-if="isUnit" class="cascaderTable-unit">
-            <dsh-icons
-                :list="$getOperationList(['link'])"
-            ></dsh-icons>
+        <span
+            v-if="isUnit"
+            class="cascaderTable-unit"
+        >
+            <dsh-icons :list="$getOperationList(['link'])"></dsh-icons>
             <span class="cascaderTable-unit-text">
                 {{ value[controlKey] && value[controlKey].tree.length || 0 }}行
             </span>
         </span>
 
-        <!-- 配置端默认模式-->
-        <dsh-btn-modal v-else-if="propsObj._key === '_default'">
-            <dsh-cascader-table
-                :canEdit="finalCanEdit"
-                :treeColumns="treeColumns"
-                :subColumns="subColumns"
-                :data="value[controlKey]"
-                :propsObj="propsObj"
-                @change="change"
-            ></dsh-cascader-table>
-        </dsh-btn-modal>
-
         <template v-else>
-            <!-- 操作按钮 -->
-            <dsh-buttons
-                class="cascaderTable-btns"
-                itemClass="cascaderTable-btns-item"
-                :list="$getOperationList(operationFieldList)"
-                @click="$dispatchEvent($event)"
-            ></dsh-buttons>
+            <!-- 配置端默认模式-->
+            <dsh-btn-modal v-if="propsObj._key === '_default'">
+                <dsh-cascader-table
+                    :canEdit="finalCanEdit"
+                    :treeColumns="treeColumns"
+                    :subColumns="subColumns"
+                    :data="value[controlKey]"
+                    :propsObj="propsObj"
+                    @change="change"
+                ></dsh-cascader-table>
+            </dsh-btn-modal>
 
-            <dsh-cascader-table
-                v-if="value[controlKey]"
-                useCol
-                :canEdit="finalCanEdit"
-                :treeColumns="treeColumns"
-                :subColumns="subColumns"
-                :data="value[controlKey]"
-                :propsObj="propsObj"
-                @change="change"
-            ></dsh-cascader-table>
+            <template v-else>
+                <!-- 操作按钮 -->
+                <dsh-buttons
+                    class="cascaderTable-btns"
+                    itemClass="cascaderTable-btns-item"
+                    :list="$getOperationList(operationFieldList)"
+                    @click="$dispatchEvent($event)"
+                ></dsh-buttons>
 
-            <dsh-modal
-                v-model="isEnlarge"
-                mode="custom"
-                :propsObj="modalPropsObj"
-            >
                 <dsh-cascader-table
-                    v-if="value[controlKey] && isEnlarge"
+                    v-if="value[controlKey]"
                     useCol
                     :canEdit="finalCanEdit"
                     :treeColumns="treeColumns"
@@ -57,7 +46,24 @@
                     :propsObj="propsObj"
                     @change="change"
                 ></dsh-cascader-table>
-            </dsh-modal>
+
+                <dsh-modal
+                    v-model="isEnlarge"
+                    mode="custom"
+                    :propsObj="modalPropsObj"
+                >
+                    <dsh-cascader-table
+                        v-if="value[controlKey] && isEnlarge"
+                        useCol
+                        :canEdit="finalCanEdit"
+                        :treeColumns="treeColumns"
+                        :subColumns="subColumns"
+                        :data="value[controlKey]"
+                        :propsObj="propsObj"
+                        @change="change"
+                    ></dsh-cascader-table>
+                </dsh-modal>
+            </template>
         </template>
     </div>
 </template>

package/src/components/form/DshForm.vue

@@ -16,7 +16,7 @@
                     :span="formItem._br ? 24 : (formItem._span || 24)"
                 >
                     <FormItem
-                        :class="['DshForm-item-FormItem', formItemClass]"
+                        class="DshForm-item-FormItem"
                         :prop="formItem._key"
                         @click.native="clickControl(formItem)"
                     >
@@ -27,10 +27,9 @@
                             :formItem="formItem"
                             :allFormList="allFormList"
                             :changedFields="changedFields"
+                            :height="height"
                             :rowStyle="rowStyle"
                             :labelStyle="labelStyle"
-                            :height="height"
-                            :label-width="labelWidth"
                             :formControlClass="formControlClass"
                             @change="change(formItem, arguments)"
                             @refChange="refChange(formItem, arguments)"
@@ -120,6 +119,7 @@
             },
             changedFields: Array,
 
+            height: [String, Number],
             rowStyle: {
                 type: Object,
                 default () {
@@ -132,10 +132,6 @@
                     return {};
                 }
             },
-
-            height: [String, Number],
-            labelWidth: [String, Number],
-            formItemClass: String,
             formControlClass: String,
             showRules: {
                 type: Boolean,
@@ -194,7 +190,7 @@
                 } else {
                     bool = true;
                 }
-                callback && callBack(bool, errorRefs.map(errorRefItem => errorRefItem.formItem));
+                callback && callback(bool, errorRefs.map(errorRefItem => errorRefItem.formItem));
 
                 return bool;
             },
@@ -317,19 +313,10 @@
     };
 </script>
 
-<style lang="less" scoped>
-    .DshForm {
-
-    }
-</style>
 <style lang="less">
     .DshForm {
         &-item-FormItem {
             margin-bottom: 0px!important;
-            // .ivu-form-item-content {
-            //     line-height: 1.5;
-            //     font-size: 18px;
-            // }
         }
         .ivu-form-item-error-tip {
             top: 90%;

package/src/components/list/BriFlatTable.vue

@@ -199,12 +199,11 @@
                                         scopedSlots: {
                                             default: props => h("dsh-unit", {
                                                 props: {
-                                                    canEdit: this.getUnitCanEdit(column, row),
-                                                    parentData: this.listData,
+                                                    isUnit: !this.getUnitCanEdit(column, row),
                                                     formData: row,
                                                     formItem: this.resetCol(item),
                                                     rowIndex: rowIndex,
-                                                    isUnit: !this.canEdit
+                                                    parentData: this.listData
                                                 },
                                                 on: {
                                                     blur: () => this.controlBlur(null, column, row, arguments),
@@ -215,12 +214,11 @@
                                     })
                                     : h("dsh-unit", {
                                         props: {
-                                            canEdit: this.getUnitCanEdit(column, row),
-                                            parentData: this.listData,
+                                            isUnit: !this.getUnitCanEdit(column, row),
                                             formData: row,
                                             formItem: this.resetCol(item),
                                             rowIndex: rowIndex,
-                                            isUnit: !this.canEdit
+                                            parentData: this.listData
                                         },
                                         on: {
                                             blur: () => this.controlBlur(null, column, row, arguments),

package/src/components/list/BriTable.vue

@@ -32,12 +32,19 @@
             :clipboardOption="selfPropsObj.clipboardOption"
             :columnWidthResizeOption="columnWidthResizeOption"
         ></ve-table>
+
         <!-- loading -->
-        <div v-if="isLoading" class="bri-table-empty bri-table-loading">
+        <div
+            v-if="isLoading"
+            class="bri-table-empty bri-table-loading"
+        >
             <slot name="loading">正在加载中，请稍后...</slot>
         </div>
         <!-- empty -->
-        <div v-else-if="!data.length" class="bri-table-empty">
+        <div
+            v-else-if="!data.length"
+            class="bri-table-empty"
+        >
             <slot name="empty">{{ noDataText }}</slot>
         </div>
     </div>
@@ -177,8 +184,7 @@
                 };
             }
         },
-        mounted () {
-        },
+        mounted () {},
         methods: {}
     };
 </script>

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

@@ -27,7 +27,6 @@
 </template>
 
 <script>
-
     export default {
         name: "DshSingleData",
         components: {},
@@ -55,12 +54,6 @@
                 default () {
                     return [];
                 }
-            },
-            extraOperationList: {
-                type: Array,
-                default () {
-                    return [];
-                }
             }
         },
         computed: {

package/src/components/list/DshCascaderTable.vue

@@ -145,15 +145,14 @@
                                             <!-- 普通单元格 -->
                                             <td
                                                 v-else
-                                                :key="col._key"
+                                                :key="col._key + ''"
                                                 :style="getTdStyle(col, row)"
                                             >
                                                 <dsh-unit
-                                                    :canEdit="canEdit && (col.canEdit === undefined ? true : col.canEdit)"
+                                                    :isUnit="!canEdit"
+                                                    :rowIndex="rowIndex"
                                                     :formData="row[col.nodeKey]"
                                                     :formItem="col"
-                                                    :rowIndex="rowIndex"
-                                                    :isUnit="!canEdit"
                                                     @change="$dispatchEvent(operationMap.changeVal, col, row, arguments)"
                                                 ></dsh-unit>
                                             </td>

package/src/components/list/ZTree.vue

@@ -25,9 +25,9 @@
                 <dsh-form
                     v-if="treeFormShow"
                     ref="treeForm"
-                    :labelWidth="80"
                     :formList="treeFormList"
                     :formData="treeFormData"
+                    :labelStyle="{ width: '80px' }"
                 ></dsh-form>
 
                 <dsh-buttons