vue2-client 1.2.54-4 → 1.2.55

package/.env

@@ -1,15 +1,15 @@
-VUE_APP_PUBLIC_PATH=/
-VUE_APP_NAME=Admin
-VUE_APP_ROUTES_KEY=admin.routes
-VUE_APP_PERMISSIONS_KEY=admin.permissions
-VUE_APP_ROLES_KEY=admin.roles
-VUE_APP_USER_KEY=admin.user
-VUE_APP_LOGIN_KEY=admin.login
-VUE_APP_SETTING_KEY=admin.setting
-VUE_APP_TBAS_KEY=admin.tabs
-VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
-VUE_APP_DICTIONARY_KEY=admin.dictionary
-VUE_APP_BADGE_KEY=admin.badge
-VUE_APP_SINGLEVALUE_KEY=admin.singlevalue
-VUE_APP_DIVISIONSOHCHINA=admin.divisionsohchina
-VUE_APP_API_BASE_URL=http://123.60.214.109:8405
+VUE_APP_PUBLIC_PATH=/
+VUE_APP_NAME=Admin
+VUE_APP_ROUTES_KEY=admin.routes
+VUE_APP_PERMISSIONS_KEY=admin.permissions
+VUE_APP_ROLES_KEY=admin.roles
+VUE_APP_USER_KEY=admin.user
+VUE_APP_LOGIN_KEY=admin.login
+VUE_APP_SETTING_KEY=admin.setting
+VUE_APP_TBAS_KEY=admin.tabs
+VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
+VUE_APP_DICTIONARY_KEY=admin.dictionary
+VUE_APP_BADGE_KEY=admin.badge
+VUE_APP_SINGLEVALUE_KEY=admin.singlevalue
+VUE_APP_DIVISIONSOHCHINA=admin.divisionsohchina
+VUE_APP_API_BASE_URL=http://123.60.214.109:8405

package/.eslintrc.js

@@ -1,82 +1,82 @@
-module.exports = {
-  root: true,
-  env: {
-    node: true
-  },
-  'extends': [
-    'plugin:vue/essential',
-    'plugin:vue/strongly-recommended',
-    '@vue/standard'
-  ],
-  rules: {
-    'comma-dangle': 'off',
-    'no-console': 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'generator-star-spacing': 'off',
-    'no-mixed-operators': 0,
-    'vue/max-attributes-per-line': [
-      2,
-      {
-        'singleline': 5,
-        'multiline': {
-          'max': 1,
-          'allowFirstLine': false
-        }
-      }
-    ],
-    'vue/attribute-hyphenation': 0,
-    'vue/html-self-closing': 0,
-    'vue/component-name-in-template-casing': 0,
-    'vue/html-closing-bracket-spacing': 0,
-    'vue/singleline-html-element-content-newline': 0,
-    'vue/no-unused-components': 0,
-    'vue/multiline-html-element-content-newline': 0,
-    'vue/no-use-v-if-with-v-for': 0,
-    'vue/html-closing-bracket-newline': 0,
-    'vue/no-parsing-error': 0,
-    'vue/name-property-casing': 0,
-    'no-tabs': 0,
-    'quotes': [
-      2,
-      'single',
-      {
-        'avoidEscape': true,
-        'allowTemplateLiterals': true
-      }
-    ],
-    'semi': [
-      2,
-      'never',
-      {
-        'beforeStatementContinuationChars': 'never'
-      }
-    ],
-    'no-delete-var': 2,
-    'prefer-const': [
-      2,
-      {
-        'ignoreReadBeforeAssign': false
-      }
-    ],
-    'template-curly-spacing': 'off',
-    'indent': 'off',
-    // 必须使用全等: false
-    'eqeqeq': 0,
-    // 可以使用!! 双重否定
-    'no-extra-boolean-cast': 'off'
-  },
-  parserOptions: {
-    parser: 'babel-eslint'
-  },
-  overrides: [
-    {
-      files: [
-        '**/__tests__/*.{j,t}s?(x)',
-        '**/tests/unit/**/*.spec.{j,t}s?(x)'
-      ],
-      env: {
-        jest: true
-      }
-    }
-  ]
-}
+module.exports = {
+  root: true,
+  env: {
+    node: true
+  },
+  'extends': [
+    'plugin:vue/essential',
+    'plugin:vue/strongly-recommended',
+    '@vue/standard'
+  ],
+  rules: {
+    'comma-dangle': 'off',
+    'no-console': 'off',
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
+    'generator-star-spacing': 'off',
+    'no-mixed-operators': 0,
+    'vue/max-attributes-per-line': [
+      2,
+      {
+        'singleline': 5,
+        'multiline': {
+          'max': 1,
+          'allowFirstLine': false
+        }
+      }
+    ],
+    'vue/attribute-hyphenation': 0,
+    'vue/html-self-closing': 0,
+    'vue/component-name-in-template-casing': 0,
+    'vue/html-closing-bracket-spacing': 0,
+    'vue/singleline-html-element-content-newline': 0,
+    'vue/no-unused-components': 0,
+    'vue/multiline-html-element-content-newline': 0,
+    'vue/no-use-v-if-with-v-for': 0,
+    'vue/html-closing-bracket-newline': 0,
+    'vue/no-parsing-error': 0,
+    'vue/name-property-casing': 0,
+    'no-tabs': 0,
+    'quotes': [
+      2,
+      'single',
+      {
+        'avoidEscape': true,
+        'allowTemplateLiterals': true
+      }
+    ],
+    'semi': [
+      2,
+      'never',
+      {
+        'beforeStatementContinuationChars': 'never'
+      }
+    ],
+    'no-delete-var': 2,
+    'prefer-const': [
+      2,
+      {
+        'ignoreReadBeforeAssign': false
+      }
+    ],
+    'template-curly-spacing': 'off',
+    'indent': 'off',
+    // 必须使用全等: false
+    'eqeqeq': 0,
+    // 可以使用!! 双重否定
+    'no-extra-boolean-cast': 'off'
+  },
+  parserOptions: {
+    parser: 'babel-eslint'
+  },
+  overrides: [
+    {
+      files: [
+        '**/__tests__/*.{j,t}s?(x)',
+        '**/tests/unit/**/*.spec.{j,t}s?(x)'
+      ],
+      env: {
+        jest: true
+      }
+    }
+  ]
+}

package/CHANGELOG.md

@@ -1,6 +1,15 @@
 # Change Log
 > 所有关于本项目的变化都在该文档里。
 
+**1.2.55 -2022-05-20 @江超**
+- 问题修复：
+- 解决OA兼容模式下登录取不到字典的问题
+
+**1.2.54-5 -2022-05-20 @张振宇**
+- 功能修改：
+- 运行编译错误修改
+- 我觉得在座的各位都推脱不了责任
+
 **1.2.50 - 1.2.51 -2022-05-11 @何文强**
 - 功能修改：
 - 新增地址搜索框表单项

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.2.54-4",
+  "version": "1.2.55",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/base-client/all.js

@@ -1,65 +1,64 @@
-import Vue from 'vue'
-
-import CustomColumnsDrawer from '@vue2-client/base-client/components/common/CustomColumnsDrawer'
-import InstructDetailsView from '@vue2-client/base-client/components/iot/InstructDetailsView'
-import MeterDetailsView from '@vue2-client/base-client/components/iot/MeterDetailsView'
-import CustomerDetailsView from '@vue2-client/base-client/components/iot/CustomerDetailsView'
-import LogDetailsView from '@vue2-client/base-client/components/iot/LogDetailsView'
-import WebmeterAnalysisView from '@vue2-client/base-client/components/iot/WebmeterAnalysisView'
-import XCard from '@vue2-client/base-client/components/common/XCard/XCard'
-import XFormCol from '@vue2-client/base-client/components/common/XFormCol'
-import XBadge from '@vue2-client/base-client/components/common/XBadge'
-import DataAnalysisView from '@vue2-client/base-client/components/iot/DataAnalysisView'
-import DataAnalysisUser from '@vue2-client/base-client/components/iot/DataAnalysisUser'
-import SrcollList from '@vue2-client/base-client/components/common/ScrollList'
-import AmapPointRendering from '@vue2-client/base-client/components/common/AmapMarker'
-import DeviceTypeDetailsView from '@vue2-client/base-client/components/iot/DeviceTypeDetailsView'
-import DeviceBrandDetailsView from '@vue2-client/base-client/components/iot/DeviceBrandDetailsView'
-import DictionaryDetailsView from '@vue2-client/base-client/components/system/DictionaryDetailsView'
-import QueryParamsDetailsView from '@vue2-client/base-client/components/system/QueryParamsDetailsView'
-import DeviceDetailsView from '@vue2-client/base-client/components/iot/DeviceDetailsView'
-import TicketDetailsView from '@vue2-client/base-client/components/ticket/TicketDetailsView'
-import EmployeeDetailsView from '@vue2-client/base-client/components/ticket/EmployeeDetailsView'
-import submitTicketSuccess from '@vue2-client/base-client/components/ticket/TicketSubmitSuccessView'
-import { CreateQueryItem, CreateQuery } from '@vue2-client/base-client/components/common/CreateQuery'
-import CreateSimpleFormQuery from '@vue2-client/base-client/components/common/CreateSimpleFormQuery'
-import FormGroupQuery from '@vue2-client/base-client/components/common/FormGroupQuery'
-import FormGroupEdit from '@vue2-client/base-client/components/common/FormGroupEdit'
-import JSONToTree from '@vue2-client/base-client/components/common/JSONToTree'
-import Upload from '@vue2-client/base-client/components/common/Upload'
-import AddressSearchCombobox from '@vue2-client/base-client/components/common/AddressSearchCombobox'
-import CitySelect from '@vue2-client/base-client/components/common/CitySelect'
-// 插件
-import Plugins from '@vue2-client/base-client/plugins'
-Vue.use(Plugins)
-
-Vue.component('custom-columns-drawer', CustomColumnsDrawer)
-Vue.component('InstructDetailsView', InstructDetailsView)
-Vue.component('MeterDetailsView', MeterDetailsView)
-Vue.component('CustomerDetailsView', CustomerDetailsView)
-Vue.component('LogDetailsView', LogDetailsView)
-Vue.component('WebmeterAnalysisView', WebmeterAnalysisView)
-Vue.component('XCard', XCard)
-Vue.component('XBadge', XBadge)
-Vue.component('XFormCol', XFormCol)
-Vue.component('DataAnalysisView', DataAnalysisView)
-Vue.component('DataAnalysisUser', DataAnalysisUser)
-Vue.component('SrcollList', SrcollList)
-Vue.component('DeviceTypeDetailsView', DeviceTypeDetailsView)
-Vue.component('DeviceBrandDetailsView', DeviceBrandDetailsView)
-Vue.component('DeviceDetailsView', DeviceDetailsView)
-Vue.component('DictionaryDetailsView', DictionaryDetailsView)
-Vue.component('QueryParamsDetailsView', QueryParamsDetailsView)
-Vue.component('TicketDetailsView', TicketDetailsView)
-Vue.component('EmployeeDetailsView', EmployeeDetailsView)
-Vue.component('submitTicketSuccess', submitTicketSuccess)
-Vue.component('CreateQuery', CreateQuery)
-Vue.component('CreateQueryItem', CreateQueryItem)
-Vue.component('CreateSimpleFormQuery', CreateSimpleFormQuery)
-Vue.component('FormGroupQuery', FormGroupQuery)
-Vue.component('FormGroupEdit', FormGroupEdit)
-Vue.component('JSONToTree', JSONToTree)
-Vue.component('Upload', Upload)
-Vue.component('AmapPointRendering', AmapPointRendering)
-Vue.component('AddressSearchCombobox', AddressSearchCombobox)
-Vue.component('CitySelect', CitySelect)
+import Vue from 'vue'
+
+import CustomColumnsDrawer from '@vue2-client/base-client/components/common/CustomColumnsDrawer'
+import InstructDetailsView from '@vue2-client/base-client/components/iot/InstructDetailsView'
+import MeterDetailsView from '@vue2-client/base-client/components/iot/MeterDetailsView'
+import CustomerDetailsView from '@vue2-client/base-client/components/iot/CustomerDetailsView'
+import LogDetailsView from '@vue2-client/base-client/components/iot/LogDetailsView'
+import WebmeterAnalysisView from '@vue2-client/base-client/components/iot/WebmeterAnalysisView'
+import XCard from '@vue2-client/base-client/components/common/XCard/XCard'
+import XFormCol from '@vue2-client/base-client/components/common/XFormCol'
+import XBadge from '@vue2-client/base-client/components/common/XBadge'
+import DataAnalysisView from '@vue2-client/base-client/components/iot/DataAnalysisView'
+import DataAnalysisUser from '@vue2-client/base-client/components/iot/DataAnalysisUser'
+import SrcollList from '@vue2-client/base-client/components/common/ScrollList'
+import AmapPointRendering from '@vue2-client/base-client/components/common/AmapMarker'
+import DeviceTypeDetailsView from '@vue2-client/base-client/components/iot/DeviceTypeDetailsView'
+import DeviceBrandDetailsView from '@vue2-client/base-client/components/iot/DeviceBrandDetailsView'
+import DictionaryDetailsView from '@vue2-client/base-client/components/system/DictionaryDetailsView'
+import QueryParamsDetailsView from '@vue2-client/base-client/components/system/QueryParamsDetailsView'
+import DeviceDetailsView from '@vue2-client/base-client/components/iot/DeviceDetailsView'
+import TicketDetailsView from '@vue2-client/base-client/components/ticket/TicketDetailsView'
+import EmployeeDetailsView from '@vue2-client/base-client/components/ticket/EmployeeDetailsView'
+import submitTicketSuccess from '@vue2-client/base-client/components/ticket/TicketSubmitSuccessView'
+import CreateQuery from '@vue2-client/base-client/components/common/CreateQuery'
+import CreateSimpleFormQuery from '@vue2-client/base-client/components/common/CreateSimpleFormQuery'
+import FormGroupQuery from '@vue2-client/base-client/components/common/FormGroupQuery'
+import FormGroupEdit from '@vue2-client/base-client/components/common/FormGroupEdit'
+import JSONToTree from '@vue2-client/base-client/components/common/JSONToTree'
+import Upload from '@vue2-client/base-client/components/common/Upload'
+import AddressSearchCombobox from '@vue2-client/base-client/components/common/AddressSearchCombobox'
+import CitySelect from '@vue2-client/base-client/components/common/CitySelect'
+// 插件
+import Plugins from '@vue2-client/base-client/plugins'
+Vue.use(Plugins)
+
+Vue.component('custom-columns-drawer', CustomColumnsDrawer)
+Vue.component('InstructDetailsView', InstructDetailsView)
+Vue.component('MeterDetailsView', MeterDetailsView)
+Vue.component('CustomerDetailsView', CustomerDetailsView)
+Vue.component('LogDetailsView', LogDetailsView)
+Vue.component('WebmeterAnalysisView', WebmeterAnalysisView)
+Vue.component('XCard', XCard)
+Vue.component('XBadge', XBadge)
+Vue.component('XFormCol', XFormCol)
+Vue.component('DataAnalysisView', DataAnalysisView)
+Vue.component('DataAnalysisUser', DataAnalysisUser)
+Vue.component('SrcollList', SrcollList)
+Vue.component('DeviceTypeDetailsView', DeviceTypeDetailsView)
+Vue.component('DeviceBrandDetailsView', DeviceBrandDetailsView)
+Vue.component('DeviceDetailsView', DeviceDetailsView)
+Vue.component('DictionaryDetailsView', DictionaryDetailsView)
+Vue.component('QueryParamsDetailsView', QueryParamsDetailsView)
+Vue.component('TicketDetailsView', TicketDetailsView)
+Vue.component('EmployeeDetailsView', EmployeeDetailsView)
+Vue.component('submitTicketSuccess', submitTicketSuccess)
+Vue.component('CreateQuery', CreateQuery)
+Vue.component('CreateSimpleFormQuery', CreateSimpleFormQuery)
+Vue.component('FormGroupQuery', FormGroupQuery)
+Vue.component('FormGroupEdit', FormGroupEdit)
+Vue.component('JSONToTree', JSONToTree)
+Vue.component('Upload', Upload)
+Vue.component('AmapPointRendering', AmapPointRendering)
+Vue.component('AddressSearchCombobox', AddressSearchCombobox)
+Vue.component('CitySelect', CitySelect)