cloud-web-corejs 1.0.54-dev.46 → 1.0.54-dev.461

package/src/index.js

@@ -1,190 +1,210 @@
-/**version-1.0*/
-import Vue from 'vue';
-import Cookies from 'js-cookie';
-import 'normalize.css/normalize.css'; // a modern alternative to CSS resets
-import Element from 'element-ui';
-import '@/styles/element-variables.scss';
-import '@/styles/index.scss'; // global css
-
-import App from '@base/App';
-import store from '@base/store';
-import router from '@base/router';
-
-import '@/icons'; // icon
-import '@base/permission'; // permission control
-
-import * as filters from '@base/filters'; // global filters
-
-// main.js 文件添加以下代码
-
-import BaseKeepAlive from '@base/utils/keepAlive.js'
-
-Vue.component('BaseKeepAlive', BaseKeepAlive)
-
-import VXETable from 'vxe-table';
-import 'vxe-table/lib/style.css';
-
-import Vab from '@base/utils/vab';
-
-Vue.use(Vab);
-
-Vue.use(VXETable);
-
-import '@base/components/table/index.js';
-
-import drag from '@base/directive/el-drag-dialog/index.js';
-
-Vue.use(drag.install);
-
-import elDialogCenter from '@base/directive/el-dialog-center/index.js';
-
-Vue.use(elDialogCenter.install);
-
-import ErroreBox from '@base/components/errorMsg/index.js';
-
-Vue.use(ErroreBox);
-
-import ExcelExport from '@base/components/excelExport/index.js';
-
-Vue.use(ExcelExport);
-
-import ExcelImport from '@base/components/excelImport/index.js';
-
-Vue.use(ExcelImport);
-
-import ConfirmDialog from '@base/components/confirmDialog/index.js';
-
-Vue.use(ConfirmDialog);
-
-import baseAlert from '@base/components/baseAlert/index.js';
-
-Vue.use(baseAlert);
-
-import permission from '@base/directive/permission';
-
-Vue.use(permission);
-
-import VabUpload from '@base/components/VabUpload/index.js';
-
-Vue.use(VabUpload);
-
-Vue.component('baseUpload', () => import('@base/components/VabUpload/view.vue'));
-
-import baseAttachment from '@base/components/baseAttachment/install';
-
-Vue.use(baseAttachment);
-Vue.component('attachmentShowList', () => import('@base/components/baseAttachment/showList'));
-
-import '@base/resources/js/base/common.js';
-
-import vxeFilter from '@base/components/table/vxeFilter/index.js';
-
-Vue.use(vxeFilter);
-
-import baseTableExport from "@base/components/excelExport/button";
-
-Vue.component(baseTableExport.name, baseTableExport);
-
-
-/* Vue.component('extendedProperties', () => import('@base/components/extendedProperties/view.vue')); */
-
-import LimitNumber from '@base/directive/LimitNumber/index.js';
-
-Vue.use(LimitNumber);
-
-import baseInputNumber from '@base/components/baseInputNumber/index.vue'
-
-Vue.component(baseInputNumber.name, baseInputNumber);
-
-import elReadonly from '@base/directive/el-readonly/index.js';
-
-Vue.use(elReadonly);
-
-/*import cnPrint from "@base/components/cnPrint/index.js"
-
-Vue.use(cnPrint);*/
-
-/* Vue.component('oplogTable', () => import('@base/components/oplogTable/index.vue')); */
-import oplogTable from '@base/components/oplogTable/index.vue'
-
-Vue.component(oplogTable.name, oplogTable);
-
-import baseInputBatch from '@base/components/baseInputBatch/index.vue'
-
-Vue.component(baseInputBatch.name, baseInputBatch);
-
-Vue.component('baseInputExport', () => import('@base/components/baseInputExport/index.vue'));
-
-Vue.component('advancedSearchDialog', () => import('@base/components/advancedSearchDialog/index.vue'));
-
-import baseTabs from '@base/components/baseTabs/index.vue'
-
-Vue.component(baseTabs.name, baseTabs);
-
-import baseTabPane from '@base/components/baseTabs/baseTabPane.vue'
-
-Vue.component(baseTabPane.name, baseTabPane);
-
-import vb_tabs from "@base/components/vb-tabs/index.vue";
-import vb_tab_pane from "@base/components/vb-tabs/tab-pane.vue";
-import xTabs from "@base/components/vb-tabs/x-tabs.vue";
-
-Vue.component(vb_tabs.name, vb_tabs);
-Vue.component(vb_tab_pane.name, vb_tab_pane);
-Vue.component(xTabs.name, xTabs);
-
-Vue.component('status-tag', () => import('@base/components/statusTag/index.vue'));
-
-Vue.component('CodeEditor', () => import('@base/components/code-editor/index.vue'));
-
-Vue.component('scriptDescriptionButton', () => import('@base/components/scriptDescription/button'));
-
-Vue.component('scriptTestButton', () => import('@base/components/scriptTest/button'));
-
-import jsonImport from '@base/components/jsonImport/index.js';
-
-Vue.use(jsonImport);
-
-import langImport from '@base/components/langImport/index.js';
-
-Vue.use(langImport);
-
-//vform
-import '@base/components/xform/utils/directive'
-
-
-import i18n from '@base/lang/index.js'
-
-/**
- * If you don't want to use mock-server
- * you want to use MockJs for mock api
- * you can execute: mockXHR()
- *
- * Currently MockJs will be used in the production environment,
- * please remove it before going online ! ! !
- */
-if (process.env.NODE_ENV === 'production') {
-  /* const { mockXHR } = require('../mock')
-  mockXHR() */
-}
-
-Vue.use(Element, {
-  size: Cookies.get('size') || 'medium' // set element-ui default size
-  // locale: enLang // 如果使用中文，无需设置，请删除
-});
-
-// register global utility filters
-Object.keys(filters).forEach(key => {
-  Vue.filter(key, filters[key]);
-});
-
-Vue.config.productionTip = false;
-
-let vue = new Vue({
-  el: '#app',
-  router,
-  store,
-  i18n,
-  render: h => h(App)
-});
-window.$vueRoot = vue;
+/**version-1.0*/
+import Vue from 'vue';
+import Cookies from 'js-cookie';
+import 'normalize.css/normalize.css'; // a modern alternative to CSS resets
+import Element from 'element-ui';
+import '@/styles/element-variables.scss';
+import '@/styles/index.scss'; // global css
+
+import App from '@base/App';
+import store from '@base/store';
+import router from '@base/router';
+
+import '@/icons'; // icon
+import '@base/permission'; // permission control
+
+import * as filters from '@base/filters'; // global filters
+
+// main.js 文件添加以下代码
+
+import BaseKeepAlive from '@base/utils/keepAlive.js'
+
+Vue.component('BaseKeepAlive', BaseKeepAlive)
+
+import VXETable from 'vxe-table';
+import 'vxe-table/lib/style.css';
+
+// 引入扩展插件
+import '@base/components/table/plugins/extend-cell-area/vxe-table-extend-cell-area.es6.min.js'
+import '@base/components/table/plugins/extend-cell-area/vxe-table-extend-cell-area.min.css'
+
+/* // 设置授权信息
+VXETable.setup({
+  // showAuthLog: true, // 是否在控制台显示授权信息，专业版支持关闭
+  // authId: 'gbeumewkoyt2rhf9', // 获取授权后在官网登录后进入“用户中心”查看
+  authId: 'gbeumewkoyt2rhft', // 获取授权后在官网登录后进入“用户中心”查看
+  // onAuth (e) {
+  //   // 打印授权状态
+  //   console.log(e)
+  // }
+}) */
+
+
+
+import Vab from '@base/utils/vab';
+
+Vue.use(Vab);
+
+Vue.use(VXETable);
+
+/* import tablePluns from "@/mixins/table/index.js"
+VXETable.use(tablePluns) */
+
+import '@base/components/table/index.js';
+
+import drag from '@base/directive/el-drag-dialog/index.js';
+
+Vue.use(drag.install);
+
+import elDialogCenter from '@base/directive/el-dialog-center/index.js';
+
+Vue.use(elDialogCenter.install);
+
+import ErroreBox from '@base/components/errorMsg/index.js';
+
+Vue.use(ErroreBox);
+
+import ExcelExport from '@base/components/excelExport/index.js';
+
+Vue.use(ExcelExport);
+
+import ExcelImport from '@base/components/excelImport/index.js';
+
+Vue.use(ExcelImport);
+
+import ConfirmDialog from '@base/components/confirmDialog/index.js';
+
+Vue.use(ConfirmDialog);
+
+import baseAlert from '@base/components/baseAlert/index.js';
+
+Vue.use(baseAlert);
+
+import permission from '@base/directive/permission';
+
+Vue.use(permission);
+
+import VabUpload from '@base/components/VabUpload/index.js';
+
+Vue.use(VabUpload);
+
+Vue.component('baseUpload', () => import('@base/components/VabUpload/view.vue'));
+
+import baseAttachment from '@base/components/baseAttachment/install';
+
+Vue.use(baseAttachment);
+Vue.component('attachmentShowList', () => import('@base/components/baseAttachment/showList'));
+
+import '@base/resources/js/base/common.js';
+
+import vxeFilter from '@base/components/table/vxeFilter/index.js';
+
+Vue.use(vxeFilter);
+
+import baseTableExport from "@base/components/excelExport/button.vue";
+
+Vue.component(baseTableExport.name, baseTableExport);
+
+
+/* Vue.component('extendedProperties', () => import('@base/components/extendedProperties/view.vue')); */
+
+import LimitNumber from '@base/directive/LimitNumber/index.js';
+
+Vue.use(LimitNumber);
+
+import baseInputNumber from '@base/components/baseInputNumber/index.vue'
+
+Vue.component(baseInputNumber.name, baseInputNumber);
+
+import elReadonly from '@base/directive/el-readonly/index.js';
+
+Vue.use(elReadonly);
+
+/*import cnPrint from "@base/components/cnPrint/index.js"
+
+Vue.use(cnPrint);*/
+
+/* Vue.component('oplogTable', () => import('@base/components/oplogTable/index.vue')); */
+import oplogTable from '@base/components/oplogTable/index.vue'
+
+Vue.component(oplogTable.name, oplogTable);
+
+import baseInputBatch from '@base/components/baseInputBatch/index.vue'
+
+Vue.component(baseInputBatch.name, baseInputBatch);
+
+Vue.component('baseInputExport', () => import('@base/components/baseInputExport/index.vue'));
+
+Vue.component('advancedSearchDialog', () => import('@base/components/advancedSearchDialog/index.vue'));
+
+import baseTabs from '@base/components/baseTabs/index.vue'
+
+Vue.component(baseTabs.name, baseTabs);
+
+import baseTabPane from '@base/components/baseTabs/baseTabPane.vue'
+
+Vue.component(baseTabPane.name, baseTabPane);
+
+import vb_tabs from "@base/components/vb-tabs/index.vue";
+import vb_tab_pane from "@base/components/vb-tabs/tab-pane.vue";
+import xTabs from "@base/components/vb-tabs/x-tabs.vue";
+
+Vue.component(vb_tabs.name, vb_tabs);
+Vue.component(vb_tab_pane.name, vb_tab_pane);
+Vue.component(xTabs.name, xTabs);
+
+Vue.component('status-tag', () => import('@base/components/statusTag/index.vue'));
+
+Vue.component('CodeEditor', () => import('@base/components/code-editor/index.vue'));
+
+Vue.component('scriptDescriptionButton', () => import('@base/components/scriptDescription/button'));
+
+Vue.component('scriptTestButton', () => import('@base/components/scriptTest/button'));
+
+import jsonImport from '@base/components/jsonImport/index.js';
+
+Vue.use(jsonImport);
+
+import langImport from '@base/components/langImport/index.js';
+
+Vue.use(langImport);
+
+//vform
+// import '@base/components/xform/utils/directive'
+
+
+import i18n from '@base/lang/index.js'
+
+/**
+ * If you don't want to use mock-server
+ * you want to use MockJs for mock api
+ * you can execute: mockXHR()
+ *
+ * Currently MockJs will be used in the production environment,
+ * please remove it before going online ! ! !
+ */
+if (process.env.NODE_ENV === 'production') {
+  /* const { mockXHR } = require('../mock')
+  mockXHR() */
+}
+
+Vue.use(Element, {
+  size: Cookies.get('size') || 'medium' // set element-ui default size
+  // locale: enLang // 如果使用中文，无需设置，请删除
+});
+
+// register global utility filters
+Object.keys(filters).forEach(key => {
+  Vue.filter(key, filters[key]);
+});
+
+Vue.config.productionTip = false;
+
+let vue = new Vue({
+  el: '#app',
+  router,
+  store,
+  i18n,
+  render: h => h(App)
+});
+window.$vueRoot = vue;

package/src/lang/index.js

@@ -1,51 +1,56 @@
-import Vue from 'vue'
-import VueI18n from 'vue-i18n'
-
-import enLocale from 'element-ui/lib/locale/lang/en'
-import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
-import zhCN_vxe from 'vxe-table/lib/locale/lang/zh-CN'
-import enUS_vxe from 'vxe-table/lib/locale/lang/en-US'
-import VXETable from 'vxe-table'
-import ElementLocale from 'element-ui/lib/locale'
-import settingConfig from "@/settings";
-
-Vue.use(VueI18n);
-
-const messages = {
-  en: {
-    ...enLocale,
-    ...enUS_vxe
-  },
-  zh: {
-    ...zhLocale,
-    ...zhCN_vxe
-  }
-};
-
-/*const enLocaleMine = require.context('@/lang/locale/en', false, /\w+\.js/);
-const zhLocaleMine = require.context('@/lang/locale/zh', false, /\w+\.js/);
-
-zhLocaleMine.keys().map(fileName => {
-  let comp = zhLocaleMine(fileName).default;
-  Object.assign(messages["zh"], comp);
-});
-enLocaleMine.keys().map(fileName => {
-  let comp = enLocaleMine(fileName).default;
-  Object.assign(messages["en"], comp);
-});*/
-
-// Create VueI18n instance with options
-let i18nLang = localStorage.getItem("i18n-lang");
-const i18n = new VueI18n({
-  locale: i18nLang || settingConfig.languageCode || 'zh', // set locale
-  messages, // set locale messages
-});
-
-ElementLocale.i18n((key, value) => i18n.t(key, value));
-
-VXETable.setup({
-  // 对组件内置的提示语进行国际化翻译
-  i18n: (key, args) => i18n.t(key, args)
-});
-
-export default i18n;
+import Vue from 'vue'
+import VueI18n from 'vue-i18n'
+
+import enLocale from 'element-ui/lib/locale/lang/en'
+import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
+import zhCN_vxe from 'vxe-table/lib/locale/lang/zh-CN'
+import enUS_vxe from 'vxe-table/lib/locale/lang/en-US'
+import VXETable from 'vxe-table'
+import ElementLocale from 'element-ui/lib/locale'
+import settingConfig from "@/settings";
+
+import enLogin from "./locale/en/login.js"
+import zhLogin from "./locale/zh/login.js"
+
+Vue.use(VueI18n);
+
+const messages = {
+  en: {
+    ...enLocale,
+    ...enUS_vxe,
+    ...enLogin
+  },
+  zh: {
+    ...zhLocale,
+    ...zhCN_vxe,
+    ...zhLogin
+  }
+};
+
+/*const enLocaleMine = require.context('@/lang/locale/en', false, /\w+\.js/);
+const zhLocaleMine = require.context('@/lang/locale/zh', false, /\w+\.js/);
+
+zhLocaleMine.keys().map(fileName => {
+  let comp = zhLocaleMine(fileName).default;
+  Object.assign(messages["zh"], comp);
+});
+enLocaleMine.keys().map(fileName => {
+  let comp = enLocaleMine(fileName).default;
+  Object.assign(messages["en"], comp);
+});*/
+
+// Create VueI18n instance with options
+let i18nLang = localStorage.getItem("i18n-lang");
+const i18n = new VueI18n({
+  locale: i18nLang || settingConfig.languageCode || 'zh', // set locale
+  messages, // set locale messages
+});
+
+ElementLocale.i18n((key, value) => i18n.t(key, value));
+
+VXETable.setup({
+  // 对组件内置的提示语进行国际化翻译
+  i18n: (key, args) => i18n.t(key, args)
+});
+
+export default i18n;

package/src/lang/locale/en/login.js

@@ -0,0 +1,20 @@
+export default {
+    "账号登录":"Account Login",
+    "请输入用户名":"Please enter a username",
+    "请输入密码":"Please enter a password",
+    "记住密码":"Remember password",
+    "登录":"Login",
+    "手机登录":"Phone Login",
+    "请输入手机号":"Please enter a phone number",
+    "请输入验证码":"Please enter a verification code",
+    "扫码登录":"Scan Login",
+    "扫一扫，登录系统":"Scan the QR code to log in to the system",
+    "二维码失效":"QR code expired",
+    "广州同望科技发展有限公司":"Guangzhou Tongwang Technology Development Co., Ltd.",
+    "获取验证码":"Get Verification Code",
+    "请输入手机号和验证码":"Please enter a phone number and verification code",
+    "请输入手机号":"Please enter a phone number",
+    "60秒后重新获取":"60 seconds after re-getting",
+    "{time}秒后重新获取":"{time} seconds after re-getting",
+    "登录成功":"Login Successful"
+}

package/src/lang/locale/zh/login.js

@@ -0,0 +1,20 @@
+export default {
+    "账号登录":"账号登录",
+    "请输入用户名":"请输入用户名",
+    "请输入密码":"请输入密码",
+    "记住密码":"记住密码",
+    "登录":"登录",
+    "手机登录":"手机登录",
+    "请输入手机号":"请输入手机号",
+    "请输入验证码":"请输入验证码",
+    "扫码登录":"扫码登录",
+    "扫一扫，登录系统":"扫一扫，登录系统",
+    "二维码失效":"二维码失效",
+    "广州同望科技发展有限公司":"广州同望科技发展有限公司",
+    "获取验证码":"获取验证码",
+    "请输入手机号和验证码":"请输入手机号和验证码",
+    "请输入手机号":"请输入手机号",
+    "60秒后重新获取":"60秒后重新获取",
+    "{time}秒后重新获取":"{time}秒后重新获取",
+    "登录成功":"登录成功"
+}

package/src/layout/components/AppMain.vue

@@ -20,12 +20,15 @@
       ></outLink>
     </template>
     <unreadDialog></unreadDialog>
+    <watermark></watermark>
   </section>
 </template>
 
 <script>
 import outLink from '@base/views/user/outLink/index.vue';
 import unreadDialog from "../../layout/components/notify_message/unreadDialog.vue";
+import watermark from "./watermark";
+
 
 export default {
   name: 'AppMain',
@@ -43,7 +46,8 @@ export default {
   },
   components: {
     outLink,
-    unreadDialog
+    unreadDialog,
+    watermark
   },
   data() {
     return {