system-clients 3.2.70 → 3.2.72-yc

package/src/plugins/validation.js

@@ -11,5 +11,5 @@ Vue.validator('chinesePassword', function (val) {
 });
 // 潜能要求8~16位数字字母组合；
 Vue.validator('numbersAndLetter8to16', function (val) {
-  return /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(val)
+  return /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?!.*(.)(\1)+)(?!.*(123|321|abc|cba))[a-zA-Z\d!@#$%^&*()_+-=<>?]{8,16}$/.test(val)
 });

package/src/project/ProjectPage.vue

@@ -1,24 +1,24 @@
-<template>
-  <div>
-    <route v-ref:route></route>
-  </div>
-</template>
-
-<script>
-import ProjectHome from './ProjectHome'
-import ProjectForm from './ProjectForm'
-import TaskForm from './TaskForm'
-import State from './State'
-
-export default {
-  data () {
-    return {
-      state: new State()
-    }
-  },
-  ready () {
-    this.$refs.route.route('项目管理', 'ProjectHome')
-  },
-  components: { ProjectHome, ProjectForm, TaskForm }
-}
-</script>
+<template>
+  <div>
+    <route v-ref:route></route>
+  </div>
+</template>
+
+<script>
+import ProjectHome from './ProjectHome'
+import ProjectForm from './ProjectForm'
+import TaskForm from './TaskForm'
+import State from './State'
+
+export default {
+  data () {
+    return {
+      state: new State()
+    }
+  },
+  ready () {
+    this.$refs.route.route('项目管理', 'ProjectHome')
+  },
+  components: { ProjectHome, ProjectForm, TaskForm }
+}
+</script>

package/src/project/State.js

@@ -1,17 +1,17 @@
-import { TreeList } from 'vue-client'
-
-export default class {
-  constructor () {
-    this.selected = null
-    // 左侧项目树
-    this.projects = new TreeList('/rs/sql/project.sql')
-  }
-
-  select (selected) {
-    this.selected = selected
-  }
-
-  getSelected () {
-    return this.selected
-  }
-}
+import { TreeList } from 'vue-client'
+
+export default class {
+  constructor () {
+    this.selected = null
+    // 左侧项目树
+    this.projects = new TreeList('/rs/sql/project.sql')
+  }
+
+  select (selected) {
+    this.selected = selected
+  }
+
+  getSelected () {
+    return this.selected
+  }
+}

package/src/stores/AppData.js

@@ -29,7 +29,7 @@ let GetAppDataService = {
   singleValues: {},
 
   getParam(key) {
-    return this.params[key]
+    return this.params[key] || []
   },
   getSingleValue(key) {
     return this.singleValues[key]

package/src/stores/HeatAppData.js

@@ -1,38 +1,38 @@
-import Vue from 'vue'
-
-let GetAppDataService = {
-  install(Vue, options) {
-    // 给vue增添对话框显示方法
-
-    Vue.$appdataHeat = Vue.prototype.$appdataHeat = GetAppDataService
-  },
-
-  // 开启卡监听
-  load () {
-    return Vue.resetpost('rs/heat/logic/getInitData', {data: {f_filialeids: Vue.$loginHeat.f.f_orgids}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-      res.data.singleValues.forEach((item) => {
-        this.singleValues[item.name] = item.value
-      })
-      res.data.params.forEach((item) => {
-        let value = []
-        item.f_paramvalues.forEach((item, index) => {
-          value[index] = {}
-          value[index].label = item.name
-          value[index].value = item.name
-        })
-        this.params[item.name] = value
-      })
-    })
-  },
-
-  params: {},
-  singleValues: {},
-
-  getParam(key) {
-    return this.params[key]
-  },
-  getSingleValue(key) {
-    return this.singleValues[key]
-  }
-}
-export default GetAppDataService
+import Vue from 'vue'
+
+let GetAppDataService = {
+  install(Vue, options) {
+    // 给vue增添对话框显示方法
+
+    Vue.$appdataHeat = Vue.prototype.$appdataHeat = GetAppDataService
+  },
+
+  // 开启卡监听
+  load () {
+    return Vue.resetpost('rs/heat/logic/getInitData', {data: {f_filialeids: Vue.$loginHeat.f.f_orgids}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+      res.data.singleValues.forEach((item) => {
+        this.singleValues[item.name] = item.value
+      })
+      res.data.params.forEach((item) => {
+        let value = []
+        item.f_paramvalues.forEach((item, index) => {
+          value[index] = {}
+          value[index].label = item.name
+          value[index].value = item.name
+        })
+        this.params[item.name] = value
+      })
+    })
+  },
+
+  params: {},
+  singleValues: {},
+
+  getParam(key) {
+    return this.params[key]
+  },
+  getSingleValue(key) {
+    return this.singleValues[key]
+  }
+}
+export default GetAppDataService