bri-components 1.0.2 → 1.0.5

package/package.json

@@ -1,9 +1,9 @@
 {
     "name": "bri-components",
-    "version": "1.0.2",
+    "version": "1.0.5",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
-    "main": "lib/bri-components.min.js",
+    "main": "src/index.js",
     "keywords": [
         "editor",
         "tinymce"
@@ -31,6 +31,7 @@
     },
     "dependencies": {
         "axios": "^0.23.0",
+        "bri-datas": "^1.0.8-0",
         "jshint": "^2.12.0",
         "minio": "^7.0.26",
         "stream": "^0.0.2",

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

@@ -134,7 +134,7 @@
 </template>
 
 <script>
-    import { regionData } from "../../../datas/index.js";
+    import { regionData } from "bri-datas";
     import controlMixin from "../controlMixin.js";
     import InfoCascader from "../../other/InfoCascader";
 

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

@@ -28,7 +28,7 @@
 </template>
 
 <script>
-    import { regionData } from "../../../datas/index.js";
+    import { regionData } from "bri-datas";
     import controlMixin from "../controlMixin.js";
 
     const loop = function (data = [], level, parentCode, filterVals = []) {

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

@@ -117,9 +117,9 @@
 </template>
 
 <script>
+    import { resourceData } from "bri-datas";
     import controlMixin from "../controlMixin.js";
     import selectMixin from "./selectMixin.js";
-    import { resourceData } from "../../../datas/index.js";
 
     // optionKind值 'flat'、'dropdown'
     export default {

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

@@ -114,9 +114,9 @@
 </template>
 
 <script>
+    import { resourceData } from "bri-datas";
     import controlMixin from "../controlMixin.js";
     import selectMixin from "./selectMixin.js";
-    import { resourceData } from "../../../datas/index.js";
 
     export default {
         name: "DshSelect",

package/src/components/controls/controlMixin.js

@@ -19,8 +19,7 @@ export default {
             default () {
                 return {};
             }
-        },
-        isShare: Boolean
+        }
     },
     data () {
         return {};
@@ -38,6 +37,9 @@ export default {
         inTable () {
             return !!this.propsObj.inTable;
         },
+        isShare () {
+            return !!this.propsObj.isShare;
+        },
         controlKey () {
             return this.propsObj._key;
         },
@@ -57,20 +59,13 @@ export default {
         },
         // 不同mode模式下readOnly 和disabled样式名
         commonClass () {
-            let commonClass = `control-${this.mode}-${
-                this.$isReadonly(this.canEdit, this.propsObj)
-                    ? "readonly"
-                    : (
-                        this.$isDisabled(this.canEdit, this.propsObj)
-                            ? "disabled"
-                            : "edit"
-                    )
+            let commonClass = `control-${this.mode}-${this.$isReadonly(this.canEdit, this.propsObj)
+                ? "readonly"
+                : this.$isDisabled(this.canEdit, this.propsObj)
+                    ? "disabled"
+                    : "edit"
             }`;
-            let otherClass = "";
-            if (this.mode === "rimless" && this.propsObj._line) {
-                // otherClass = `control-${this.mode}-span${this.propsObj._span}`;
-            }
-            return commonClass + " " + otherClass;
+            return commonClass;
         }
     },
     methods: {

package/src/components/form/DshForm.vue

@@ -25,7 +25,6 @@
                             :mode="mode"
                             :canEdit="canEdit"
                             :formData="formData"
-                            :isShare="isShare"
                             :formItem="formItem"
                             :allFormList="allFormList"
                             :changedFields="changedFields"
@@ -141,7 +140,6 @@
             labelWidth: [String, Number],
             formItemClass: String,
             formControlClass: String,
-            isShare: Boolean,
             showRules: {
                 type: Boolean,
                 default: true
@@ -235,31 +233,7 @@
                     });
                 }
 
-                // 判断各项 依赖的值
-                if (formItem._displayType === "show") {
-                    return true;
-                } else if (formItem._displayType === "hide") {
-                    return false;
-                } else {
-                    if (
-                        (formItem._advRely && formItem._advRely.conditions && formItem._advRely.conditions.length) ||
-                        (formItem._rely && formItem._rely.length)
-                    ) {
-                        const isAccord = formItem._advRely && formItem._advRely.conditions && formItem._advRely.conditions.length
-                            ? this.$isAdvRelyAccord(formItem._advRely, formData)
-                            : this.$isRelyAccord(formItem, formData);
-
-                        formData[formItem._key] = isAccord === true
-                            ? formData[formItem._key] !== undefined
-                                ? formData[formItem._key]
-                                : this.$deepCopy(formItem._default)
-                            : undefined;
-
-                        return isAccord;
-                    } else {
-                        return true;
-                    }
-                }
+                return this.$isAdvRelyShow(formItem, formData);
             },
             getRules (formItem) {
                 let rules = [];

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

@@ -10,7 +10,7 @@
                 class="DshPanel-group-title"
                 :style="{
                     backgroundColor: getBgColor(groupItem),
-                    color: colorMap[getBgColor(groupItem)] || '#fff'
+                    color: '#ffffff'
                 }"
             >
                 <span class="DshPanel-group-title-name">
@@ -45,7 +45,7 @@
                     class="dsh-tip"
                     style="position: absolute; top: 0px; left: 0px; width: 100%;"
                 >
-                    {{noDataText}}
+                    {{ noDataText }}
                 </div>
 
                 <!-- 拖拽 -->
@@ -64,15 +64,15 @@
                         @scroll.native="groupScroll(groupItem, groupIndex, $event)"
                     >
                         <div
-                            class="list-item"
                             v-for="(dataItem, dataIndex) in groupItem.list"
                             :key="dataItem._id"
                             :id="dataItem._id"
+                            class="item"
                             @click="clickRow(dataItem, dataIndex)"
                         >
                             <!-- 下拉操作 -->
                             <dsh-dropdown
-                                class="list-item-dropdown"
+                                class="item-dropdown"
                                 :dropdownObj="dropdownObj"
                                 :list="operationList"
                                 @click="$dshEmit($event, dataItem, dataIndex)"
@@ -80,11 +80,11 @@
                             ></dsh-dropdown>
 
                             <!-- 标题 -->
-                            <div class="list-item-title dsh-ellipsis">{{ dataItem[titleField] }}</div>
+                            <div class="item-title dsh-ellipsis">{{ dataItem[titleField] }}</div>
 
                             <!-- 显示字段 -->
                             <div
-                                class="list-item-cols unit"
+                                class="item-cols unit"
                                 v-for="colItem in selfColumns"
                                 :key="colItem._key"
                             >
@@ -124,33 +124,21 @@
                         </div>
                     </transition-group>
                 </dsh-draggable>
+
                 <!-- 组 操作按钮（添加） -->
                 <dsh-buttons
-                    class="DshPanel-group-list-btns"
+                    class="list-btns"
                     :list="groupBtnOperationList"
                     @click="$dshEmit($event, { [groupField]: groupItem._key })"
                 ></dsh-buttons>
             </div>
-
         </div>
     </div>
 </template>
 
 <script>
-    // 浅色转化为对应深色
-    const colorMap = {
-        "#CDE6FF": "#6DAEF2",
-        "#C1FCFF": "#40CBD2",
-        "#C5FFD9": "#50C979",
-        "#FFEDC8": "#FFC53B",
-        "#FFDCAC": "#FF9300",
-        "#FFD3B6": "#FA6400",
-        "#EEB0FF": "#B620E0",
-        "#D1B3FF": "#7E41DF",
-        "#B1C7FF": "#25428D",
-        "#DCDCDC": "#5D5D5D"
+    import { resourceData } from "bri-datas";
 
-    };
     export default {
         name: "DshPanel",
         props: {
@@ -204,10 +192,10 @@
 
                 getBgColor (groupItem) {
                     return this.groupFieldObj._useColor
-                        ? (this.groupFieldObj._data.find(item => item._key === groupItem._key) || { color: "#ccc" }).color
-                        : "#ccc";
+                        ? this.colorMap[(this.groupFieldObj._data.find(item => item._key === groupItem._key) || { color: "color-default" }).color]
+                        : "color-default";
                 },
-                colorMap
+                colorMap: resourceData.colorMap
             };
         },
         computed: {
@@ -293,7 +281,7 @@
     };
 </script>
 
-<style lang="less" scoped>
+<style lang="less">
     .DshPanel {
         min-width: 100%;
         height: 100%;
@@ -317,6 +305,7 @@
                 display: flex;
                 border-radius: 10px 10px 0px 0px;
                 font-size: 14px;
+
                 &-name {
                     max-width: 120px;
                 }
@@ -330,77 +319,77 @@
                 flex: 1;
                 min-height: 0px;
                 border: 1px dashed #cccccc;
-                padding: 10px 10px 40px;
                 border-top: none;
-                position: relative;
+                display: flex;
+                flex-direction: column;
 
                 .list-drag {
                     width: 100%;
-                    height: 100%;
+                    flex: 1;
+                    min-height: 0px;
+
                     &-transition {
                         display: block;
                         width: 100%;
                         height: 100%;
+                        padding: 10px;
                         overflow: auto;
-                    }
-                }
-                .list-item {
-                    margin-bottom: 10px;
-                    height: 60px;
-                    background: #FFFFFF;
-                    border: 1px solid rgba(102, 110, 126, 0.1);
-                    border-radius: 4px;
-                    cursor: pointer;
-                    position: relative;
-                    padding: 10px 17px;
 
-                    &-dropdown {
-                        position: absolute;
-                        top: 5px;
-                        right: 5px;
-                    }
+                        .item {
+                            height: 60px;
+                            padding: 10px 17px;
+                            margin-bottom: 10px;
+                            border: 1px solid rgba(102, 110, 126, 0.1);
+                            border-radius: 4px;
+                            background: #FFFFFF;
+                            cursor: pointer;
+                            position: relative;
 
-                    &-title {
-                        width: calc(100% - 22px);
-                        font-size: 14px;
-                        font-family: Source Han Sans CN;
-                        font-weight: 500;
-                        color: #515A6E;
-                        margin-bottom: 2px;
-                    }
+                            &-dropdown {
+                                position: absolute;
+                                top: 5px;
+                                right: 5px;
+                            }
 
-                    &-cols {
-                    }
-                    .unit {
-                        display: flex;
-                        flex-direction: row;
-                        color: #515A6E;
-                        &-label {
-                            max-width: 60px;
-                        }
-                        &-colon {
+                            &-title {
+                                width: calc(100% - 22px);
+                                margin-bottom: 2px;
+                                font-family: Source Han Sans CN;
+                                font-size: 14px;
+                                font-weight: 500;
+                                color: #515A6E;
+                            }
 
-                        }
-                        &-value {
-                            flex: 1;
+                            &-cols {}
+
+                            .unit {
+                                display: flex;
+                                flex-direction: row;
+                                color: #515A6E;
+                                &-label {
+                                    max-width: 60px;
+                                }
+                                &-colon {
+
+                                }
+                                &-value {
+                                    flex: 1;
+                                }
+                            }
                         }
                     }
                 }
-                &-btns {
+
+                .list-btns {
                     width: 100%;
+                    height: 40px;
+                    padding: 0px 10px;
                     text-align: center;
-                    height: 33px;
-                }
-            }
 
-        }
-    }
-</style>
-<style lang="less">
-    .DshPanel {
-        &-group-list-btns {
-            .ivu-btn {
-                background: transparent;
+                    .ivu-btn {
+                        background: transparent;
+                    }
+                }
             }
         }
     }

package/src/components/list/DshFlatTable.vue

@@ -1,5 +1,5 @@
 <template>
-    <div :class="`DshFlatTable control-${mode}`">
+    <div :class="`DshFlatTable control-default`">
         <!-- 表格内容 -->
         <div class="DshFlatTable-block">
             <table
@@ -74,8 +74,6 @@
                                 class="td-inner"
                                 :style="{
                                     padding: '5px 8px 16px'
-                                    // margin: isShowCompare(col, row, oldListData[rowIndex]) ? '-1px' : undefined,
-                                    // border: isShowCompare(col, row, oldListData[rowIndex]) ? '1px solid #ed4014' : undefined
                                 }"
                             >
                                 <!--对比值 -->
@@ -89,12 +87,10 @@
                                 >
                                     <dsh-unit
                                         class="td-inner-compare-unit"
-                                        :mode="mode"
                                         :canEdit="getUnitCanEdit(col, row)"
                                         :parentData="listData"
                                         :formData="row"
                                         :formItem="col"
-                                        :isShare="isShare"
                                         :rowIndex="rowIndex"
                                         @blur="controlBlur(null, col, row, arguments)"
                                         @change="$dispatchEvent(operationMap.changeVal, col, row, rowIndex, arguments)"
@@ -103,12 +99,10 @@
 
                                 <dsh-unit
                                     v-else
-                                    :mode="mode"
                                     :canEdit="getUnitCanEdit(col, row)"
                                     :parentData="listData"
                                     :formData="row"
                                     :formItem="col"
-                                    :isShare="isShare"
                                     :rowIndex="rowIndex"
                                     @blur="controlBlur(null, col, row, arguments)"
                                     @change="$dispatchEvent(operationMap.changeVal, col, row, rowIndex, arguments)"
@@ -184,11 +178,6 @@
             DshUnit
         },
         props: {
-            mode: {
-                type: String,
-                default: "default"
-            },
-
             canEdit: {
                 type: Boolean,
                 default: true
@@ -218,13 +207,18 @@
                 }
             },
 
-            propsObj: {
+            outObj: {
                 type: Object,
                 default () {
                     return {};
                 }
             },
-            isShare: Boolean
+            propsObj: {
+                type: Object,
+                default () {
+                    return {};
+                }
+            }
         },
         data () {
             return {
@@ -251,6 +245,7 @@
 
             selfPropsObj () {
                 return {
+                    isShare: false, // 是否是分享页在用
                     _contentHeight: 500,
                     _useSelection: false, // 使用选择列
                     _useIndex: true, // 使用序号列
@@ -262,6 +257,9 @@
                     ...this.propsObj
                 };
             },
+            isShare () {
+                return this.selfPropsObj.isShare;
+            },
             contentHeight () {
                 return this.selfPropsObj._contentHeight;
             },
@@ -283,10 +281,10 @@
             disabledOldDataRow () {
                 return this.selfPropsObj._disabledOldDataRow;
             },
-            useCampare () {
+
+            useCompare () {
                 return !!this.oldListData.length;
             },
-
             showColumns () {
                 const operationList = this.$getOperationList(["delete"]);
                 const showColumns = [
@@ -328,7 +326,7 @@
                             : []
                     ),
 
-                    ...this.columns.filter(colItem => colItem._displayType !== "hide"),
+                    ...this.columns.filter(colItem => colItem._displayType !== "hide" && this.$isAdvRelyShow(colItem, this.outObj)),
 
                     ...(
                         this.canEdit && operationList.length
@@ -501,7 +499,7 @@
                 (!col.dependRowCanEdit || row.canEdit !== false); // 在老数据行里某些列不可编辑
             },
             isShowCompare (col, row, oldRow = {}) {
-                return this.useCampare && ["number"].includes(col._type) &&
+                return this.useCompare && ["number"].includes(col._type) &&
                     !(this.$isEmptyData(row[col._key]) && this.$isEmptyData(oldRow[col._key])) &&
                     row[col._key] !== oldRow[col._key];
             },

package/src/components/list/ZTree.vue

@@ -9,7 +9,10 @@
         </div>
 
         <div class="ZTree-tree">
-            <Tree :data="treeData" :render="renderContent"></Tree>
+            <Tree
+                :data="treeData"
+                :render="renderContent"
+            ></Tree>
         </div>
 
         <!-- 添加节点弹窗 -->
@@ -38,7 +41,7 @@
 </template>
 
 <script>
-    import { resourceData } from "../../datas/index.js";
+    import { resourceData } from "bri-datas";
 
     const loop = (arr) => {
         return arr.map(item => {

package/src/components/unit/DshFormItem.vue

@@ -40,6 +40,10 @@
                                 <span class="DshFormItem-label-name-sign">！有更新</span>
                             </template>
                         </slot>
+                        <dsh-render
+                            v-if="formItem._tipsRender"
+                            :render="tipsRender(formItem,formData)"
+                        ></dsh-render>
                     </span>
                 </Ctooltip>
             </span>
@@ -77,7 +81,6 @@
                     ref="control"
                     :is="componentNameMap[formItem._type] || 'DshUndeveloped'"
                     :mode="mode"
-                    :isShare="isShare"
                     :canEdit="canEdit"
                     :value="formData"
                     :propsObj="formItem"
@@ -122,11 +125,12 @@
             },
 
             labelWidth: [String, Number],
-            formControlClass: String,
-            isShare: Boolean
+            formControlClass: String
         },
         data () {
-            return {};
+            return {
+                showTipModal: false
+            };
         },
         computed: {
             selfLabelStyle () {
@@ -151,6 +155,9 @@
 
             changeField (...params) {
                 this.$emit("changeField", ...params);
+            },
+            tipsRender (formItem, formData) {
+                return formItem._tipsRender.call(this, formItem, formData);
             }
         }
     };

package/src/components/unit/DshUnit.vue

@@ -17,7 +17,6 @@
             <component
                 :is="componentNameMap[formItem._type]"
                 :mode="mode"
-                :isShare="isShare"
                 :canEdit="canEdit"
                 :parentData="parentData"
                 :value="formData"
@@ -42,7 +41,6 @@
         props: {
             indexStr: String,
             rowIndex: Number,
-            isShare: Boolean,
             parentData: Array
         },
         data () {

package/src/index.js

@@ -1,4 +1,6 @@
-// 第三方
+import utilMap from "./utils/index.js";
+
+// 组件 -第三方
 import ViewUI from "view-design";
 import DshDraggable from "vuedraggable";
 import DshCropper from "vue-cropperjs";
@@ -146,7 +148,6 @@ const map = {
     DshFileShow
 };
 const install = function (Vue, opts = {}) {
-    const { globalMap } = opts;
     ViewUI.LoadingBar.config({
         color: "#2d8cf0",
         failedColor: "red",
@@ -154,6 +155,13 @@ const install = function (Vue, opts = {}) {
     });
     Vue.use(ViewUI);
 
+    // 挂载方法
+    Object.keys(utilMap).forEach(key => {
+        Vue.prototype[`$${key}`] = utilMap[key];
+    });
+
+    // 挂载组件
+    const { globalMap } = opts;
     const componentMap = {
         ...map,
         ...(globalMap || {})

package/src/utils/index.js

@@ -0,0 +1,5 @@
+import tableUtil from "./table.js";
+
+export default {
+    ...tableUtil
+};