修复接口,模块引用等一些问题

examples/App.vue

@@ -9,13 +9,13 @@
       </template>
     </header-nav>
     <ai-dv-wrapper class="fill" v-if="dvDev">
-      <router-view/>
+      <router-view v-bind="commonAttrs"/>
     </ai-dv-wrapper>
     <el-row v-else-if="showTools" class="fill mar-t48" type="flex">
       <slider-nav/>
-      <main-content class="fill"/>
+      <main-content class="fill" :commonAttrs="commonAttrs"/>
     </el-row>
-    <router-view class="fill" v-else/>
+    <router-view class="fill" v-else v-bind="commonAttrs"/>
     <div v-if="dialog" class="sign-box">
       <ai-sign style="margin: auto" :instance="$request" :action="{login}"
                visible @login="getToken" :showScanLogin="false"/>
@@ -30,7 +30,7 @@ import MainContent from "./components/mainContent";
 import HeaderNav from "./components/headerNav";
 import {mapActions, mapMutations, mapState} from "vuex";
 import Mock from "./components/mock";
-import AiDvWrapper from "@dui/dv/layout/AiDvWrapper/AiDvWrapper.vue";
+import AiDvWrapper from "dui/dv/layout/AiDvWrapper/AiDvWrapper.vue";
 
 export default {
   name: 'app',
@@ -42,6 +42,13 @@ export default {
       /project\/sass/g.test(location.pathname) && (url += "?corpId=ww596787bb70f08288")
       return url
     },
+    commonAttrs() {
+      return {
+        instance: this.$request,
+        dict: this.$dict,
+        permissions: this.$permissions
+      }
+    }
   },
   data() {
     return {
@@ -76,7 +83,8 @@ export default {
     }
   },
   created() {
-    wx = jWeixin
+    const {jWeixin} = window
+    window.wx = jWeixin
     if (this.user.token) this.getUserInfo().finally(() => {
       if (/^\/project\/xiushan/.test(location.pathname)) {
         this.getFinanceUser()

examples/components/mainContent.vue

@@ -2,7 +2,7 @@
   <section class="mainContent">
     <ai-nav-tab :routes="apps"/>
     <div class="fill">
-      <router-view/>
+      <router-view v-bind="$attrs.commonAttrs"/>
       <ai-empty v-if="isHome">欢迎使用村微产品库</ai-empty>
     </div>
   </section>

examples/main.js

@@ -4,10 +4,10 @@ import ui from 'element-ui';
 import router from './router';
 import axios from './router/axios';
 import utils from './utils';
-import dui from 'dui';
+import dui from 'dui/packages';
 import store from './store';
 import dataV from '@jiaminghi/data-view';
-import dvui from '@dui/dv'
+import dvui from 'dui/dv'
 
 Vue.use(dataV)
 Vue.use(ui);

examples/router/axios.js

@@ -1,5 +1,5 @@
 import {Message} from 'element-ui'
-import instance from '../../ui/lib/js/request'
+import instance from 'dui/lib/js/request'
 
 let baseURLs = {
   production: "/",
@@ -8,31 +8,7 @@ let baseURLs = {
 instance.defaults.baseURL = baseURLs[process.env.NODE_ENV]
 instance.interceptors.request.use(config => {
   if (config.url.startsWith("/node")) {
-    config.baseURL = "/ns"
-  } else if (config.url.startsWith("/sse")) {
-    config.baseURL = "/"
-  } else if (/\/project\/activeAnalysis/.test(location.pathname)) {
-    config.baseURL = "/analysis"
-  } else if (/\/project\/beta/.test(location.pathname)) {
-    config.baseURL = "/wg"
-  } else if (/\/project\/sass/.test(location.pathname)) {
-    config.baseURL = "/saas"
-  } else if (/\/tianfuxing/.test(location.pathname)) {
-    config.baseURL = "/tfx"
-  } else if (/\/qianxinan/.test(location.pathname)) {
-    // config.baseURL = "/qxn"
-  } else if (/\/xiushan/.test(location.pathname)) {
-    config.baseURL = "/xsjr"
-  } else if (/project\/oms/.test(location.pathname)) {
-    config.baseURL = "/omsapi"
-  } else if (/#url-/.test(location.hash)) {
-    config.baseURL = location.hash.replace(/#url-/, '/')
-  }
-  if (["/xsjr", "/tfx", "/omsapi"].includes(config.baseURL)) {
-    config.url = config.url.replace(/(app|auth|admin|api)\//, "api/")
-  }
-  if (['/qxn', '/analysis'].includes(config.baseURL)) {
-    config.url = config.url.replace(/(app|auth|admin)\//, "api/")
+    config.url = "/ns" + config.url
   }
   if (process.env.VUE_APP_IS_SIMPLE_SERVER == 1) {
     config.url = config.url.replace(/(app|auth|admin)\//, "api/")

examples/views/appEntry.vue

@@ -1,46 +0,0 @@
-<template>
-  <section class="appEntry">
-    <component v-if="app" :is="app" ref="currentPage" :instance="$request" :dict="$dict" :permissions="$permissions"/>
-    <ai-empty v-else>无法找到应用文件</ai-empty>
-  </section>
-</template>
-
-<script>
-
-import {mapState} from "vuex";
-import Vue from "vue";
-
-export default {
-  name: "appEntry",
-  label: "应用库-应用",
-  computed: {
-    ...mapState(['apps']),
-    app() {
-      const app = this.apps.find(e => e.name == this.$route.name)
-      return app.esm ?? ""
-    }
-  },
-  mounted() {
-    this.$vm.$on("mock", v => {
-      if (!!this.$refs.currentPage.$children?.[0]?.form) {
-        this.$refs.currentPage.$children[0].form = v
-        this.$refs.currentPage.$children[0].$forceUpdate()
-      }
-    })
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.appEntry {
-  width: 100%;
-  flex: 1;
-  min-width: 0;
-  min-height: 0;
-  height: 100%;
-
-  & > * {
-    height: 100%;
-  }
-}
-</style>

package.json

@@ -13,22 +13,25 @@
   },
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
-    "@dui/dv": "^1.0.0",
+    "@ckeditor/ckeditor5-vue2": "^3.0.1",
     "@jiaminghi/data-view": "^2.10.0",
     "@logicflow/core": "^1.2.1",
     "bin-ace-editor": "^3.2.0",
+    "crypto-js": "^4.2.0",
     "dayjs": "^1.8.35",
-    "dui": "^2.0.0",
     "echarts": "^5.5.1",
     "echarts-wordcloud": "^2.0.0",
     "hash.js": "^1.1.7",
     "html2canvas": "^1.4.1",
+    "jspdf": "^2.5.2",
     "mp4box": "^0.4.1",
     "print-js": "^1.0.63",
     "serialize-javascript": "^6.0.0",
     "sortablejs": "^1.12.0",
     "vue-carousel": "^0.18.0",
+    "vue-cropper": "^0.6.5",
     "vue-draggable-resizable": "^2.3.0",
+    "vue-qr": "^4.0.9",
     "vue-ruler-tool": "^1.2.4",
     "vue-style-loader": "^4.1.3",
     "vuedraggable": "^2.24.3"

packages/bigscreen/designer/components/DataConfig.vue

@@ -168,7 +168,7 @@ import {monitorTypes} from "../config";
 import ConfigItem from "./configItem.vue";
 import DatasourcePicker from "./datasourcePicker.vue";
 import AiSelect from "dui/packages/basic/AiSelect.vue";
-import {DvCompData} from "@dui/dv";
+import {DvCompData} from "dui/dv";
 
 export default {
   name: 'dataConfig',

packages/bigscreen/designer/components/configExtra.vue

@@ -4,7 +4,7 @@ import ConfigItem from "./configItem";
 import ChartPicker from "./chartPicker";
 import JsonEditor from "./jsonEditor";
 import {layers, monitorTypes} from "../config";
-import AiDvSummary from "@dui/dv/layout/AiDvSummary/AiDvSummary";
+import AiDvSummary from "dui/dv/layout/AiDvSummary/AiDvSummary";
 
 export default {
   name: "configExtra",

packages/bigscreen/designer/components/datasourcePicker.vue

@@ -34,7 +34,7 @@ import 'brace/snippets/json';
 import 'brace/theme/github';
 import 'brace/theme/monokai';
 import JsonEditor from "./jsonEditor.vue";
-import {DvCompData} from "@dui/dv";
+import {DvCompData} from "dui/dv";
 
 export default {
   name: "datasourcePicker",

src/main.js

@@ -4,7 +4,7 @@ import ui from 'element-ui';
 import router from './utils/router';
 import utils from './utils';
 import vcUI from 'dui';
-import appComp from '@dui/dv';
+import appComp from 'dui/dv';
 import store from './utils/store';
 import autoRoutes from "./utils/autoRoutes";
 import extra from "./config.json"

vue.config.js

@@ -11,11 +11,11 @@ module.exports = {
       }
     }
   },
-  transpileDependencies: [/dui[\\\/]lib[\\\/]js/],
   chainWebpack: (config) => {
     config.resolve.alias
       .set('@packages', path.resolve(__dirname, 'packages'))
       .set('@project', path.resolve(__dirname, 'project'))
+      .set('dui', path.resolve(__dirname, 'ui'))
     config.module
       .rule('js')
       .include