Browse Source

formtter code

shaun-sheep 5 years ago
parent
commit
7c10609a0f
4 changed files with 251 additions and 250 deletions
  1. 97 97
      package.json
  2. 25 25
      publish.js
  3. 129 124
      src/framework/layout/layout-store.js
  4. 0 4
      src/views/relation/data/index.vue

+ 97 - 97
package.json

@@ -1,99 +1,99 @@
 {
-    "name": "sagacloud-admin",
-    "version": "1.0.0",
-    "description": "A Vue.js project",
-    "author": "yaoll <yaolinlin@sagacloud.cn>",
-    "private": true,
-    "remote": {
-        "host": "192.168.20.236",
-        "path": "/opt/nginx/ibms/dist",
-        "user": "root",
-        "password": "saga",
-        "local": "dist"
-    },
-    "scripts": {
-        "i": "npm install",
-        "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
-        "start": "npm run dev",
-        "build": "node build/build.js",
-        "publish": "node publish.js"
-    },
-    "dependencies": {
-        "@sybotan-web/base": "2.1.5",
-        "@sybotan-web/draw": "2.1.56",
-        "@sybotan-web/graphy": "2.1.27",
-        "axios": "^0.18.0",
-        "echarts": "^4.1.0",
-        "element-ui": "^2.11.0",
-        "font-awesome": "^4.7.0",
-        "handsontable-pro": "^3.0.0",
-        "jquery": "^3.3.1",
-        "vue": "^2.5.2",
-        "vue-axios": "^2.1.4",
-        "vue-router": "^3.0.1",
-        "vuex": "^3.1.0",
-        "cad-engine": "2.0.250",
-        "@saga-web/base": "2.1.9",
-        "@saga-web/draw": "2.1.61",
-        "@saga-web/graphy": "2.1.34",
-        "@saga-web/cad-engine": "2.0.432"
-    },
-    "devDependencies": {
-        "ajv": "^6.9.1",
-        "autoprefixer": "^7.1.2",
-        "babel-core": "^6.22.1",
-        "babel-helper-vue-jsx-merge-props": "^2.0.3",
-        "babel-loader": "^7.1.1",
-        "babel-plugin-syntax-jsx": "^6.18.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",
-        "chalk": "^2.0.1",
-        "copy-webpack-plugin": "^4.0.1",
-        "css-loader": "^0.28.0",
-        "extract-text-webpack-plugin": "^3.0.0",
-        "file-loader": "^1.1.4",
-        "file-saver": "^2.0.2",
-        "friendly-errors-webpack-plugin": "^1.6.1",
-        "html-webpack-plugin": "^2.30.1",
-        "less": "^3.9.0",
-        "less-loader": "^4.1.0",
-        "node-notifier": "^5.1.2",
-        "node-sass": "^4.11.0",
-        "node-ssh": "^6.0.0",
-        "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",
-        "sass-loader": "^7.1.0",
-        "semver": "^5.3.0",
-        "shelljs": "^0.7.6",
-        "spark-md5": "^3.0.0",
-        "stompjs": "^2.3.3",
-        "swiper": "^4.0.0",
-        "uglifyjs-webpack-plugin": "^1.1.1",
-        "url-loader": "^0.5.8",
-        "vue-loader": "^13.3.0",
-        "vue-simple-uploader": "^0.7.2",
-        "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",
-        "xlsx": "^0.15.1"
-    },
-    "engines": {
-        "node": ">= 6.0.0",
-        "npm": ">= 3.0.0"
-    },
-    "browserslist": [
-        "> 1%",
-        "last 2 versions",
-        "not ie <= 8"
-    ]
+  "name": "sagacloud-admin",
+  "version": "1.0.0",
+  "description": "A Vue.js project",
+  "author": "yaoll <yaolinlin@sagacloud.cn>",
+  "private": true,
+  "remote": {
+    "host": "192.168.20.236",
+    "path": "/opt/nginx/ibms/dist",
+    "user": "root",
+    "password": "saga",
+    "local": "dist"
+  },
+  "scripts": {
+    "i": "npm install",
+    "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
+    "start": "npm run dev",
+    "build": "node build/build.js",
+    "publish": "node publish.js"
+  },
+  "dependencies": {
+    "@sybotan-web/base": "2.1.5",
+    "@sybotan-web/draw": "2.1.56",
+    "@sybotan-web/graphy": "2.1.27",
+    "axios": "^0.18.0",
+    "echarts": "^4.1.0",
+    "element-ui": "^2.11.0",
+    "font-awesome": "^4.7.0",
+    "handsontable-pro": "^3.0.0",
+    "jquery": "^3.3.1",
+    "vue": "^2.5.2",
+    "vue-axios": "^2.1.4",
+    "vue-router": "^3.0.1",
+    "vuex": "^3.1.0",
+    "cad-engine": "2.0.250",
+    "@saga-web/base": "2.1.9",
+    "@saga-web/draw": "2.1.61",
+    "@saga-web/graphy": "2.1.34",
+    "@saga-web/cad-engine": "2.0.432"
+  },
+  "devDependencies": {
+    "ajv": "^6.9.1",
+    "autoprefixer": "^7.1.2",
+    "babel-core": "^6.22.1",
+    "babel-helper-vue-jsx-merge-props": "^2.0.3",
+    "babel-loader": "^7.1.1",
+    "babel-plugin-syntax-jsx": "^6.18.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",
+    "chalk": "^2.0.1",
+    "copy-webpack-plugin": "^4.0.1",
+    "css-loader": "^0.28.0",
+    "extract-text-webpack-plugin": "^3.0.0",
+    "file-loader": "^1.1.4",
+    "file-saver": "^2.0.2",
+    "friendly-errors-webpack-plugin": "^1.6.1",
+    "html-webpack-plugin": "^2.30.1",
+    "less": "^3.9.0",
+    "less-loader": "^4.1.0",
+    "node-notifier": "^5.1.2",
+    "node-sass": "^4.11.0",
+    "node-ssh": "^6.0.0",
+    "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",
+    "sass-loader": "^7.1.0",
+    "semver": "^5.3.0",
+    "shelljs": "^0.7.6",
+    "spark-md5": "^3.0.0",
+    "stompjs": "^2.3.3",
+    "swiper": "^4.0.0",
+    "uglifyjs-webpack-plugin": "^1.1.1",
+    "url-loader": "^0.5.8",
+    "vue-loader": "^13.3.0",
+    "vue-simple-uploader": "^0.7.2",
+    "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",
+    "xlsx": "^0.15.1"
+  },
+  "engines": {
+    "node": ">= 6.0.0",
+    "npm": ">= 3.0.0"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not ie <= 8"
+  ]
 }

+ 25 - 25
publish.js

@@ -9,31 +9,31 @@ const Client = require("node-ssh");
 const ssh = new Client();
 
 ssh.connect({
-    host: process.env.npm_package_remote_host,
-    port: "22",
-    username: process.env.npm_package_remote_user,
-    password: process.env.npm_package_remote_password
+  host: process.env.npm_package_remote_host,
+  port: "22",
+  username: process.env.npm_package_remote_user,
+  password: process.env.npm_package_remote_password
 }).then(() => {
-    const failedList = [];
-    ssh.putDirectory(
-        process.env.npm_package_remote_local,
-        process.env.npm_package_remote_path,
-        {
-            recursive: true,
-            concurrency: 1,
-            tick: function(localPath, remotePath, error) {
-                if (error) {
-                    failedList.push(localPath);
-                }
-            }
+  const failedList = [];
+  ssh.putDirectory(
+    process.env.npm_package_remote_local,
+    process.env.npm_package_remote_path,
+    {
+      recursive: true,
+      concurrency: 1,
+      tick: function(localPath, remotePath, error) {
+        if (error) {
+          failedList.push(localPath);
         }
-    ).then(status => {
-        if (failedList.length > 0) {
-            console.log("发布失败");
-            console.log("failed transfers", failedList.join(", "));
-        } else {
-            console.log(status ? "发布成功" : "发布失败");
-        }
-        ssh.dispose();
-    });
+      }
+    }
+  ).then(status => {
+    if (failedList.length > 0) {
+      console.log("发布失败");
+      console.log("failed transfers", failedList.join(", "));
+    } else {
+      console.log(status ? "发布成功" : "发布失败");
+    }
+    ssh.dispose();
+  });
 });

+ 129 - 124
src/framework/layout/layout-store.js

@@ -7,140 +7,145 @@ const KEY_PROJECT_SELECTED = 'global_project_selected'
 const KEY_PAGE_BRANDCRUMB = 'page_brandcrumb'
 
 export default {
-    namespaced: true,
+  namespaced: true,
     state: {
-        sidebarClosed: false,
-        sidebarSelected: '', // sidebar选中的选项
-        userInfo: null, //{ username: 'admin' },
-        permissions: { "system:role:delete": true, "system:role:create": true, "system:role:query": true, "system:role:setOpts": true },
-        projectId: '',
-        projects: [],
-        breadcrumb: [],
-        uploaderList: [], //当前上传文件列表
-        secret: "", //项目密码
-        userId: "", //用户id
-        rowEdit: false,//表格数据变化
+      sidebarClosed: false,
+      sidebarSelected: '', // sidebar选中的选项
+      userInfo: null, //{ username: 'admin' },
+      permissions: {
+        "system:role:delete": true,
+        "system:role:create": true,
+        "system:role:query": true,
+        "system:role:setOpts": true
+      },
+      projectId: '',
+      projects: [],
+      breadcrumb: [],
+      uploaderList: [], //当前上传文件列表
+      secret: "", //项目密码
+      userId: "", //用户id
+      rowEdit: false,//表格数据变化
     },
     getters: {
-        sidebarClosed: state => state.sidebarClosed,
-        secret: state => state.secret,
-        userId: state => state.userId,
-        sidebarSelected: state => {
-            // if (!state.pageSidebarSelected) {
-            //     let menu = storage.get(KEY_MENU_SELECTED)
-            //     if (menu) {
-            //         state.pageSidebarSelected = menu
-            //     }
-            // }
-            // return state.pageSidebarSelected
-            return state.sidebarSelected
-        },
-        userInfo: state => state.userInfo,
-        permissions: state => state.permissions,
-        projects: state => state.projects,
-        uploaderList: state => state.uploaderList,
-        projectId: state => {
-            if (!state.projectId) {
-                let pid = storage.get(KEY_PROJECT_SELECTED)
-                if (pid) {
-                    state.projectId = pid
-                }
-            }
-            return state.projectId
-        },
-        breadcrumb: state => {
-            if (!state.breadcrumb) {
-                let arr = storage.get(KEY_PAGE_BRANDCRUMB)
-                if (arr) {
-                    state.breadcrumb = arr
-                }
-            }
-            return state.breadcrumb
+      sidebarClosed: state => state.sidebarClosed,
+      secret: state => state.secret,
+      userId: state => state.userId,
+      sidebarSelected: state => {
+        // if (!state.pageSidebarSelected) {
+        //     let menu = storage.get(KEY_MENU_SELECTED)
+        //     if (menu) {
+        //         state.pageSidebarSelected = menu
+        //     }
+        // }
+        // return state.pageSidebarSelected
+        return state.sidebarSelected
+      },
+      userInfo: state => state.userInfo,
+      permissions: state => state.permissions,
+      projects: state => state.projects,
+      uploaderList: state => state.uploaderList,
+      projectId: state => {
+        if (!state.projectId) {
+          let pid = storage.get(KEY_PROJECT_SELECTED)
+          if (pid) {
+            state.projectId = pid
+          }
+        }
+        return state.projectId
+      },
+      breadcrumb: state => {
+        if (!state.breadcrumb) {
+          let arr = storage.get(KEY_PAGE_BRANDCRUMB)
+          if (arr) {
+            state.breadcrumb = arr
+          }
         }
+        return state.breadcrumb
+      }
     },
     mutations: {
-        setRowEdit: (state, val) => (state.rowEdit = val),
-        setSidebarClosed: (state, val) => (state.sidebarClosed = val),
-        setSidebarSelected: (state, val) => {
-            state.sidebarSelected = val
-            storage.set(KEY_MENU_SELECTED, val)
-            lStorage.set('screen_data', { path: val, data: {} })
-        },
-        setprojectId: (state, val) => {
-            let cacheInfo = lStorage.get('cacheInfo') ? lStorage.get('cacheInfo') : {}
-            state.projectId = val
-            localStorage.setItem('projectId', val)
-            if (cacheInfo[state.userInfo.userName]) {
-                cacheInfo[state.userInfo.userName].projectId = val
-                lStorage.set('cacheInfo', cacheInfo)
-            } else {
-                cacheInfo[state.userInfo.userName] = { projectId: val }
-                lStorage.set('cacheInfo', cacheInfo)
-            }
-            storage.set(KEY_PROJECT_SELECTED, val)
-            state.projects.map((item) => {
-                if (item.id == val) {
-                    state.secret = item.pwd
-                    localStorage.setItem('secret', item.pwd)
-                }
-            })
-        },
-        setUploaderList: (state, val) => {
-            state.uploaderList = val?val:[]
-        },
+      setRowEdit: (state, val) => (state.rowEdit = val),
+      setSidebarClosed: (state, val) => (state.sidebarClosed = val),
+      setSidebarSelected: (state, val) => {
+        state.sidebarSelected = val
+        storage.set(KEY_MENU_SELECTED, val)
+        lStorage.set('screen_data', {path: val, data: {}})
+      },
+      setprojectId: (state, val) => {
+        let cacheInfo = lStorage.get('cacheInfo') ? lStorage.get('cacheInfo') : {}
+        state.projectId = val
+        localStorage.setItem('projectId', val)
+        if (cacheInfo[state.userInfo.userName]) {
+          cacheInfo[state.userInfo.userName].projectId = val
+          lStorage.set('cacheInfo', cacheInfo)
+        } else {
+          cacheInfo[state.userInfo.userName] = {projectId: val}
+          lStorage.set('cacheInfo', cacheInfo)
+        }
+        storage.set(KEY_PROJECT_SELECTED, val)
+        state.projects.map((item) => {
+          if (item.id == val) {
+            state.secret = item.pwd
+            localStorage.setItem('secret', item.pwd)
+          }
+        })
+      },
+      setUploaderList: (state, val) => {
+        state.uploaderList = val ? val : []
+      },
 
     },
-    actions: {
-        setRowEdit(contentx, value) {
-            contentx.commit('setRowEdit', value)
-        },
-        loadUserInfo({ state }) {
-            console.log(state)
-            return new Promise((resolve, reject) => {
-                frameworkApi.loadUserInfo().then(resp => {
-                    console.log(resp)
-                    if (resp.Result == 'success') {
-                        state.userInfo = { userName: resp.Username, userId: resp.UserId }
-                        state.userId = resp.UserId
-                        storage.set('user_name', resp.Username)
-                        storage.set('user_id', resp.UserId)
-                        state.permissions = {}
-                        if (resp.Permissions) {
-                            resp.Permissions.forEach(p => (state.permissions[p] = true))
-                        }
-                        state.projects = []
-                        if (resp.Projects) {
-                            if (resp.Projects[0] && resp.Projects[0].ProjId) {
-                                state.projectId = resp.Projects[0].ProjId
-                                state.secret = resp.Projects[0].Secret ? resp.Projects[0].Secret : ""
-                            }
-                            resp.Projects.forEach(proj =>
-                                state.projects.push({
-                                    id: proj.ProjId,
-                                    name: proj.ProjLocalName,
-                                    pwd: proj.Secret ? proj.Secret : ""
-                                })
-                            )
-                        }
-                    } else {
-                        state.userInfo = null
-
-                    }
-                    resolve(resp)
+  actions: {
+    setRowEdit(contentx, value) {
+      contentx.commit('setRowEdit', value)
+    },
+    loadUserInfo({state}) {
+      console.log(state)
+      return new Promise((resolve, reject) => {
+        frameworkApi.loadUserInfo().then(resp => {
+          console.log(resp)
+          if (resp.Result == 'success') {
+            state.userInfo = {userName: resp.Username, userId: resp.UserId}
+            state.userId = resp.UserId
+            storage.set('user_name', resp.Username)
+            storage.set('user_id', resp.UserId)
+            state.permissions = {}
+            if (resp.Permissions) {
+              resp.Permissions.forEach(p => (state.permissions[p] = true))
+            }
+            state.projects = []
+            if (resp.Projects) {
+              if (resp.Projects[0] && resp.Projects[0].ProjId) {
+                state.projectId = resp.Projects[0].ProjId
+                state.secret = resp.Projects[0].Secret ? resp.Projects[0].Secret : ""
+              }
+              resp.Projects.forEach(proj =>
+                state.projects.push({
+                  id: proj.ProjId,
+                  name: proj.ProjLocalName,
+                  pwd: proj.Secret ? proj.Secret : ""
                 })
-            })
-        },
-        setBreadcrumb: {
-            root: true,
-            handler({ state, commit }, val) {
-                let label = val[0].label;
-                if (label === "消息中心") {
-                    commit("setSidebarSelected", "message"); // 当进入消息中心页面的时候不选中导航栏
-                }
-                state.breadcrumb = []
-                state.breadcrumb = val
-                storage.set(KEY_PAGE_BRANDCRUMB, val)
+              )
             }
+          } else {
+            state.userInfo = null
+
+          }
+          resolve(resp)
+        })
+      })
+    },
+    setBreadcrumb: {
+      root: true,
+      handler({state, commit}, val) {
+        let label = val[0].label;
+        if (label === "消息中心") {
+          commit("setSidebarSelected", "message"); // 当进入消息中心页面的时候不选中导航栏
         }
+        state.breadcrumb = []
+        state.breadcrumb = val
+        storage.set(KEY_PAGE_BRANDCRUMB, val)
+      }
     }
+  }
 }

+ 0 - 4
src/views/relation/data/index.vue

@@ -133,10 +133,6 @@
       dataTable() {
         this.$router.push({
           path: "datatable",
-          // query: {
-          //   id: 1,
-          //   qq: 2
-          // }
         })
       },