bri-components 1.1.3 → 1.1.4

package/src/components/controls/base/{textMultiple/MultipleInput.vue → BriInputs.vue}

@@ -1,5 +1,5 @@
 <template>
-    <div class="MutipleInput">
+    <div class="BriInputs">
         <Input
             v-show="status === 'edit'"
             v-model="curInputVal"
@@ -10,25 +10,25 @@
         ></Input>
         <div
             v-show="status === 'show'"
-            class="MutipleInput-show"
+            class="BriInputs-show"
         >
             <span
-                class="MutipleInput-show-content"
+                class="BriInputs-show-content"
                 @click="clickAdd"
             >
                 <span
                     v-for="(val,index) in value[controlKey]"
-                    class="MutipleInput-show-content-item"
+                    class="BriInputs-show-content-item"
                     :key="index"
                 >
                     <span
-                        class="MutipleInput-show-content-item-content"
+                        class="BriInputs-show-content-item-content"
                         @click.stop="clickEdit(val,index)"
                     >
                         {{val}}
                     </span>
                     <Icon
-                        class="MutipleInput-show-content-item-del"
+                        class="BriInputs-show-content-item-del"
                         type="ios-close"
                         size="20"
                         @click.stop="clickDelete(val)"
@@ -36,7 +36,7 @@
                 </span>
             </span>
             <Icon
-                class="MutipleInput-show-add"
+                class="BriInputs-show-add"
                 type="md-create"
                 @click="clickAdd"
             />
@@ -45,13 +45,14 @@
 </template>
 
 <script>
-    import controlMixin from "../../controlMixin.js";
+    import controlMixin from "../controlMixin.js";
 
     export default {
-        name: "MutipleInput",
-        mixins: [controlMixin],
-        props: {
-        },
+        name: "BriInputs",
+        mixins: [
+            controlMixin
+        ],
+        props: {},
         data () {
             return {
                 status: "edit", // show

package/src/components/controls/base/{ZUpload/YUploadImage.vue → BriUpload/BriUploadImage.vue}

@@ -1,35 +1,68 @@
 <template>
-    <div class="YUploadImage">
-        <div class="YUploadImage-set" ref="viewerImage">
+    <div class="BriUploadImage">
+        <div
+            class="BriUploadImage-set"
+            ref="viewerImage"
+        >
             <div
                 v-if="value[propsObj._key] || propsObj._default || percent"
-                :class="['YUploadImage-set-img', isAvatar ? 'YUploadImage-set-avatar' : '']"
+                :class="['BriUploadImage-set-img', isAvatar ? 'BriUploadImage-set-avatar' : '']"
                 :style="{
                     backgroundImage: `url(${$imageResize(value[propsObj._key] || propsObj._default, imageResizeConfig)})`,
                     borderRadius: propsObj.radius ? '50%' : ''
                 }"
             >
-                <img :data-original="value[propsObj._key]" style="display:none">
-                <div v-if="value[propsObj._key] && propsObj._canAction" class="YUploadImage-set-action">
-                    <Icon class="YUploadImage-set-img-action" type="ios-eye-outline" size="16" @click.native="handlePreview"></Icon>
-                    <Icon class="YUploadImage-set-img-action" type="ios-trash-outline" size="16" @click.native="handleRemove"></Icon>
+                <img
+                    :data-original="value[propsObj._key]"
+                    style="display:none"
+                >
+                <div
+                    v-if="value[propsObj._key] && propsObj._canAction"
+                    class="BriUploadImage-set-action"
+                >
+                    <Icon
+                        class="BriUploadImage-set-img-action"
+                        type="ios-eye-outline"
+                        size="16"
+                        @click.native="handlePreview"
+                    ></Icon>
+                    <Icon
+                        class="BriUploadImage-set-img-action"
+                        type="ios-trash-outline"
+                        size="16"
+                        @click.native="handleRemove"
+                    ></Icon>
                 </div>
                 <!-- 上传进度 -->
-                <div  v-if="percent" class="YUploadImage-set-img-circle">
+                <div
+                    v-if="percent"
+                    class="BriUploadImage-set-img-circle"
+                >
                     <i-circle
                         class="circle"
                         :percent="percent"
                         :stroke-color="percentColor"
                     >
-                        <Icon v-if="percent == 100" type="ios-checkmark"></Icon>
+                        <Icon
+                            v-if="percent == 100"
+                            type="ios-checkmark"
+                        ></Icon>
                         <span v-else>{{ percent }}%</span>
                     </i-circle>
                 </div>
 
             </div>
             <div class="wrap">
-                <Button type="default" class="btn-cancel-outline z-default">点击上传</Button>
-                <input id="fileupload" class="file" :type="inputType" @change="setImage" />
+                <Button
+                    type="default"
+                    class="btn-cancel-outline z-default"
+                >点击上传</Button>
+                <input
+                    id="fileupload"
+                    class="file"
+                    :type="inputType"
+                    @change="setImage"
+                />
             </div>
         </div>
 
@@ -43,7 +76,10 @@
             :footer-hide="true"
             @on-visible-change="visibleChange"
         >
-            <div class="avatar-modal" style="width:400px;margin: 0 auto;">
+            <div
+                class="avatar-modal"
+                style="width:400px;margin: 0 auto;"
+            >
                 <dsh-cropper
                     style="width: 400px;height: 400px;"
                     ref="cropper"
@@ -54,7 +90,10 @@
                 </dsh-cropper>
                 <div class="avatar-modal-footer bri-footer">
                     <Button @click="cancelAvatarModal()">取消</Button>
-                    <Button type="primary" @click="photoSubmit()">保存</Button>
+                    <Button
+                        type="primary"
+                        @click="photoSubmit()"
+                    >保存</Button>
                 </div>
             </div>
         </Modal>
@@ -66,8 +105,10 @@
     import Viewer from "viewerjs";
 
     export default {
-        name: "YUploadImage",
-        mixins: [uploadMixin],
+        name: "BriUploadImage",
+        mixins: [
+            uploadMixin
+        ],
         components: {},
         props: {
             value: Object,

package/src/components/controls/base/{ZUpload → BriUpload}/index.vue

@@ -1,21 +1,20 @@
 <template>
-    <y-upload-image
+    <bri-upload-image
         v-if="propsObj._kind === 'uploadImage'"
         :value="value"
-        ossType="putUpload"
         :propsObj="propsObj"
         @change="change"
-    ></y-upload-image>
+    ></bri-upload-image>
 
     <div
         v-else
         :class="[
             prefixCls,
-            'ZUpload',
-            `ZUpload-${showType}`,
+            'BriUpload',
+            `BriUpload-${showType}`,
             {
-                'ZUpload-readonly': !canEdit,
-                'ZUpload-disabled': !finalCanEdit
+                'BriUpload-readonly': !canEdit,
+                'BriUpload-disabled': !finalCanEdit
             }
         ]"
     >
@@ -40,11 +39,11 @@
                 :disabled="!canClickUpload"
             >
             <slot>
-                <div :class="`ZUpload-${showType}-imageadd`">
+                <div :class="`BriUpload-${showType}-imageadd`">
 
                     <i-circle
                         v-if="percent"
-                        :class="`ZUpload-${showType}-circle`"
+                        :class="`BriUpload-${showType}-circle`"
                         :percent="percent"
                         :stroke-color="percentColor"
                     >
@@ -84,7 +83,7 @@
 <script>
     import controlMixin from "../../controlMixin.js";
     import uploadMixin from "./uploadMixin.js";
-    import YUploadImage from "./YUploadImage.vue";
+    import BriUploadImage from "./BriUploadImage.vue";
     import uploadList from "./upload-list.vue";
 
     const prefixCls = "ivu-upload";
@@ -95,7 +94,7 @@
             uploadMixin
         ],
         components: {
-            YUploadImage,
+            BriUploadImage,
             uploadList
         },
         props: {
@@ -232,7 +231,7 @@
                         [`${prefixCls}-select`]: this.type === "select",
                         [`${prefixCls}-drag`]: this.type === "drag",
                         [`${prefixCls}-dragOver`]: this.type === "drag" && this.dragOver,
-                        [`ZUpload-${this.showType}-wrapper`]: true
+                        [`BriUpload-${this.showType}-wrapper`]: true
                     }
                 ];
             }

package/src/components/controls/base/{ZUpload → BriUpload}/uploadMixin.js

@@ -1,4 +1,5 @@
 import axios from "axios";
+
 const minio = require("minio");
 const stream = require("stream");
 export default {
@@ -25,8 +26,7 @@ export default {
             percent: 0
         };
     },
-    created () {
-    },
+    created () {},
     computed: {
         computedGroupKey () {
             return this.propsObj.groupKey || this.groupKey;

package/src/components/controls/base/{DshCascader.vue → DshCascader/DshCascader.vue}

@@ -22,6 +22,7 @@
                     <dsh-control-define
                         :value="valTags"
                         :canEdit="canEdit"
+                        :finalCanEdit="finalCanEdit"
                         :propsObj="{
                             ...selfPropsObj,
                             _multiplerow: selfPropsObj._span == 24 || !selfPropsObj._span
@@ -106,7 +107,8 @@
         <dsh-control-define
             v-else
             :value="valTags"
-            :canEdit="finalCanEdit"
+            :canEdit="canEdit"
+            :finalCanEdit="finalCanEdit"
             :propsObj="{
                 ...selfPropsObj,
                 _multiplerow: selfPropsObj._span == 24 || !selfPropsObj._span
@@ -117,8 +119,8 @@
 
 <script>
     import { regionData } from "bri-datas";
-    import controlMixin from "../controlMixin.js";
-    import InfoCascader from "../../other/InfoCascader";
+    import controlMixin from "../../controlMixin.js";
+    import InfoCascader from "./InfoCascader.vue";
 
     const loop = function (data = [], level, parentCode, filterVals = []) {
         if (data && filterVals.length) {
@@ -147,7 +149,9 @@
 
     export default {
         name: "DshCascader",
-        mixins: [controlMixin],
+        mixins: [
+            controlMixin
+        ],
         components: {
             InfoCascader
         },
@@ -218,19 +222,19 @@
                 return this.value[this.controlKey]
                     ? this.value[this.controlKey].map(item => this.$getTreeLinealDatas(item, this.cascaderData, "name").join("/"))
                     : [];
-            },
-
-            selfModalPropsObj () {
-                return {
-                    mode: "default",
-                    title: this.selfPropsObj._placeholder
-                };
-            },
-            showVal () {
-                return this.useMultiple
-                    ? this.valTags.join("、")
-                    : this.$getTreeLinealDatas(this.value[this.controlKey], this.cascaderData, "name").join(["region"].includes(this.selfPropsObj._type) ? "" : "/");
             }
+
+            // selfModalPropsObj () {
+            //     return {
+            //         mode: "default",
+            //         title: this.selfPropsObj._placeholder
+            //     };
+            // },
+            // showVal () {
+            //     return this.useMultiple
+            //         ? this.valTags.join("、")
+            //         : this.$getTreeLinealDatas(this.value[this.controlKey], this.cascaderData, "name").join(["region"].includes(this.selfPropsObj._type) ? "" : "/");
+            // }
         },
         created () {
             this.init();

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

@@ -104,7 +104,7 @@
 
             <div
                 v-else
-                class="control-nodata-text dsh-ellipsis"
+                class="control-notext dsh-ellipsis"
             >
                 {{ emptyShowVal }}
             </div>

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

@@ -9,152 +9,158 @@
             <!-- 编辑 -->
             <div
                 v-if="canEdit"
-                class="DshCoordinates-wrap"
-                :class="commonClass"
+                :class="{
+                    ...commonClass,
+                    'DshCoordinates-edit': true
+                }"
                 @click="clickOpenModal"
             >
                 <div
-                    v-if="curLnglat.length"
-                    class="DshCoordinates-text"
+                    v-if="!$isEmptyData(curVal)"
+                    class="value"
                 >
-                    <span class="dsh-ellipsis">
-                        {{ curValName}}
+                    <span class="value-name">
+                        {{ curValName }}
                     </span>
                     <Icon
-                        v-if="finalCanEdit && selfPropsObj._clearable"
-                        class="DshCoordinates-text-icon"
+                        v-if="selfPropsObj._clearable"
+                        class="value-icon"
                         type="md-close"
                         @click.stop="clickDelete"
                     />
                 </div>
 
-                <span
+                <div
                     v-else
-                    class="DshCoordinates-notext"
+                    class="nodata"
                 >
                     点击获取当前位置
-                    <i class="DshCoordinates-wrap-zuobiao bico-font bico-zuobiao"></i>
-                </span>
-            </div>
-
-            <!-- 查看 -->
-            <span
-                v-else
-                :class="{
-                    ...commonClass,
-                    'DshCoordinates-show': !isUnitShow
-                }"
-            >
-                {{ curValName }}
-            </span>
-        </Ctooltip>
+                    <i class="nodata-icon bico-font bico-zuobiao"></i>
+                </div>
 
-        <!-- 模态框 -->
-        <template v-if="canEdit">
-            <Modal
-                class="DshCoordinates-modal clearFlex-modal"
-                v-model="showModal"
-                title="选择位置"
-                :footer-hide="true"
-                :styles="modalStyles"
-                @on-cancel="clickCancel"
-            >
-                <div
-                    slot="header"
-                    class="DshCoordinates-modal-header"
+                <!-- 模态框 -->
+                <Modal
+                    class="DshCoordinates-modal"
+                    v-model="showModal"
+                    title="选择位置"
+                    :footer-hide="true"
+                    :styles="modalStyles"
+                    @on-cancel="clickCancel"
                 >
-                    <Row
-                        v-if="finalCanEdit"
-                        type="flex"
-                        justify="center"
-                        align="bottom"
+                    <div
+                        slot="header"
+                        class="DshCoordinates-modal-header"
                     >
-                        <Col span="8">
-                        <div>
-                            <RadioGroup v-model="formData.kind">
-                                <Radio label="keyword">按关键字搜索</Radio>
-                                <Radio label="coordinate">按坐标搜索</Radio>
-                            </RadioGroup>
-                        </div>
-                        <Row class="dsh-margin-top5">
-                            <Col span="16">
-                            <Input
-                                v-model="formData.searchText"
-                                placeholder="请输入..."
-                                :clearable="true"
-                                @on-enter="clickSearch"
-                            />
-                            <span class="DshCoordinates-message">{{ searchMessage }}</span>
+                        <Row
+                            v-if="finalCanEdit"
+                            class="edit"
+                            type="flex"
+                            justify="center"
+                            align="bottom"
+                        >
+                            <Col span="8">
+                            <div>
+                                <RadioGroup v-model="formData.kind">
+                                    <Radio label="keyword">按关键字搜索</Radio>
+                                    <Radio label="coordinate">按坐标搜索</Radio>
+                                </RadioGroup>
+                            </div>
+                            <Row class="dsh-margin-top5">
+                                <Col span="16">
+                                <Input
+                                    v-model="formData.searchText"
+                                    placeholder="请输入..."
+                                    :clearable="true"
+                                    @on-enter="clickSearch"
+                                />
+                                <span class="edit-message">{{ searchMessage }}</span>
+                                </Col>
+                                <Col span="8">&nbsp;
+                                <Button
+                                    type="primary"
+                                    @click="clickSearch"
+                                >搜索</Button>
+                                </Col>
+                            </Row>
                             </Col>
-                            <Col span="8">&nbsp;
-                            <Button
-                                type="primary"
-                                @click="clickSearch"
-                            >搜索</Button>
+
+                            <Col span="8">
+                            <div class="edit-text">坐标获取结果</div>
+                            <Row class="dsh-margin-top5">
+                                <Col span="16">
+                                <Input
+                                    :value="curVal.name"
+                                    :readonly="true"
+                                    :clearable="true"
+                                    @on-clear="clickClear"
+                                    @click.native="clickMapFitView"
+                                />
+                                </Col>
+                                <Col span="8">&nbsp;
+                                <Button
+                                    type="primary"
+                                    @click="clickConfirm"
+                                >确认</Button>
+                                </Col>
+                            </Row>
                             </Col>
                         </Row>
-                        </Col>
 
-                        <Col span="8">
-                        <div class="DshCoordinates-modal-header-text">坐标获取结果</div>
-                        <Row class="dsh-margin-top5">
-                            <Col span="16">
+                        <Row
+                            v-else
+                            class="show"
+                        >
+                            <Col
+                                span="6"
+                                class="show-name"
+                            >
+                            当前位置：
+                            </Col>
+                            <Col span="12">
                             <Input
                                 :value="curVal.name"
                                 :readonly="true"
-                                :clearable="true"
-                                @on-clear="clickClear"
                                 @click.native="clickMapFitView"
                             />
                             </Col>
-                            <Col span="8">&nbsp;
-                            <Button
-                                type="primary"
-                                @click="clickConfirm"
-                            >确认</Button>
+                            <Col span="6">
                             </Col>
                         </Row>
-                        </Col>
-                    </Row>
+                    </div>
 
-                    <Row v-else>
-                        <Col
-                            span="6"
-                            class="textRight dsh-padding-top10"
-                        >当前位置：</Col>
-                        <Col span="12">
-                        <Input
-                            :value="curVal.name"
-                            :readonly="true"
-                            @click.native="clickMapFitView"
-                        />
-                        </Col>
-                        <Col span="6">
-                        </Col>
-                    </Row>
-                </div>
+                    <transition>
+                        <div
+                            v-if="showModal"
+                            id="mapContain"
+                            class="DshCoordinates-modal-map"
+                        ></div>
+                    </transition>
 
-                <transition>
                     <div
-                        v-if="showModal"
-                        id="mapContain"
-                        class="DshCoordinates-map"
+                        ref="divCoordinate"
+                        style="display: none; position:absolute;background:#fff;padding: 5px 10px"
                     ></div>
-                </transition>
-                <div
-                    ref="divCoordinate"
-                    style="display: none; position:absolute;background:#fff;padding: 5px 10px"
-                ></div>
-            </Modal>
-        </template>
+                </Modal>
+            </div>
+
+            <!-- 查看 -->
+            <template v-else>
+                <span :class="{
+                    ...commonClass,
+                    'DshCoordinates-show': true
+                }">
+                    {{ showText }}
+                </span>
+            </template>
+        </Ctooltip>
     </div>
 </template>
 
 <script>
     import controlMixin from "../controlMixin.js";
+
     const plotStrokeColor = "#4575EF";
     const plotFillColor = "#4575EF";
-
     let polygonOpt = {
         fillColor: plotFillColor,
         fillOpacity: 0.4,
@@ -169,7 +175,9 @@
 
     export default {
         name: "DshCoordinates",
-        mixins: [controlMixin],
+        mixins: [
+            controlMixin
+        ],
         computed: {
             curVal: {
                 get () {
@@ -237,7 +245,7 @@
         methods: {
             // 打开窗体
             clickOpenModal () {
-                if (this.canEdit || this.curLnglat.length) {
+                if (this.canEdit) {
                     this.showModal = true;
                     this.cloneValue = this.$deepCopy(this.curVal);
                     this.getMap();
@@ -339,7 +347,7 @@
                 this.mouseTool = new AMap.MouseTool(this.map);
                 this.mouseTool.on("draw", this.handleMouseToolCallback);
                 // 设置默认坐标
-                if (this.curLnglat.length) {
+                if (!this.$isEmptyData(this.curVal)) {
                     this.handleAddMarker(this.curLnglat, true);
 
                     if (this.kind === "multipleMarker") { // 多选打开绘图功能

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

@@ -75,7 +75,7 @@
 
 <script>
     import controlMixin from "../controlMixin.js";
-    import uploadMixin from "./ZUpload/uploadMixin.js";
+    import uploadMixin from "./BriUpload/uploadMixin.js";
     import E from "wangeditor";
 
     export default {