bri-components 1.1.6 → 1.2.0

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

@@ -1,49 +1,38 @@
 <template>
     <div class="DshEditor">
         <!-- 编辑 -->
-        <template v-if="canEdit">
-            <!-- 可编辑 -->
-            <template v-if="finalCanEdit">
-                <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
-                        ref="toolbar"
-                        class="DshEditor-wrap-toolbar"
-                    ></div>
-
-                    <div
-                        ref="editor"
-                        class="DshEditor-wrap-text"
-                    ></div>
-
-                    <dsh-buttons
-                        class="DshEditor-wrap-btn"
-                        :list="$getOperationList(['canSave'])"
-                        @click="$dispatchEvent($event)"
-                    ></dsh-buttons>
-                </div>
-            </template>
-
-            <!-- 不可编辑 -->
+         <template v-if="canEdit">
             <div
-                v-else
                 :class="{
-                    'DshEditor-show': true,
-                    'DshEditor-show-disabled': true
+                    'DshEditor-edit': true,
+                    ...commonClass
                 }"
                 v-show="showType === 'show'"
                 v-html="showText"
+                @click="handleEdit"
             ></div>
+
+            <div
+                v-if="finalCanEdit"
+                v-show="showType === 'edit'"
+                class="DshEditor-wrap"
+            >
+                <div
+                    ref="toolbar"
+                    class="DshEditor-wrap-toolbar"
+                ></div>
+
+                <div
+                    ref="editor"
+                    class="DshEditor-wrap-text"
+                ></div>
+
+                <dsh-buttons
+                    class="DshEditor-wrap-btn"
+                    :list="$getOperationList(['canSave'])"
+                    @click="$dispatchEvent($event)"
+                ></dsh-buttons>
+            </div>
         </template>
 
         <!-- 查看 -->
@@ -52,11 +41,10 @@
             <div
                 v-if="isUnitShow"
                 :class="{
-                    'DshEditor-unit': true,
-                    'DshEditor-unit-nodata': true,
+                    'DshEditor-unit': !$isEmptyData(curVal)
                 }"
             >
-                {{ curVal ? "富文本" : emptyShowVal }}
+                {{ $isEmptyData(curVal) ? emptyShowVal : "富文本" }}
             </div>
 
             <!-- 查看页里 的查看 -->
@@ -64,9 +52,8 @@
                 v-else
                 :class="{
                     'DshEditor-show': true,
-                    'DshEditor-show-nodata': !curVal
+                    'DshEditor-show-nodata': $isEmptyData(curVal)
                 }"
-                v-show="showType === 'show'"
                 v-html="showText"
             ></div>
         </template>
@@ -106,10 +93,6 @@
                     ...this.propsObj,
                     ...this.commonDealPropsObj
                 };
-            },
-
-            editVal () {
-                return this.curVal || this.selfPropsObj._placeholder;
             }
         },
         created () {},
@@ -181,8 +164,10 @@
                 this.editor = editor;
             },
             handleEdit () {
-                this.editor.txt.html(this.value[this.propsObj._key]);
-                this.showType = "edit";
+                if (this.finalCanEdit) {
+                    this.editor.txt.html(this.value[this.propsObj._key]);
+                    this.showType = "edit";
+                }
             },
             clickSave () {
                 this.showType = "show";

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

@@ -3,6 +3,7 @@
         <!-- 编辑 -->
         <template v-if="canEdit">
             <Input
+                class="DshInput-edit"
                 v-model="value[controlKey]"
                 :type="subType"
                 :placeholder="selfPropsObj._placeholder"
@@ -36,29 +37,29 @@
 
         <!-- 查看 -->
         <template v-else>
-            <!-- 表格 里的查看 -->
-            <template v-if="isUnitShow">
-                <control-show
-                    :showVal="curVal"
-                    :emptyShowVal="emptyShowVal"
-                    :propsObj="selfPropsObj"
-                ></control-show>
-            </template>
-
-            <!-- 查看页 里的查看 (textarea单独处理) -->
-            <template v-else>
+            <!-- 查看页 的textarea单独处理 -->
+            <template v-if="!isUnitShow && subType === 'textarea' && !$isEmptyData(curVal)">
                 <p
-                    v-if="subType === 'textarea' && curVal"
                     class="DshInput-show-textarea"
-                    v-text="curVal"
+                    v-text="showText"
                 ></p>
+            </template>
 
-                <control-show
-                    v-else
-                    :showVal="curVal"
-                    :emptyShowVal="emptyShowVal"
-                    :propsObj="selfPropsObj"
-                ></control-show>
+            <!-- 表格和查看页 里的查看 -->
+            <template v-else>
+                <bri-tooltip
+                    :content="showText"
+                    maxWidth="200"
+                    :transfer="true"
+                >
+                    <div :class="{
+                        ...commonClass,
+                        'DshInput-unit': isUnitShow,
+                        'DshInput-show': !isUnitShow
+                    }">
+                        {{ showText }}
+                    </div>
+                </bri-tooltip>
             </template>
         </template>
     </div>
@@ -87,6 +88,7 @@
                     _autosize: {
                         minRows: 2
                     },
+
                     ...this.propsObj,
                     ...this.commonDealPropsObj
                 };

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

@@ -3,6 +3,7 @@
         <!-- 编辑 -->
         <template v-if="canEdit">
             <BriInputNumber
+                class="DshNumber-edit"
                 v-model="value[controlKey]"
                 :placeholder="selfPropsObj._placeholder"
                 :disabled="!finalCanEdit"
@@ -10,13 +11,13 @@
                 :max="maxNum"
                 :min="minNum"
                 :precision="digit"
-                :numberAdjust="selfPropsObj._numberAdjust"
+                :numberAdjust="selfPropsObj._numberAdjust || !unitStr"
                 @on-change="change"
             >
                 <div
                     v-if="unitStr"
                     slot="suffix"
-                    class="DshNumber-suffix"
+                    class="DshNumber-edit-suffix"
                 >
                     {{ unitStr }}
                 </div>
@@ -25,30 +26,29 @@
 
         <!-- 查看 -->
         <template v-else>
-            <!-- 表格 里的查看 -->
-            <template v-if="isUnitShow">
-                <!-- 进度条模式 -->
+            <!-- 单元格的查看 进度条模式 -->
+            <template v-if="isUnitShow && selfPropsObj._showProgress">
                 <Progress
                     v-if="selfPropsObj._showProgress"
                     :percent="curVal > 100 ? 100 : toDecimal(curVal)"
                 />
-
-                <!-- 文字模式 -->
-                <control-show
-                    v-else
-                    :showVal="showVal"
-                    :emptyShowVal="emptyShowVal"
-                    :propsObj="selfPropsObj"
-                ></control-show>
             </template>
 
-            <!-- 查看页 里的查看 -->
+            <!-- 单元格和查看页的查看 -->
             <template v-else>
-                <control-show
-                    :showVal="showVal"
-                    :emptyShowVal="emptyShowVal"
-                    :propsObj="selfPropsObj"
-                ></control-show>
+                <bri-tooltip
+                    :content="showText"
+                    maxWidth="200"
+                    :transfer="true"
+                >
+                    <div :class="{
+                        ...commonClass,
+                        'DshInput-unit': isUnitShow,
+                        'DshInput-show': !isUnitShow
+                    }">
+                        {{ showText }}
+                    </div>
+                </bri-tooltip>
             </template>
         </template>
     </div>
@@ -73,7 +73,6 @@
         computed: {
             selfPropsObj () {
                 return {
-                    _numberAdjust: true,
                     ...this.propsObj,
                     ...this.commonDealPropsObj
                 };
@@ -122,8 +121,10 @@
                 return this.selfPropsObj._separator;
             },
 
-            showVal () {
-                return this.$numToStrAndUnit(this.value[this.controlKey], this.selfPropsObj);
+            showText () {
+                return this.$isEmptyData(this.curVal)
+                    ? this.emptyShowVal
+                    : this.$numToStrAndUnit(this.value[this.controlKey], this.selfPropsObj);
             }
         },
         created () {},

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

@@ -74,7 +74,7 @@
             </Select>
         </template>
 
-        <Ctooltip
+        <bri-tooltip
             v-else
             :content="valStr"
             maxWidth="200"
@@ -102,7 +102,7 @@
             >
                 {{ emptyShowVal }}
             </div>
-        </Ctooltip>
+        </bri-tooltip>
 
         <!-- tip项弹框提示 -->
         <dsh-render :render="tipModalRender"></dsh-render>

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

@@ -20,7 +20,7 @@
 
         <!-- 查看 -->
         <template v-else>
-            <Ctooltip
+            <bri-tooltip
                 :content="showText"
                 placement="top"
                 :transfer="true"
@@ -37,7 +37,7 @@
                         {{ showText }}
                     </span>
                 </div>
-            </Ctooltip>
+            </bri-tooltip>
         </template>
     </div>
 </template>

package/src/components/controls/controlMap.js

@@ -58,7 +58,7 @@ const pathMap = {
         // DshSelect: "./base/DshSelect.vue", // 全局已注册
         // DshCheckbox: "./base/DshCheckbox.vue", // 全局已注册
         // DshCascader: "./base/DshCascader/DshCascader.vue", // 全局已注册
-        BriUpload: "./base/BriUpload/index.vue",
+        BriUpload: "./base/BriUpload/BriUpload.vue",
         DshCoordinates: "./base/DshCoordinates.vue",
         DshEditor: "./base/DshEditor.vue",
         DshDivider: "./base/DshDivider.vue",

package/src/components/controls/controlMixin.js

@@ -1,9 +1,5 @@
-import controlShow from "./controlShow.vue";
-
 export default {
-    components: {
-        controlShow
-    },
+    components: {},
     props: {
         canEdit: {
             type: Boolean,
@@ -72,7 +68,7 @@ export default {
                     : "暂无内容";
         },
         showText () {
-            return this.$isEmptyData(this.curVal) ? this.curVal : this.emptyShowVal;
+            return this.$isEmptyData(this.curVal) ? this.emptyShowVal : this.curVal;
         },
 
         isUnitShow () {
@@ -93,12 +89,13 @@ export default {
         },
         commonClass () {
             return {
-                "dsh-ellipsis": true,
                 "control-edit": this.canEdit && this.finalCanEdit,
                 "control-disabled": this.canEdit && !this.finalCanEdit,
                 "control-unit": !this.canEdit && this.isUnitShow,
                 "control-show": !this.canEdit && !this.isUnitShow,
-                "control-notext": this.$isEmptyData(this.curVal)
+
+                "dsh-ellipsis": true,
+                "control-notext": !this.isUnitShow && this.$isEmptyData(this.curVal)
             };
         },
 

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

@@ -1,38 +1,45 @@
 <!-- 动态标签 -->
 <template>
     <div class="BriLabels">
-        <!-- 编辑 -->
+        <!-- 编辑页 -->
         <Dropdown
-            v-if="finalCanEdit"
+            v-if="canEdit"
             class="BriLabels-dropdown"
             trigger="custom"
             placement="bottom-start"
             :visible="listVisible"
+            transfer
             @on-clickoutside="clickInput"
         >
+            <!-- 可编辑 -->
             <div
                 :class="{
-                    'control-edit': true,
-                    'BriLabels-dropdown-show':true,
-                    'BriLabels-dropdown-show-active':listVisible
+                    'BriLabels-box': true,
+                    ...commonClass
                 }"
                 @click="clickInput"
             >
-                <div class="BriLabels-dropdown-show-list">
-                    <Tag
-                        v-for="item in val"
-                        :key="item._key"
-                        closable
-                        @on-close="handleCancel(item)"
+                <template v-if="val.length">
+                    <dsh-tags
+                        v-if="val"
+                        class="BriLabels-text"
+                        :list="val"
+                        :propsObj="{
+                            closable: finalCanEdit,
+                            disabled: !finalCanEdit
+                        }"
+                        @delete="handleCancel"
                     >
-                        {{item.name}}
-                    </Tag>
-                </div>
-                <Icon
-                    class="BriLabels-dropdown-show-arrow"
-                    color="#808695"
-                    :type="inputIcon"
-                />
+                        <span slot-scope="{ tagItem }"> {{ tagItem.name }}</span>
+                    </dsh-tags>
+
+                    <Icon
+                        class="BriLabels-icon"
+                        :type="inputIcon"
+                    />
+                </template>
+
+                <template v-else>{{ commonDealPropsObj._placeholder }}</template>
             </div>
 
             <template #list>
@@ -93,7 +100,7 @@
                                 btnType: 'default',
                                 icon:'md-add'
                             }"
-                            @click="addLabel"
+                            @click.native.stop="addLabel"
                         >
                             添加选项
                         </bri-button>
@@ -102,38 +109,30 @@
             </template>
         </Dropdown>
 
-        <!-- 查看 -->
-        <div
-            v-else
-            class="BriLabels-view"
-        >
-            <template v-if="val.length">
-                <Ctooltip
-                    placement="top"
-                    :transfer="true"
-                    maxWidth="200"
-                    :content="showValStr"
-                >
-                    <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
-                v-else
-                class="BriLabels-view-nodata"
+        <!-- 查看模式 -->
+        <template v-else>
+            <bri-tooltip
+                :content="showValStr"
+                maxWidth="200"
+                :transfer="true"
             >
-                {{ emptyShowVal }}
-            </div>
-        </div>
+                <div :class="commonClass">
+                    <dsh-tags
+                        v-if="!$isEmptyData(val)"
+                        class="BriLabels-text"
+                        :list="val"
+                        :propsObj="{
+                            closable: false
+                        }"
+                    >
+                        <span slot-scope="{ tagItem }"> {{ tagItem.name }}</span>
+                    </dsh-tags>
+                    <template v-else>
+                        {{ emptyShowVal }}
+                    </template>
+                </div>
+            </bri-tooltip>
+        </template>
     </div>
 </template>
 
@@ -158,6 +157,9 @@
                     ...this.commonDealPropsObj
                 };
             },
+            modKey () {
+                return this.selfPropsObj.modKey;
+            },
             val: {
                 get () {
                     return this.value[this.propsObj._key] || [];
@@ -169,13 +171,25 @@
             showValStr () {
                 let valArr = this.val && this.val.map(item => item.name);
                 return valArr && valArr.join("、");
+            },
+            isCore () {
+                return this.propsObj.isCore;
             }
         },
         created () {
         },
         methods: {
             init () {
-                this.getListData();
+                if (this.isCore) {
+                    this.listData = this.propsObj._originLabels.map(item => {
+                        return {
+                            ...item,
+                            isEdit: false
+                        };
+                    });
+                } else {
+                    this.getListData();
+                }
             },
             getListData () {
                 this.$https({
@@ -187,7 +201,8 @@
                         search: {
                             entityKey: this.entityKey, // 当前工作表关联的数据表Key
                             fieldKey: this.selfPropsObj._key === "_default" ? this.value._key : (this.selfPropsObj.__realKey__ || this.selfPropsObj._key), // 当前字段Key
-                            labelType: this.selfPropsObj._labelType
+                            labelType: this.selfPropsObj._labelType,
+                            modKey: this.modKey
                         },
                         pagination: {
                             page: 1,
@@ -223,6 +238,7 @@
                 } else {
                     this.val.push(item);
                 }
+                this.change();
             },
             clickEdit (item) {
                 item.isEdit = true;
@@ -235,9 +251,10 @@
                 if (item.name == "") return;
                 item.isEdit = false;
                 this.$forceUpdate();
+                this.change();
             },
             handleCancel (item) {
-                this.val = this.val.filter(i => i._key != item._key);
+                this.change();
             },
             addLabel () {
                 this.listData.push({
@@ -246,6 +263,7 @@
                     name: "",
                     labelType: this.selfPropsObj._labelType
                 });
+                this.change();
             }
         },
         watch: {

package/src/components/controls/special/DshUndeveloped.vue

@@ -33,9 +33,3 @@
         methods: {}
     };
 </script>
-
-<style lang="less">
-    .DshUndeveloped {
-        width: 100%;
-    }
-</style>

package/src/components/form/DshForm.vue

@@ -148,7 +148,10 @@
         data () {
             return {
                 rules: {},
-                forceValidateTypes: ["select", "cascader", "regions", "cascaders", "file", "coordinates", "editor", "users", "departments", "labels", "flatTable", "reference", "referenceBy"],
+                forceValidateTypes: [
+                    "select", "cascader", "regions", "cascaders", "file", "coordinates", "editor",
+                    "users", "departments", "labels", "flatTable", "reference", "referenceBy"
+                ],
                 ignoreProperties: [
                     "_name", "_key", "_default", "_required", "_span", "_br", "_line", "_noLabel", "_clearable",
                     "_disabledBtns", "_disabledOldDataRow"
@@ -319,19 +322,3 @@
         }
     };
 </script>
-
-<style lang="less">
-    .DshForm {
-        &-item-FormItem {
-            margin-bottom: 0px!important;
-        }
-
-        .ivu-form-item-content {
-            line-height: normal;
-        }
-        .ivu-form-item-error-tip {
-            top: 90%;
-            left: 15px;
-        }
-    }
-</style>

package/src/components/list/BriTable.vue

@@ -34,7 +34,7 @@
         ></ve-table>
 
         <!-- loading -->
-        <ZLoading v-if="isLoading" />
+        <bri-loading v-if="isLoading" />
         <!-- empty -->
         <div
             v-else-if="!data.length"