system-clients 3.2.79 → 3.2.81

package/package.json

@@ -1,105 +1,105 @@
-{
-  "name": "system-clients",
-  "version": "3.2.79",
-  "description": "系统基础框架",
-  "main": "src/index.js",
-  "directories": {
-    "doc": "doc",
-    "example": "examples",
-    "test": "test"
-  },
-  "scripts": {
-    "example": "node build/example-server.js",
-    "dev": "node build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "e2e": "node test/e2e/runner.js",
-    "unit": "karma start test/unit/karma.conf.js",
-    "makeall": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_OPTIONS=--max_old_space_size=4096 NODE_ENV=production webpack --progress --hide-modules --config build/webpack.example.conf.js",
-    "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
-  },
-  "dependencies": {
-    "base64-js": "^1.3.0",
-    "js-base64": "^2.4.9",
-    "less": "^2.7.1",
-    "less-loader": "^2.2.3",
-    "nyc": "^15.1.0",
-    "src": "^1.1.2",
-    "vue": "^1.0.17"
-  },
-  "devDependencies": {
-    "babel-core": "^6.0.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "eslint": "^2.0.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-friendly-formatter": "^1.2.2",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
-    "eslint-plugin-vue": "^0.1.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.13.3",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "jasmine-core": "^2.4.1",
-    "jquery": "^3.3.1",
-    "jsencrypt": "^3.0.0-rc.1",
-    "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "manage-client": "^1.4.20",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "ncp": "^2.0.0",
-    "nightwatch": "^0.8.18",
-    "rimraf": "^2.5.0",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.24.107-test",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "2.1.7",
-    "webpack": "^1.12.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aotu/System"
-  },
-  "keywords": [
-    "system_clients"
-  ],
-  "author": "杨文宇",
-  "license": "ISC"
-}
+{
+  "name": "system-clients",
+  "version": "3.2.81",
+  "description": "系统基础框架",
+  "main": "src/index.js",
+  "directories": {
+    "doc": "doc",
+    "example": "examples",
+    "test": "test"
+  },
+  "scripts": {
+    "example": "node build/example-server.js",
+    "dev": "node build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "e2e": "node test/e2e/runner.js",
+    "unit": "karma start test/unit/karma.conf.js",
+    "makeall": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_OPTIONS=--max_old_space_size=4096 NODE_ENV=production webpack --progress --hide-modules --config build/webpack.example.conf.js",
+    "release": "npm set registry http://registry.npmjs.org && npm publish && npm set registry http://registry.npm.taobao.org"
+  },
+  "dependencies": {
+    "base64-js": "^1.3.0",
+    "js-base64": "^2.4.9",
+    "less": "^2.7.1",
+    "less-loader": "^2.2.3",
+    "nyc": "^15.1.0",
+    "src": "^1.1.2",
+    "vue": "^1.0.17"
+  },
+  "devDependencies": {
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "eslint": "^2.0.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-friendly-formatter": "^1.2.2",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-vue": "^0.1.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.13.3",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.8.4",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "jsencrypt": "^3.0.0-rc.1",
+    "json-loader": "^0.5.4",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "manage-client": "^1.4.20",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "ncp": "^2.0.0",
+    "nightwatch": "^0.8.18",
+    "rimraf": "^2.5.0",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.24.107-test",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "^8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "2.1.7",
+    "webpack": "^1.12.2",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aotu/System"
+  },
+  "keywords": [
+    "system_clients"
+  ],
+  "author": "杨文宇",
+  "license": "ISC"
+}

package/src/components/server/Login.vue

@@ -205,7 +205,7 @@ let saveGen = function *(self) {
     console.log(self.$login.depPrompt)
     // 弱口令验证
     //跳转过来的不进行验证
-    if ((!self.otherLogin) && self.config.weakPassword && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
+    if ((!self.otherLogin) && self.config.weakPassword && !(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(self.model.password))) {
       self.$showMessage('登录系统: 此账户的密码过于简单，请修改密码后重新登陆！！！', ['confirm']).then((res) => {
         self.modifyPwShow = true
       })

package/src/components/server/ModifyPw.vue

@@ -25,7 +25,7 @@
               <input type="password" v-model="deliver.newpassword" class="form-control" id="newpassword" v-validate:newpassword='{required:true, numbersAndLetter8to16: true, minlength: 6,chinesePassword: true}'>
               <span class="glyphicon glyphicon-ok form-control-feedback" v-if="!$v.newpassword.required && !$v.newpassword.minlength && !($v.newpassword.numbersAndLetter8to16 && !($v.newpassword.required)) && !($v.newpassword.chinesePassword) "></span>
               <span v-if="$v.newpassword.required">不能为空</span>
-              <span v-if="($v.newpassword.numbersAndLetter8to16||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码必须是8~16位数字与字母组合,且至少包含一个大写字母，小写字母，数字</span>
+              <span v-if="($v.newpassword.numbersAndLetter8to16||$v.newpassword.minlength) && !($v.newpassword.required&&$v.newpassword.minlength)">密码必须是8~16位数字与大小字母外加特殊字符的组合，并且不能出现类似'123','abc'等连贯数字或者字母</span>
               <span v-if="$v.newpassword.chinesePassword">密码不能包含中文</span>
             </div>
           </div>

package/src/components/server/ResSelectGroup.vue

@@ -1,204 +1,204 @@
-<template>
-  <div :class="style" v-show="companyshow">
-    <label class="font_normal_body">公&emsp;&emsp;司</label>
-    <right-tree @re-res="getorg"
-                :mustselect="mustselect"
-                :initresid='initres.org'></right-tree>
-  </div>
-  <div :class="style" v-show="departmentshow">
-    <label class="font_normal_body">部&emsp;&emsp;门</label>
-    <res-select restype='department' v-ref:department
-                @res-select="getdep"
-                :parentresid="depresid"
-                :specialquery="specialquery"
-                :initresid='initres.dep'
-                :mustselect="mustselect"
-                :is-mul="mul">
-    </res-select>
-  </div>
-  <div :class="style" v-show="operatorshow && (!cascade)">
-    <label class="font_normal_body">人&emsp;&emsp;员</label>
-    <res-select restype='user'
-                @res-select="getuser"
-                :parentresid="depresid"
-                :initresid='initres.user'
-                :mustselect="mustselect"
-                :is-mul="mul">
-    </res-select>
-  </div>
-  <div :class="style" v-show="operatorshow && cascade">
-    <label class="font_normal_body">人&emsp;&emsp;员</label>
-    <res-select restype='user'
-                @res-select="getuser"
-                :parentresid="userresid"
-                :initresid='initres.user'
-                :mustselect="mustselect"
-                :is-mul="mul">
-    </res-select>
-  </div>
-  <div :class="style " v-if="sliceareashow" >
-    <label class="font_normal_body">片&emsp;&emsp;区</label>
-    <v-select :value.sync="slice_area" v-model="slice_area"  @change='getarea'
-              :options='sliceArea' placeholder='片区/管理站' filer-key="name"
-              close-on-select v-ref:slice>
-    </v-select>
-  </div>
-</template>
-<script>
-import plugin from '../../plugins/GetLoginInfoService'
-import { HttpResetClass } from 'vue-client'
-export default {
-  title: '资源选择测试',
-  props: {
-    style: {
-      type: String,
-      default: 'col-sm-2 form-group'
-    },
-    mul: {
-      type: Boolean,
-      default: true
-    },
-    //是否只查询营业厅
-    specialquery: {
-      type: Boolean,
-      default: false
-    },
-    //初始值
-    initres: {
-      type: Object,
-      default: null,
-    },
-    showComponent:{
-      default:['company','department','operator','slicearea']
-    },
-    //人员是否和部门关联
-    cascade: {
-      type: Boolean,
-      default: true
-    },
-    selectin: {
-      type: Boolean,
-      default: true
-    }
-  },
-  data () {
-    return {
-      orgresid:[this.$login.f.orgid],
-      depresid:[],
-      userresid:[],
-      operatorsid: [],
-      sliceArea: [],
-      slice_area:[],
-      companyshow:false,
-      departmentshow:false,
-      operatorshow:false,
-      sliceareashow:false,
-      mustselect:false,
-      obj:{
-        orgnames:[],
-        depnames:[],
-        operatornames:[]
-      }
-    }
-  },
-  ready () {
-    if(this.$login.r.includes('部门默认选中')&& this.selectin){
-      this.initres.dep = [this.$login.f.depids]
-    }
-    if(this.$login.r.includes('人员默认选中')&& this.selectin){
-      this.initres.user = [this.$login.f.id]
-      if(this.$login.r.includes('人员强制选中')){
-        this.mustselect = true
-      }
-    }
-    this.initComponent();
-    this.initAreas(this.$login.f.orgid)
-  },
-  methods:{
-    initComponent(){
-      let self=this;
-      this.showComponent.find((item)=>{
-        switch(item){
-          case 'company': self.companyshow=true; break;
-          case 'department': self.departmentshow=true; break;
-          case 'operator': self.operatorshow=true; break;
-          case 'slicearea': self.sliceareashow=true; break;
-        }
-      })
-    },
-    // 初始化片区
-    async initAreas (val) {
-      if (val) {
-        let http = new HttpResetClass()
-        let getAllArea = await http.load('POST', '/rs/search', {
-          source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
-          userid: this.$login.f.id
-        }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
-        let arr = getAllArea.data.filter((res) => {
-          return res.parentid == val
-        })
-        this.sliceArea = []
-        this.slice_area = []
-        arr.forEach((res) => {
-          this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
-        })
-      }
-    },
-    returnOrg(ids){
-      let limit = this.$login.r.includes('数据授权限定')
-
-      let condition;
-      if(this.depresid.length > 0)
-        condition = " and f_orgid in " + plugin.convertToIn(this.depresid);
-      else
-        condition = " and f_orgid = " + this.$login.f.orgid;
-      if(this.userresid.length > 0){
-        condition += " and f_depid in " + plugin.convertToIn(this.userresid);
-      } else {
-        if (limit) {
-          let depids = []
-          for (let row of this.$refs.department.resoptions) {
-            depids.push(row.value)
-          }
-          let depid = depids.length ? plugin.convertToIn(depids) : ('')
-          condition += " and f_depid in " + depid;
-        }
-      }
-      if(ids && ids.length > 0){
-        condition += " and f_operatorid in " + plugin.convertToIn(ids);
-      }
-      if(this.slice_area.length>0){
-        condition += " and f_zones = '" + this.slice_area[0].name+"'"
-      }
-      this.$dispatch('re-res',condition,this.obj)
-    },
-    getorg (obj) {
-      this.depresid=obj.resids
-      this.obj.orgnames = obj.res
-      this.initAreas(obj.resids)
-      this.returnOrg();
-    },
-    getdep(obj,val) {
-      this.obj.depnames = val
-      this.userresid=obj
-      this.returnOrg();
-    },
-    getuser(obj,val) {
-      this.obj.operatornames = val
-      this.operatorsid = obj
-      this.returnOrg(obj);
-    },
-    getarea(val) {
-      this.slice_area=val
-      if(this.operatorsid){
-        this.returnOrg(this.operatorsid);
-      }else{
-        this.returnOrg();
-      }
-    }
-  },
-  watch: {
-
-  }
-}
-</script>
+<template>
+  <div :class="style" v-show="companyshow">
+    <label class="font_normal_body">公&emsp;&emsp;司</label>
+    <right-tree @re-res="getorg"
+                :mustselect="mustselect"
+                :initresid='initres.org'></right-tree>
+  </div>
+  <div :class="style" v-show="departmentshow">
+    <label class="font_normal_body">部&emsp;&emsp;门</label>
+    <res-select restype='department' v-ref:department
+                @res-select="getdep"
+                :parentresid="depresid"
+                :specialquery="specialquery"
+                :initresid='initres.dep'
+                :mustselect="mustselect"
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style" v-show="operatorshow && (!cascade)">
+    <label class="font_normal_body">人&emsp;&emsp;员</label>
+    <res-select restype='user'
+                @res-select="getuser"
+                :parentresid="depresid"
+                :initresid='initres.user'
+                :mustselect="mustselect"
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style" v-show="operatorshow && cascade">
+    <label class="font_normal_body">人&emsp;&emsp;员</label>
+    <res-select restype='user'
+                @res-select="getuser"
+                :parentresid="userresid"
+                :initresid='initres.user'
+                :mustselect="mustselect"
+                :is-mul="mul">
+    </res-select>
+  </div>
+  <div :class="style " v-if="sliceareashow" >
+    <label class="font_normal_body">片&emsp;&emsp;区</label>
+    <v-select :value.sync="slice_area" v-model="slice_area"  @change='getarea'
+              :options='sliceArea' placeholder='片区/管理站' filer-key="name"
+              close-on-select v-ref:slice>
+    </v-select>
+  </div>
+</template>
+<script>
+import plugin from '../../plugins/GetLoginInfoService'
+import { HttpResetClass } from 'vue-client'
+export default {
+  title: '资源选择测试',
+  props: {
+    style: {
+      type: String,
+      default: 'col-sm-2 form-group'
+    },
+    mul: {
+      type: Boolean,
+      default: true
+    },
+    //是否只查询营业厅
+    specialquery: {
+      type: Boolean,
+      default: false
+    },
+    //初始值
+    initres: {
+      type: Object,
+      default: null,
+    },
+    showComponent:{
+      default:['company','department','operator','slicearea']
+    },
+    //人员是否和部门关联
+    cascade: {
+      type: Boolean,
+      default: true
+    },
+    selectin: {
+      type: Boolean,
+      default: true
+    }
+  },
+  data () {
+    return {
+      orgresid:[this.$login.f.orgid],
+      depresid:[],
+      userresid:[],
+      operatorsid: [],
+      sliceArea: [],
+      slice_area:[],
+      companyshow:false,
+      departmentshow:false,
+      operatorshow:false,
+      sliceareashow:false,
+      mustselect:false,
+      obj:{
+        orgnames:[],
+        depnames:[],
+        operatornames:[]
+      }
+    }
+  },
+  ready () {
+    if(this.$login.r.includes('部门默认选中')&& this.selectin){
+      this.initres.dep = [this.$login.f.depids]
+    }
+    if(this.$login.r.includes('人员默认选中')&& this.selectin){
+      this.initres.user = [this.$login.f.id]
+      if(this.$login.r.includes('人员强制选中')){
+        this.mustselect = true
+      }
+    }
+    this.initComponent();
+    this.initAreas(this.$login.f.orgid)
+  },
+  methods:{
+    initComponent(){
+      let self=this;
+      this.showComponent.find((item)=>{
+        switch(item){
+          case 'company': self.companyshow=true; break;
+          case 'department': self.departmentshow=true; break;
+          case 'operator': self.operatorshow=true; break;
+          case 'slicearea': self.sliceareashow=true; break;
+        }
+      })
+    },
+    // 初始化片区
+    async initAreas (val) {
+      if (val) {
+        let http = new HttpResetClass()
+        let getAllArea = await http.load('POST', '/rs/search', {
+          source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
+          userid: this.$login.f.id
+        }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
+        let arr = getAllArea.data.filter((res) => {
+          return res.parentid == val
+        })
+        this.sliceArea = []
+        this.slice_area = []
+        arr.forEach((res) => {
+          this.sliceArea.push({label: res.name, value: {name: res.name, code:res.number}})
+        })
+      }
+    },
+    returnOrg(ids){
+      let limit = this.$login.r.includes('数据授权限定')
+
+      let condition;
+      if(this.depresid.length > 0)
+        condition = " and f_orgid in " + plugin.convertToIn(this.depresid);
+      else
+        condition = " and f_orgid = " + this.$login.f.orgid;
+      if(this.userresid.length > 0){
+        condition += " and f_depid in " + plugin.convertToIn(this.userresid);
+      } else {
+        if (limit) {
+          let depids = []
+          for (let row of this.$refs.department.resoptions) {
+            depids.push(row.value)
+          }
+          let depid = depids.length ? plugin.convertToIn(depids) : ('')
+          condition += " and f_depid in " + depid;
+        }
+      }
+      if(ids && ids.length > 0){
+        condition += " and f_operatorid in " + plugin.convertToIn(ids);
+      }
+      if(this.slice_area.length>0){
+        condition += " and f_zones = '" + this.slice_area[0].name+"'"
+      }
+      this.$dispatch('re-res',condition,this.obj)
+    },
+    getorg (obj) {
+      this.depresid=obj.resids
+      this.obj.orgnames = obj.res
+      this.initAreas(obj.resids)
+      this.returnOrg();
+    },
+    getdep(obj,val) {
+      this.obj.depnames = val
+      this.userresid=obj
+      this.returnOrg();
+    },
+    getuser(obj,val) {
+      this.obj.operatornames = val
+      this.operatorsid = obj
+      this.returnOrg(obj);
+    },
+    getarea(val) {
+      this.slice_area=val
+      if(this.operatorsid){
+        this.returnOrg(this.operatorsid);
+      }else{
+        this.returnOrg();
+      }
+    }
+  },
+  watch: {
+
+  }
+}
+</script>

package/src/filiale/konggang/system.js

@@ -2,6 +2,6 @@
 
 let specialComp = {
   // 潜能密码改下
-  'login': (resolve) => { require(['./login.vue'], resolve) }
+  'login': (resolve) => { require(['./Login.vue'], resolve) }
 }
 exports.specialComp = specialComp

package/src/filiale/tongchuan/system.js

@@ -2,6 +2,6 @@
 
 let specialComp = {
   'home-page': (resolve) => {require(['./Main'], resolve) },
-  'login': (resolve) => { require(['./login.vue'], resolve) }
+  'login': (resolve) => { require(['./Login.vue'], resolve) }
 }
 exports.specialComp = specialComp