Przeglądaj źródła

修复路由的错误。

杨志杰 3 lat temu
rodzic
commit
3c2a3f50d3

+ 1 - 1
config/webpack.lib1.js

@@ -53,6 +53,6 @@ module.exports = WebpackMerge.merge(baseConfig,{
     'vue-router': 'vue-router',
     'v-tooltip': 'v-tooltip',
     'vuedraggable': 'vuedraggable',
-    'amis': 'amis',
+    'lowcode': 'lowcode',
   },
 });

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
   "name": "pc-component-v3",
-  "version": "1.0.43",
+  "version": "1.0.44",
   "description": "",
   "main": "dist/pc-component-v3.js",
   "scripts": {

+ 4 - 4
packages/amis/index.js

@@ -1,7 +1,7 @@
-import AmisWidget from './src/AmisWidget.vue';
+import LowcodeWidget from './src/LowcodeWidget.vue';
 
-AmisWidget.install = function(Vue) {
-  Vue.component(AmisWidget.name, AmisWidget);
+LowcodeWidget.install = function(Vue) {
+  Vue.component(LowcodeWidget.name, LowcodeWidget);
 };
 
-export default AmisWidget;
+export default LowcodeWidget;

+ 0 - 86
packages/amis/src/AmisWidget.vue

@@ -1,86 +0,0 @@
-<template>
-  <div id="amis-box" />
-</template>
-
-
-<script>
-
-// 这样打包会打进来
-// import 'amis/sdk/sdk.js';
-// import 'amis/lib/themes/antd.css';
-// import 'amis/lib/helper.css';
-// import 'amis/sdk/iconfont.css';
-import { amisConfig } from './AmisConfig.js';
-
-import AmisWindowResource from './AmisWindowResource.js';
-import Common from '../../common/Common.js';
-import Notify from '../../common/Notify.js';
-
-export default {
-
-  name: 'AmisWidget',
-
-  props: {
-    amisWindowNo: {
-      type: String,
-      default: null,
-    },
-  },
-
-  watch: {
-    'amisWindowNo': function (to, from) {
-      this.init();
-    },
-  },
-
-
-  mounted() {
-    let _self = this;
-    this.$nextTick(function () {
-      _self.init();
-    });
-  },
-
-  methods: {
-    
-    /**
-     * 初始化amis实例
-     */
-    init() {
-      if (this.amisWindowNo == null) {
-        return;
-      }
-
-      // 初始化amis实例之前,先判断是否已经有amis实例,如果有的话就销毁。
-      this.destory();
-
-      let amis = window.amisRequire('amis/embed');
-      let _self = this;
-
-      AmisWindowResource.readJson(this.amisWindowNo).then(baseObjectResponse => {
-        if (baseObjectResponse.errorCode === 0) {
-          let amisJSON = JSON.parse(baseObjectResponse.data);
-          _self.amisScoped = amis.embed('#amis-box', amisJSON, {}, amisConfig);
-        } else {
-          Notify.error('提示', baseObjectResponse.errorMessage, false);
-        }
-      }, errorData => {
-        Common.processException(errorData);
-      });
-    },
-
-    
-    /**
-     * 销毁amis实例
-     */
-    destory(){
-      let _self = this;
-      if(_self.amisScoped != null){
-        _self.amisScoped.unmount();
-        _self.amisScoped = null;
-      }
-    },
-
-  },
-};
-</script>

+ 2 - 2
packages/amis/src/AmisConfig.js → packages/amis/src/LowcodeConfig.js

@@ -1,4 +1,4 @@
-let amisConfig = {
+let lowcodeConfig = {
   requestAdaptor(api) {
     api.headers['token'] = $.cookie('token');
     api.headers['account'] = $.cookie('account');
@@ -23,5 +23,5 @@ let amisConfig = {
 };
 
 export {
-  amisConfig,
+  lowcodeConfig,
 };

+ 86 - 0
packages/amis/src/LowcodeWidget.vue

@@ -0,0 +1,86 @@
+<template>
+  <div id="lowcode-box" />
+</template>
+
+
+<script>
+
+// 这样打包会打进来
+// import 'lowcode/sdk/sdk.js';
+// import 'lowcode/lib/themes/antd.css';
+// import 'lowcode/lib/helper.css';
+// import 'lowcode/sdk/iconfont.css';
+import { lowcodeConfig } from './LowcodeConfig.js';
+
+import LowcodeWindowResource from './LowcodeWindowResource.js';
+import Common from '../../common/Common.js';
+import Notify from '../../common/Notify.js';
+
+export default {
+
+  name: 'LowcodeWidget',
+
+  props: {
+    lowcodeWindowNo: {
+      type: String,
+      default: null,
+    },
+  },
+
+  watch: {
+    'lowcodeWindowNo': function (to, from) {
+      this.init();
+    },
+  },
+
+
+  mounted() {
+    let _self = this;
+    this.$nextTick(function () {
+      _self.init();
+    });
+  },
+
+  methods: {
+    
+    /**
+     * 初始化lowcode实例
+     */
+    init() {
+      if (this.lowcodeWindowNo == null) {
+        return;
+      }
+
+      // 初始化lowcode实例之前,先判断是否已经有lowcode实例,如果有的话就销毁。
+      this.destory();
+
+      let lowcode = window.lowcodeRequire('lowcode/embed');
+      let _self = this;
+
+      LowcodeWindowResource.readJson(this.lowcodeWindowNo).then(baseObjectResponse => {
+        if (baseObjectResponse.errorCode === 0) {
+          let lowcodeJSON = JSON.parse(baseObjectResponse.data);
+          _self.lowcodeScoped = lowcode.embed('#lowcode-box', lowcodeJSON, {}, lowcodeConfig);
+        } else {
+          Notify.error('提示', baseObjectResponse.errorMessage, false);
+        }
+      }, errorData => {
+        Common.processException(errorData);
+      });
+    },
+
+    
+    /**
+     * 销毁lowcode实例
+     */
+    destory(){
+      let _self = this;
+      if(_self.lowcodeScoped != null){
+        _self.lowcodeScoped.unmount();
+        _self.lowcodeScoped = null;
+      }
+    },
+
+  },
+};
+</script>

+ 3 - 3
packages/amis/src/AmisWindowResource.js → packages/amis/src/LowcodeWindowResource.js

@@ -11,10 +11,10 @@ export default {
   /**
 	 * 工具类自动生成的方法
 	 * 工具作者: 杨志杰
-	 * 读取文件服务器下面{}/AmisWindow/{moduleNo}/{amisWindowNo}.{amisWindowName}.json文件内容 
+	 * 读取文件服务器下面{}/LowcodeWindow/{moduleNo}/{lowcodeWindowNo}.{lowcodeWindowName}.json文件内容 
 	 */
-  readJson: function(amisWindowNo){
-    var requestUrl = '/api/AmisWindowResource/readJson?amisWindowNo='+amisWindowNo;
+  readJson: function(lowcodeWindowNo){
+    var requestUrl = '/api/LowcodeWindowResource/readJson?lowcodeWindowNo='+lowcodeWindowNo;
 
     return new Promise((resolve, reject) => {
       $.ajax({

+ 1 - 16
packages/common/Common.js

@@ -154,22 +154,7 @@ export default {
 
   // 给请求头中加上account和token信息
   addTokenToRequest: function (request) {
-    var token = $.cookie('token');
-    var account = $.cookie('account');
-    if (token == undefined) {
-      var localStorageToken = localStorage.getItem('token');
-      if (localStorageToken != undefined) {
-        token = localStorageToken;
-      }
-    }
-    if (account == undefined) {
-      var localStorageAccount = localStorage.getItem('account');
-      if (localStorageAccount != undefined) {
-        account = localStorageAccount;
-      }
-    }
-    request.setRequestHeader('account', account);
-    request.setRequestHeader('token', token);
+    request.setRequestHeader('token', localStorage.getItem('#token'));
 
   },
 

+ 2 - 2
packages/components.js

@@ -3,7 +3,7 @@ import Modal from './modal/index.js';
 import DateTime from './dateTime/index.js';
 import Date from './date/index.js';
 import Checkbox from './checkbox/index.js';
-import AmisWidget from './amis/index.js';
+import LowcodeWidget from './lowcode/index.js';
 import PageSizeSelect from './page-size-select/index.js';
 import Time from './time/index.js';
 import Switches from './switches/index.js';
@@ -53,7 +53,7 @@ export {
   DateTime,
   Date,
   Checkbox,
-  AmisWidget,
+  LowcodeWidget,
   PageSizeSelect,
   Time,
   Switches,

+ 1 - 1
webpack.lib.js

@@ -103,6 +103,6 @@ module.exports = WebpackMerge.merge(baseConfig,{
     'vue-router': 'vue-router',
     'v-tooltip': 'v-tooltip',
     'vuedraggable': 'vuedraggable',
-    'amis': 'amis',
+    'lowcode': 'lowcode',
   },
 });