bri-components 1.2.0 → 1.2.2

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

@@ -5,110 +5,108 @@
     >
         <template v-if="canEdit">
             <!-- 平铺 -->
-            <CheckboxGroup
-                v-if="showType === 'flat'"
-                :class="[
-                    'DshCheckbox-checkboxGroup',
-                    { 'DshCheckbox-checkboxGroup-useColor' : selfPropsObj._useColor },
-                    { 'readonlyCheckbox' : !canEdit && !selfPropsObj._useColor },
-                    { 'readonlyColorCheckbox': !canEdit && selfPropsObj._useColor },
-                    { 'DshCheckbox-checkboxGroup-scroll': selfPropsObj._span < 24 && !selfPropsObj._br },
-                ]"
-                v-model="value[controlKey]"
-                @on-change="change"
-            >
-                <template v-if="listData.length">
-                    <Checkbox
+            <template v-if="showType === 'flat'">
+                <CheckboxGroup
+                    :class="{
+                    'DshCheckbox-group': true,
+                    'DshCheckbox-group-color': useColor,
+                    'DshCheckbox-group-disabled': !canEdit,
+                    'DshCheckbox-group-scroll': selfPropsObj._span < 24 && !selfPropsObj._br,
+                }"
+                    v-model="curValList"
+                >
+                    <!-- 有选项 -->
+                    <template v-if="listData.length">
+                        <Checkbox
+                            v-for="(item, index) in listData"
+                            :key="index"
+                            :class="[
+                                'DshCheckbox-item',
+                                getItemColorClass(item.color),
+                                selfPropsObj.class,
+                                item.class
+                            ]"
+                            :style="getItemStyle(item)"
+                            :label="item._key"
+                            :border="useColor"
+                            :disabled="getItemDisabled(item)"
+                            @click.native="clickOpenTip(item)"
+                        >
+                            <slot :item="item"></slot>
+                            <span>{{ item.name || item._name }}</span>
+                        </Checkbox>
+                    </template>
+
+                    <!-- 无选项 -->
+                    <div
+                        v-else
+                        class="dsh-subtip"
+                        style="backgroundColor: #f3f3f3;"
+                    >-- 无选择项 --</div>
+                </CheckboxGroup>
+            </template>
+
+            <!-- 下拉 -->
+            <template v-else>
+                <Select
+                    v-model="curValList"
+                    :multiple="true"
+                    :placeholder="selfPropsObj._placeholder"
+                    :disabled="!finalCanEdit"
+                    :filterable="selfPropsObj._filterable"
+                    :transfer="selfPropsObj._transfer"
+                    :transfer-class-name="selfPropsObj._transferClassName"
+                    :max-tag-count="selfPropsObj._maxTagCount"
+                >
+                    <Option
                         v-for="(item, index) in listData"
                         :key="index"
-                        :class="[
-                            'myChecked ',
-                            selfPropsObj.class,
-                            item.class,
-                            getColorClass(item.color)
-                        ]"
-                        :style="{
-                            backgroundColor: selfPropsObj._useColor ? getBgColor(item.color) : '',
-                            color:selfPropsObj._useColor ? getColor(item.color) : undefined
-                        }"
-                        :label="item._key"
-                        :border="selfPropsObj._useColor"
-                        :disabled="isDisabled(item)"
-                        @click.native="clickOpenTip(item)"
+                        :value="item._key"
+                        :label="item.name || item._name"
+                        :disabled="getItemDisabled(item)"
                     >
-                        <slot :item="item"></slot>
-                        <span>{{ item.name || item._name }}</span>
-                    </Checkbox>
-                </template>
+                        <Checkbox :value="curValList.includes(item._key)"></Checkbox>
 
-                <div
-                    v-else
-                    class="dsh-subtip"
-                    style="backgroundColor: #f3f3f3;"
-                >-- 无选择项 --</div>
-            </CheckboxGroup>
+                        <slot :item="item"></slot>
 
-            <!-- 下拉 -->
-            <Select
-                v-else
-                v-model="value[controlKey]"
-                :multiple="true"
-                :placeholder="selfPropsObj._placeholder"
-                :disabled="!finalCanEdit"
-                :filterable="selfPropsObj._filterable"
-                :transfer="selfPropsObj._transfer"
-                :transfer-class-name="selfPropsObj._transferClassName"
-                :max-tag-count="selfPropsObj._maxTagCount"
-                @on-select="select"
-            >
-                <Option
-                    v-for="(item, index) in listData"
-                    :key="index"
-                    :value="item._key"
-                    :label="item.name || item._name"
-                    :disabled="isDisabled(item)"
-                >
-                    <Checkbox :value="!!value[controlKey] && value[controlKey].includes(item._key)">
-                    </Checkbox>
-                    <slot :item="item"></slot>
-                    <span>{{ item.name || item._name }}</span>
-                    <span style="float:right;paddingRight:20px">{{ item.rightName }}</span>
-                </Option>
-            </Select>
+                        <span>{{ item.name || item._name }}</span>
+                        <span style="float:right;paddingRight:20px">
+                            {{ item.rightName }}
+                        </span>
+                    </Option>
+                </Select>
+            </template>
         </template>
 
-        <bri-tooltip
-            v-else
-            placement="top"
-            :transfer="true"
-            maxWidth="200"
-            :content="showVal"
-        >
-            <div
-                v-if="showVal"
-                class="DshCheckbox-value-wrapper"
-                :style="{
-                    justifyContent: flatShowAlign
-                }"
+        <!-- 查看 -->
+        <template v-else>
+            <bri-tooltip
+                :content="showMultipleVal"
+                placement="top"
+                maxWidth="200"
+                :transfer="true"
             >
-                <span
-                    v-for="col in colData"
-                    :key="col._id || col._key"
-                    class="DshCheckbox-value dsh-ellipsis"
-                    :style="{
-                        background: selfPropsObj._useColor ? getBgColor(col.color) : '',
-                        color: selfPropsObj._useColor ? getColor(col.color) : ''
-                    }"
-                >{{ col.name }}</span>
-            </div>
+                <div :class="{
+                    ...commonClass,
+                    'DshCheckbox-show': true
+                }">
+                    <!-- 有值 -->
+                    <dsh-tags
+                        v-if="!$isEmptyData(curValList)"
+                        class="text"
+                        :list="curValObjList"
+                        :propsObj="{
+                            closable: false
+                        }"
+                    ></dsh-tags>
 
-            <div
-                v-else
-                class="control-notext dsh-ellipsis"
-            >
-                {{ emptyShowVal }}
-            </div>
-        </bri-tooltip>
+                    <!-- 无值 -->
+                    <template v-else>
+                        {{ emptyShowVal }}
+                    </template>
+                </div>
+            </bri-tooltip>
+        </template>
 
         <!-- tip项弹框提示 -->
         <dsh-render :render="tipModalRender"></dsh-render>
@@ -116,9 +114,9 @@
 </template>
 
 <script>
-    import { resourceData } from "bri-datas";
     import controlMixin from "../controlMixin.js";
     import selectMixin from "./selectMixin.js";
+    import { resourceData } from "bri-datas";
 
     // optionKind值 'flat'、'dropdown'
     export default {
@@ -129,18 +127,7 @@
         ],
         props: {},
         data () {
-            return {
-                getBgColor: color => {
-                    let curColor = this.colorMap[color] || this.colorMap["color-1"];
-                    return this.$getColor(curColor, 0.1);
-                },
-                getColor: color => {
-                    return this.colorMap[color] || this.colorMap["color-1"];
-                },
-                getColorClass: color => {
-                    return this.colorMap[color] ? color : "color-1";
-                }
-            };
+            return {};
         },
         computed: {
             selfPropsObj () {
@@ -150,55 +137,61 @@
                     _data: [],
 
                     ...this.propsObj,
-                    ...this.commonDealPropsObj,
-                    _maxTagCount: this.propsObj._maxTagCount || undefined
+                    ...this.commonDealPropsObj
                 };
             },
-            colorMap () {
-                return this.selfPropsObj.colorMap || resourceData.colorMap;
+            listData () {
+                return (this.selfPropsObj._data || []).concat(this.initListData);
             },
+
             showType () {
                 return this.selfPropsObj._optionKind;
             },
-
-            listData () {
-                return (this.selfPropsObj._data || []).concat(this.initListData);
+            useColor () {
+                return this.selfPropsObj._useColor;
             },
-            showVal () {
-                return this.colData.map(col => col.name).join("、");
+            colorMap () {
+                return this.selfPropsObj.colorMap || resourceData.colorMap;
             },
-            // 选项数据
-            colData () {
-                return this.listData.filter(item => (this.curVal || []).includes(item._key));
+
+            // 已选择项的对象列表
+            curValObjList () {
+                return this.listData
+                    .filter(item => this.curValList.includes(item._key))
+                    .map(item => {
+                        return {
+                            ...item,
+                            style: this.getItemStyle(item),
+                            color: undefined
+                        };
+                });
             },
-            flatShowAlign () {
-                return !this.propsObj._align || this.propsObj._align == "left" || !this.isUnitShow
-                    ? "flex-start"
-                    : this.propsObj._align == "right"
-                        ? "flex-end"
-                        : "center";
+            showMultipleVal () {
+                return this.curValObjList.map(item => item.name).join("、");
             }
         },
         created () {},
         methods: {
-            // 下拉框的选择
-            select (item) {
-                let val = this.curVal;
-                if (val.includes(item.value)) {
-                    let itemIndex = val.findIndex(valItem => valItem === item.value);
-                    val.splice(itemIndex, 1);
-                } else {
-                    val.push(item.value);
-                }
-
-                this.$emit("change", val);
+            getItemColorClass (color) {
+                return this.colorMap[color] ? color : "color-1";
             },
-
-            isDisabled (item) {
+            getItemStyle (item) {
+                const getColor = (color) => {
+                    return this.colorMap[color] || this.colorMap["color-1"];
+                };
+                const getBgColor = (color) => {
+                    return this.$getColor(getColor(color), 0.1);
+                };
+                return {
+                    background: this.useColor ? getBgColor(item.color) : undefined,
+                    color: this.useColor ? getColor(item.color) : undefined
+                };
+            },
+            getItemDisabled (item) {
                 return !!(
                     !this.finalCanEdit ||
                     item._disabled ||
-                    this.curVal && this.curVal.length >= this.selfPropsObj._max && !this.curVal.includes(item._key)
+                    this.curValList.length >= this.selfPropsObj._max && !this.curValList.includes(item._key)
                 );
             }
         }

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

@@ -1,161 +1,135 @@
 <template>
     <div class="DshCoordinates">
         <bri-tooltip
-            :content="curValName"
+            :content="showText"
             placement="top"
             maxWidth="200"
             :transfer="true"
         >
-            <!-- 编辑 -->
-            <template v-if="canEdit">
-                <div
-                    :class="{
-                        ...commonClass,
-                        'DshCoordinates-edit': true
-                    }"
-                    @click="clickOpenModal"
+            <div
+                :class="{
+                    ...commonClass,
+                    'DshCoordinates-edit': true
+                }"
+               @click.stop="clickOpenModal"
+            >
+                <div class="text">
+                    {{ showText }}
+                </div>
+
+                <Icon
+                    v-if="finalCanEdit && selfPropsObj._clearable"
+                    class="icon-close"
+                    type="md-close"
+                    @click.stop="clickDelete"
+                />
+            </div>
+        </bri-tooltip>
+
+        <!-- 模态框 -->
+        <Modal
+            v-if="canEdit"
+            class="DshCoordinates-modal"
+            v-model="showModal"
+            title="选择位置"
+            :footer-hide="true"
+            :styles="modalStyles"
+            @on-cancel="clickCancel"
+        >
+            <div
+                slot="header"
+                class="DshCoordinates-modal-header"
+            >
+                <Row
+                    v-if="finalCanEdit"
+                    class="edit"
+                    type="flex"
+                    justify="center"
+                    align="bottom"
                 >
-                    <!-- 有值 -->
-                    <div
-                        v-if="!$isEmptyData(curVal)"
-                        class="value"
-                    >
-                        <span class="value-name">
-                            {{ curValName }}
-                        </span>
-                        <Icon
-                            v-if="selfPropsObj._clearable"
-                            class="value-icon"
-                            type="md-close"
-                            @click.stop="clickDelete"
-                        />
+                    <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>
 
-                    <!-- 无值 -->
-                    <div
-                        v-else
-                        class="nodata"
-                    >
-                        点击获取当前位置
-                        <i class="nodata-icon bico-font bico-zuobiao"></i>
-                    </div>
+                    <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>
 
-                    <!-- 模态框 -->
-                    <Modal
-                        class="DshCoordinates-modal"
-                        v-model="showModal"
-                        title="选择位置"
-                        :footer-hide="true"
-                        :styles="modalStyles"
-                        @on-cancel="clickCancel"
+                <Row
+                    v-else
+                    class="show"
+                >
+                    <Col
+                        span="6"
+                        class="show-name"
                     >
-                        <div
-                            slot="header"
-                            class="DshCoordinates-modal-header"
-                        >
-                            <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">
-                                <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>
-
-                            <Row
-                                v-else
-                                class="show"
-                            >
-                                <Col
-                                    span="6"
-                                    class="show-name"
-                                >
-                                当前位置：
-                                </Col>
-                                <Col span="12">
-                                <Input
-                                    :value="curVal.name"
-                                    :readonly="true"
-                                    @click.native="clickMapFitView"
-                                />
-                                </Col>
-                                <Col span="6">
-                                </Col>
-                            </Row>
-                        </div>
+                    当前位置：
+                    </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>
-
-                        <div
-                            ref="divCoordinate"
-                            style="display: none; position:absolute;background:#fff;padding: 5px 10px"
-                        ></div>
-                    </Modal>
-                </div>
-            </template>
+            <transition>
+                <div
+                    v-if="showModal"
+                    id="mapContain"
+                    class="DshCoordinates-modal-map"
+                ></div>
+            </transition>
 
-            <!-- 查看 -->
-            <template v-else>
-                <span :class="{
-                    ...commonClass,
-                    'DshCoordinates-show': true
-                }">
-                    {{ curValName || emptyShowVal }}
-                </span>
-            </template>
-        </bri-tooltip>
+            <div
+                ref="divCoordinate"
+                style="display: none; position:absolute;background:#fff;padding: 5px 10px"
+            ></div>
+        </Modal>
     </div>
 </template>
 
@@ -193,8 +167,8 @@
                     this.value[this.controlKey] = val;
                 }
             },
-            curValName () {
-                return this.curVal && this.curVal.name;
+            showText () {
+                return this.$isEmptyData(this.curVal) ? this.emptyShowVal : this.curVal.name;
             },
             curLnglat: {
                 get () {
@@ -248,7 +222,7 @@
         methods: {
             // 打开窗体
             clickOpenModal () {
-                if (this.canEdit) {
+                if (this.finalCanEdit) {
                     this.showModal = true;
                     this.cloneValue = this.$deepCopy(this.curVal);
                     this.getMap();

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

@@ -169,7 +169,7 @@
                     {
                         _key: "dyn_month_start",
                         name: "月初",
-                        numbers: [0],
+                        numbers: [0, 1],
                         dateTypes: ["month", "date", "datetime", "daterange", "datetimerange"]
                     },
                     {

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

@@ -41,6 +41,7 @@
             <div
                 v-if="isUnitShow"
                 :class="{
+                    ...commonClass,
                     'DshEditor-unit': !$isEmptyData(curVal)
                 }"
             >
@@ -144,7 +145,7 @@
                                 });
                             } else if (ossType === "local") {
                                 that.localUpload(fileItem, result.data, res => {
-                                    insertImg(res.url);
+                                    insertImg(res.data.url);
                                 });
                             } else {
                                 console.log(`请开发这种类型‘${ossType}’的上传模式`);