bri-components 1.2.21 → 1.2.23

package/package.json

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

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

@@ -55,7 +55,6 @@
                 >
                     <div :class="{
                         ...commonClass,
-                        'dsh-ellipsis': unitWrap,
                         'DshInput-unit': isUnitShow,
                         'DshInput-show': !isUnitShow
                     }">
@@ -96,21 +95,20 @@
         computed: {
             selfPropsObj () {
                 return {
-                    _textType: "default",
+                    _textType: "default", // ["default", "url"]
                     _readonly: ["serialNumber"].includes(this.controlType),
                     _disabled: ["serialNumber"].includes(this.controlType),
                     _showWordLimit: this.propsObj._showWordLimit || (!!this.propsObj._maxlength || this.propsObj._maxlength === 0),
                     _autosize: {
                         minRows: 2
                     },
-                    _wrap: true, // 单元格文字换行
 
                     ...this.propsObj,
                     ...this.commonDealPropsObj
                 };
             },
             inputType () {
-                return ["textarea", "password", "email", "url", "number", "tel"].includes(this.controlType)
+                return ["textarea", "email", "password", "url", "number", "tel"].includes(this.controlType)
                     ? this.controlType
                     : ["text"].includes(this.controlType) && ["url"].includes(this.subType)
                         ? "url"
@@ -121,9 +119,6 @@
             // 子类型，只在type="text"有效
             subType () {
                 return this.selfPropsObj._textType;
-            },
-            unitWrap () {
-                return !(this.isUnitShow && !!this.selfPropsObj._wrap);
             }
         },
         created () {},
@@ -163,7 +158,7 @@
             // 超链接跳转
             goHttpWindow (e) {
                 e.stopPropagation();
-                window.open(this.curVal);
+                this.$postOpenLink(this.curVal);
             }
         }
     };

package/src/components/controls/controlMixin.js

@@ -91,7 +91,7 @@ export default {
             return {
                 // TODO: 此处的请输入可能还有请选择之类的，待处理
                 _placeholder: this.canEdit && this.propsObj._enterType !== "calculate"
-                    ? (this.propsObj._placeholder || `请${selectControlTypes.includes(this.propsObj._type) ? "选择" : "输入"}${this.propsObj._name}`)
+                    ? (this.propsObj._placeholder || `请${selectControlTypes.includes(this.controlType) ? "选择" : "输入"}${this.propsObj._name}`)
                     : undefined,
                 _clearable: this.finalCanEdit && (this.propsObj._clearable === undefined ? true : this.propsObj._clearable)
             };
@@ -100,10 +100,10 @@ export default {
             return {
                 "bri-control-edit": this.canEdit && this.finalCanEdit,
                 "bri-control-disabled": this.canEdit && !this.finalCanEdit,
-                "bri-control-unit": !this.canEdit && this.isUnitShow,
-                "bri-control-show": !this.canEdit && !this.isUnitShow,
+                "bri-control-unit": !this.canEdit && this.isInTable,
+                "bri-control-show": !this.canEdit && !this.isInTable,
 
-                "dsh-ellipsis": true,
+                "dsh-ellipsis": !(this.isUnitShow && !!this.propsObj._unitWrap),
                 "bri-control-nodata": this.$isEmptyData(this.curVal)
             };
         },

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

@@ -1,61 +1,51 @@
 <template>
     <div class="flatTable">
-        <!-- 在表格内的查看 -->
-        <span
-            v-if="isUnitShow"
-            class="flatTable-unit"
-        >
-            <dsh-icons :list="[{
-                customIcon: 'bico-internaltable'
-            }]"></dsh-icons>
-            <span class="flatTable-unit-text">
-                {{ curVal.list.length }}行
-            </span>
-        </span>
+        <!-- 多选模式 -->
+        <template v-if="multipleMode">
+            <!-- 暂时不写内容 -->
+        </template>
 
+        <!-- 单选模式 -->
         <template v-else>
-            <!-- 配置端 设置默认值用-->
-            <dsh-btn-modal v-if="propsObj._key === '_default'">
-                <bri-flat-table
-                    :canEdit="finalCanEdit"
-                    :columns="columns"
-                    :data="curVal.list"
-                    :rowDefault="curVal.rowDefault"
-                    :outObj="value"
-                    :propsObj="propsObj"
-                    @change="change"
-                ></bri-flat-table>
-            </dsh-btn-modal>
+            <!-- 查看 单元格内 -->
+            <template v-if="isUnitShow">
+                <span class="flatTable-unit">
+                    <dsh-icons :list="[{
+                        customIcon: 'bico-internaltable'
+                    }]"></dsh-icons>
+                    <span class="flatTable-unit-text">
+                        {{ curVal.list.length }}行
+                    </span>
+                </span>
+            </template>
 
-            <!-- 正常使用 -->
+            <!-- 编辑、查看（查看页内） -->
             <template v-else>
-                <!-- 操作按钮 -->
-                <dsh-buttons
-                    class="flatTable-btns"
-                    itemClass="flatTable-btns-item"
-                    :list="$getOperationList(['canEnlarge'])"
-                    @click="$dispatchEvent($event)"
-                ></dsh-buttons>
+                <!-- 配置端 设置默认值用-->
+                <dsh-btn-modal v-if="propsObj._key === '_default'">
+                    <bri-flat-table
+                        :canEdit="finalCanEdit"
+                        :columns="columns"
+                        :data="curVal.list"
+                        :rowDefault="curVal.rowDefault"
+                        :outObj="value"
+                        :propsObj="propsObj"
+                        @change="change"
+                    ></bri-flat-table>
+                </dsh-btn-modal>
 
-                <bri-flat-table
-                    ref="dshFatTable"
-                    :canEdit="finalCanEdit"
-                    :columns="columns"
-                    :data="curVal.list"
-                    :oldData="curVal.oldList"
-                    :rowDefault="curVal.rowDefault"
-                    :outObj="value"
-                    :propsObj="propsObj"
-                    @change="change"
-                ></bri-flat-table>
+                <!-- 正常使用 -->
+                <template v-else>
+                    <!-- 操作按钮 -->
+                    <dsh-buttons
+                        class="flatTable-btns"
+                        itemClass="flatTable-btns-item"
+                        :list="$getOperationList(['canEnlarge'])"
+                        @click="$dispatchEvent($event)"
+                    ></dsh-buttons>
 
-                <!-- 全屏查看 -->
-                <dsh-modal
-                    v-model="isEnlarge"
-                    mode="custom"
-                    :propsObj="modalPropsObj"
-                >
                     <bri-flat-table
+                        ref="dshFatTable"
                         :canEdit="finalCanEdit"
                         :columns="columns"
                         :data="curVal.list"
@@ -65,7 +55,25 @@
                         :propsObj="propsObj"
                         @change="change"
                     ></bri-flat-table>
-                </dsh-modal>
+
+                    <!-- 全屏查看 -->
+                    <dsh-modal
+                        v-model="isEnlarge"
+                        mode="custom"
+                        :propsObj="modalPropsObj"
+                    >
+                        <bri-flat-table
+                            :canEdit="finalCanEdit"
+                            :columns="columns"
+                            :data="curVal.list"
+                            :oldData="curVal.oldList"
+                            :rowDefault="curVal.rowDefault"
+                            :outObj="value"
+                            :propsObj="propsObj"
+                            @change="change"
+                        ></bri-flat-table>
+                    </dsh-modal>
+                </template>
             </template>
         </template>
     </div>

package/src/components/form/DshAdvSearchForm.vue

@@ -53,7 +53,7 @@
                     >
                         <template v-if="!conditionItem.__isDelete__">
                             <!-- 子表的筛选，出现是有条件的，递归 -->
-                            <template v-if="conditionItem.fieldOperator === 'subSearch'">
+                            <template v-if="['subSearch', 'subTableSearch'].includes(conditionItem.fieldOperator)">
                                 <dsh-advSearch-form
                                     v-if="conditionItem.finished === true"
                                     :isInner="true"
@@ -84,9 +84,9 @@
                                 @change="change(conditionItem, arguments)"
                             ></dsh-select>
 
-                            <!-- 文件类型时候啥都不显示 -->
+                            <!-- 为空和不为空时 啥不显示 -->
                             <div
-                                v-else-if="['file'].includes(conditionItem.fieldType)"
+                                v-else-if="['isnull', 'notnull', 'nosize', 'size', 'nolist', 'list'].includes(conditionItem.fieldOperator)"
                                 class="DshAdvSearchForm-conditions-item-blank"
                             >请选择右上角条件</div>
                         </template>
@@ -147,7 +147,7 @@
                         v-else
                         :key="`${conditionItem._id}other`"
                     >
-                        {{ conditionItem.logic }}模式是不用开发的
+                        {{ conditionItem.logic }}模式未开发
                     </div>
                 </template>
             </div>
@@ -160,6 +160,7 @@
                     menuClass="DshAdvSearchForm-btns-field-list"
                     :list="searchFormList"
                     :useSearch="true"
+                    trigger="click"
                     @click="$dispatchEvent(operationMap.createContion, false, $event)"
                 >
                     <dsh-buttons
@@ -318,12 +319,13 @@
             },
             // 选择某控件的筛选类型
             selectOperator (operationItem, conditionItem, conditionIndex, list, opertorItem) {
+                // 重置这些数据
                 conditionItem.fieldOperator = opertorItem._key;
                 conditionItem.fieldOperatorName = opertorItem.name;
                 conditionItem.fieldSearch = {
                     logic: "and",
                     conditions: []
-                }; // 重置fieldSearch
+                };
                 this.dealSubSearch(conditionItem);
 
                 this.change(conditionItem);

package/src/components/form/searchMixin.js

@@ -159,13 +159,18 @@ export default {
             };
         },
 
-        // operator为子集且为reference类型，请求form
+        // 处理operator为子集subSearch\subTableSearch，1.subTableSearch为flatTable类型，使用_subForm；2.subSearch为reference类型，请求form
         dealSubSearch (conditionItem) {
-            if (conditionItem.fieldOperator === "subSearch" && conditionItem.finished !== true) {
-                this.getModData(conditionItem.formItem, data => {
-                    conditionItem.finished = true;
-                    conditionItem.subFormList = data.screens[0].form;
-                });
+            if (conditionItem.fieldOperator === "subSearch") {
+                if (conditionItem.finished !== true) {
+                    this.getModData(conditionItem.formItem, data => {
+                        conditionItem.finished = true;
+                        conditionItem.subFormList = data.screens[0].form;
+                    });
+                }
+            } else if (conditionItem.fieldOperator === "subTableSearch") {
+                conditionItem.finished = true;
+                conditionItem.subFormList = conditionItem.formItem._subForm;
             }
         },
         // 加载 reference数据

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

@@ -2,7 +2,7 @@
     <div class="DshTable">
         <bri-table
             :data="data"
-            :columns="selfColumns"
+            :columns="selfColumns2"
             :propsObj="propsObj"
             :isLoading="isLoading"
             :noDataText="noDataText"
@@ -52,7 +52,9 @@
             noDataText: String
         },
         data () {
-            return {};
+            return {
+                selfColumns2: []
+            };
         },
         computed: {
             multiple () {
@@ -173,6 +175,7 @@
             }
         },
         created () {
+            this.selfColumns2 = this.selfColumns;
         },
         methods: {
             // 点击某行

package/src/components/other/BriIframe.vue

@@ -20,11 +20,10 @@
             >
         </div>
 
-        <Spin
+        <bri-loading
             v-if="loading"
-            size="large"
             fix
-        ></Spin>
+        />
     </div>
 </template>
 
@@ -39,7 +38,8 @@
             allow: {
                 type: String,
                 default: "fullscreen"
-            }
+            },
+            postInfo: Object
         },
         data () {
             return {
@@ -65,15 +65,22 @@
                         iframe.attachEvent("onreadystatechange", () => {
                             if (iframe.readyState === "complete" || iframe.readyState == "loaded") {
                                 this.loading = false;
+                                this.$emit("onreadystatechange", iframe);
                             }
                         });
                     } else {
                         iframe.addEventListener("load", () => {
                             this.loading = false;
+                            this.postInfo && this.postMessage(iframe);
+                            this.$emit("load", iframe);
                         }, false);
                     }
                 }
             },
+            // 向内部连接发送信息
+            postMessage (iframe) {
+                iframe.contentWindow && iframe.contentWindow.postMessage(this.postInfo, "*");
+            },
             /**
              * 在iframe页面使用举例：
              * let info = { "status": "success", type: "jumpPage", routerName: "home", params: {}, query: {} };

package/src/styles/components/form/DshAdvSearchForm.less

@@ -75,7 +75,7 @@
             &-blank {
                 text-align: center;
                 line-height: 30px;
-                color: @textColor;
+                color: @placeholderColor;
             }
 
             &-extra {

package/src/styles/components/small/DshModal.less

@@ -60,8 +60,6 @@
 
     &-default {
         .ivu-modal-wrap {
-            margin: 24px;
-
             .ivu-modal {
                 width: 750px !important;
                 height: 550px !important;
@@ -113,8 +111,6 @@
 
     &-middle {
         .ivu-modal-wrap {
-            margin: 24px;
-
             .ivu-modal {
                 // width: 1000px !important;
                 // height: 800px !important;
@@ -140,8 +136,6 @@
 
     &-large {
         .ivu-modal-wrap {
-            margin: 20px;
-
             .ivu-modal {
                 width: 80% !important;
                 height: 90% !important;