bri-components 1.0.1 → 1.0.3

package/package.json

@@ -1,121 +1,122 @@
 {
-    "name": "bri-components",
-    "version": "1.0.1",
-    "author": "dengshanghui",
-    "description": "a component lib for vue project",
-    "main": "lib/bri-components.min.js",
-    "keywords": [
-        "editor",
-        "tinymce"
-    ],
-    "files": [
-        "lib",
-        "src"
-    ],
-    "license": "ISC",
-    "directories": {
-        "test": "test"
-    },
-    "private": false,
-    "scripts": {
-        "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
-        "start": "npm run dev",
-        "unit": "jest --config test/unit/jest.conf.js --coverage",
-        "e2e": "node test/e2e/runner.js",
-        "test": "npm run unit && npm run e2e",
-        "lint": "eslint --fix --ext .js,.vue src example build config",
-        "build": "node build/build.js",
-        "lib:style": "gulp --gulpfile build/build-style.js",
-        "lib:dev": "webpack --config build/webpack.lib.dev.config.js",
-        "lib:prod": "webpack --config build/webpack.lib.prod.config.js"
-    },
-    "dependencies": {
-        "axios": "^0.23.0",
-        "jshint": "^2.12.0",
-        "minio": "^7.0.26",
-        "stream": "^0.0.2",
-        "view-design": "^4.6.0",
-        "viewerjs": "^1.10.2",
-        "vue-codemirror": "^4.0.6",
-        "vue-cropperjs": "^4.1.0",
-        "vuedraggable": "^2.24.1",
-        "wangeditor": "^4.7.5"
-    },
-    "devDependencies": {
-        "autoprefixer": "^7.1.2",
-        "babel-core": "^6.22.1",
-        "babel-eslint": "^8.2.1",
-        "babel-helper-vue-jsx-merge-props": "^2.0.3",
-        "babel-jest": "^21.0.2",
-        "babel-loader": "^7.1.1",
-        "babel-plugin-dynamic-import-node": "^1.2.0",
-        "babel-plugin-syntax-jsx": "^6.18.0",
-        "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
-        "babel-plugin-transform-runtime": "^6.22.0",
-        "babel-plugin-transform-vue-jsx": "^3.5.0",
-        "babel-preset-env": "^1.3.2",
-        "babel-preset-stage-2": "^6.22.0",
-        "babel-register": "^6.22.0",
-        "chalk": "^2.0.1",
-        "chromedriver": "^2.27.2",
-        "compression-webpack-plugin": "^1.1.12",
-        "copy-webpack-plugin": "^4.0.1",
-        "cross-spawn": "^5.0.1",
-        "css": "^3.0.0",
-        "css-loader": "^0.28.11",
-        "eslint": "^4.15.0",
-        "eslint-config-standard": "^10.2.1",
-        "eslint-friendly-formatter": "^3.0.0",
-        "eslint-loader": "^1.7.1",
-        "eslint-plugin-import": "^2.22.1",
-        "eslint-plugin-node": "^5.2.0",
-        "eslint-plugin-promise": "^3.4.0",
-        "eslint-plugin-standard": "^3.0.1",
-        "eslint-plugin-vue": "^4.0.0",
-        "extract-text-webpack-plugin": "^3.0.0",
-        "file-loader": "^1.1.4",
-        "friendly-errors-webpack-plugin": "^1.6.1",
-        "gulp": "^4.0.2",
-        "gulp-clean-css": "^4.3.0",
-        "gulp-less": "^5.0.0",
-        "gulp-rename": "^2.0.0",
-        "html-webpack-plugin": "^2.30.1",
-        "jest": "^22.0.4",
-        "jest-serializer-vue": "^0.3.0",
-        "less": "^3.13.1",
-        "less-loader": "^5.0.0",
-        "nightwatch": "^0.9.12",
-        "node-notifier": "^5.1.2",
-        "optimize-css-assets-webpack-plugin": "^3.2.0",
-        "ora": "^1.2.0",
-        "portfinder": "^1.0.13",
-        "postcss-import": "^11.0.0",
-        "postcss-loader": "^2.0.8",
-        "postcss-url": "^7.2.1",
-        "rimraf": "^2.6.0",
-        "selenium-server": "^3.0.1",
-        "semver": "^5.3.0",
-        "shelljs": "^0.7.6",
-        "uglifyjs-webpack-plugin": "^1.3.0",
-        "url-loader": "^0.5.8",
-        "vue": "^2.5.2",
-        "vue-jest": "^1.0.2",
-        "vue-loader": "^13.3.0",
-        "vue-router": "^3.0.1",
-        "vue-style-loader": "^3.0.1",
-        "vue-template-compiler": "^2.5.2",
-        "webpack": "^3.6.0",
-        "webpack-bundle-analyzer": "^2.9.0",
-        "webpack-dev-server": "^2.9.1",
-        "webpack-merge": "^4.1.0"
-    },
-    "engines": {
-        "node": ">= 6.0.0",
-        "npm": ">= 3.0.0"
-    },
-    "browserslist": [
-        "> 1%",
-        "last 2 versions",
-        "not ie <= 8"
-    ]
+  "name": "bri-components",
+  "version": "1.0.3",
+  "author": "dengshanghui",
+  "description": "a component lib for vue project",
+  "main": "src/index.js",
+  "keywords": [
+    "editor",
+    "tinymce"
+  ],
+  "files": [
+    "lib",
+    "src"
+  ],
+  "license": "ISC",
+  "directories": {
+    "test": "test"
+  },
+  "private": false,
+  "scripts": {
+    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
+    "start": "npm run dev",
+    "unit": "jest --config test/unit/jest.conf.js --coverage",
+    "e2e": "node test/e2e/runner.js",
+    "test": "npm run unit && npm run e2e",
+    "lint": "eslint --fix --ext .js,.vue src example build config",
+    "build": "node build/build.js",
+    "lib:style": "gulp --gulpfile build/build-style.js",
+    "lib:dev": "webpack --config build/webpack.lib.dev.config.js",
+    "lib:prod": "webpack --config build/webpack.lib.prod.config.js"
+  },
+  "dependencies": {
+    "axios": "^0.23.0",
+    "bri-datas": "^1.0.4",
+    "jshint": "^2.12.0",
+    "minio": "^7.0.26",
+    "stream": "^0.0.2",
+    "view-design": "^4.6.0",
+    "viewerjs": "^1.10.2",
+    "vue-codemirror": "^4.0.6",
+    "vue-cropperjs": "^4.1.0",
+    "vuedraggable": "^2.24.1",
+    "wangeditor": "^4.7.5"
+  },
+  "devDependencies": {
+    "autoprefixer": "^7.1.2",
+    "babel-core": "^6.22.1",
+    "babel-eslint": "^8.2.1",
+    "babel-helper-vue-jsx-merge-props": "^2.0.3",
+    "babel-jest": "^21.0.2",
+    "babel-loader": "^7.1.1",
+    "babel-plugin-dynamic-import-node": "^1.2.0",
+    "babel-plugin-syntax-jsx": "^6.18.0",
+    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
+    "babel-plugin-transform-runtime": "^6.22.0",
+    "babel-plugin-transform-vue-jsx": "^3.5.0",
+    "babel-preset-env": "^1.3.2",
+    "babel-preset-stage-2": "^6.22.0",
+    "babel-register": "^6.22.0",
+    "chalk": "^2.0.1",
+    "chromedriver": "^2.27.2",
+    "compression-webpack-plugin": "^1.1.12",
+    "copy-webpack-plugin": "^4.0.1",
+    "cross-spawn": "^5.0.1",
+    "css": "^3.0.0",
+    "css-loader": "^0.28.11",
+    "eslint": "^4.15.0",
+    "eslint-config-standard": "^10.2.1",
+    "eslint-friendly-formatter": "^3.0.0",
+    "eslint-loader": "^1.7.1",
+    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-node": "^5.2.0",
+    "eslint-plugin-promise": "^3.4.0",
+    "eslint-plugin-standard": "^3.0.1",
+    "eslint-plugin-vue": "^4.0.0",
+    "extract-text-webpack-plugin": "^3.0.0",
+    "file-loader": "^1.1.4",
+    "friendly-errors-webpack-plugin": "^1.6.1",
+    "gulp": "^4.0.2",
+    "gulp-clean-css": "^4.3.0",
+    "gulp-less": "^5.0.0",
+    "gulp-rename": "^2.0.0",
+    "html-webpack-plugin": "^2.30.1",
+    "jest": "^22.0.4",
+    "jest-serializer-vue": "^0.3.0",
+    "less": "^3.13.1",
+    "less-loader": "^5.0.0",
+    "nightwatch": "^0.9.12",
+    "node-notifier": "^5.1.2",
+    "optimize-css-assets-webpack-plugin": "^3.2.0",
+    "ora": "^1.2.0",
+    "portfinder": "^1.0.13",
+    "postcss-import": "^11.0.0",
+    "postcss-loader": "^2.0.8",
+    "postcss-url": "^7.2.1",
+    "rimraf": "^2.6.0",
+    "selenium-server": "^3.0.1",
+    "semver": "^5.3.0",
+    "shelljs": "^0.7.6",
+    "uglifyjs-webpack-plugin": "^1.3.0",
+    "url-loader": "^0.5.8",
+    "vue": "^2.5.2",
+    "vue-jest": "^1.0.2",
+    "vue-loader": "^13.3.0",
+    "vue-router": "^3.0.1",
+    "vue-style-loader": "^3.0.1",
+    "vue-template-compiler": "^2.5.2",
+    "webpack": "^3.6.0",
+    "webpack-bundle-analyzer": "^2.9.0",
+    "webpack-dev-server": "^2.9.1",
+    "webpack-merge": "^4.1.0"
+  },
+  "engines": {
+    "node": ">= 6.0.0",
+    "npm": ">= 3.0.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 8"
+  ]
 }

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/form/DshForm.vue

@@ -235,31 +235,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/DshFlatTable.vue

@@ -218,6 +218,12 @@
                 }
             },
 
+            outObj: {
+                type: Object,
+                default () {
+                    return {};
+                }
+            },
             propsObj: {
                 type: Object,
                 default () {
@@ -328,7 +334,7 @@
                             : []
                     ),
 
-                    ...this.columns.filter(colItem => colItem._displayType !== "hide"),
+                    ...this.columns.filter(colItem => colItem._displayType !== "hide" && this.$isAdvRelyShow(colItem, this.outObj)),
 
                     ...(
                         this.canEdit && operationList.length

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 => {