From 157ce3be9dd6db50bca560488a33d99d787cb5bd Mon Sep 17 00:00:00 2001
From: Poised_flw <luofeihit2010@gmail.com>
Date: Fri, 29 Oct 2021 16:17:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=9C=80=E5=A4=A7=E5=8C=96?=
 =?UTF-8?q?=E3=80=81=E6=9C=80=E5=B0=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/tis_app_template_kt/package.json          |  1 +
 src/tis_app_template_kt/public/esplug.json    |  2 +-
 .../src/components/Dialog/DialogPc.vue        | 52 ++++++++++++++-----
 .../src/components/Dialog/dialogMixins.js     |  2 +-
 src/tis_app_template_kt/src/tis/bus.js        |  1 +
 src/tis_app_template_kt/src/tis/index.js      |  3 +-
 src/tis_app_template_kt/yarn.lock             | 34 ++++--------
 7 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/src/tis_app_template_kt/package.json b/src/tis_app_template_kt/package.json
index 94f2a24..251da1c 100644
--- a/src/tis_app_template_kt/package.json
+++ b/src/tis_app_template_kt/package.json
@@ -12,6 +12,7 @@
     "axios": "^0.21.1",
     "core-js": "^3.6.5",
     "vue": "^2.6.11",
+    "vue-drag-resize": "^1.5.4",
     "vuex": "^3.1.2"
   },
   "devDependencies": {
diff --git a/src/tis_app_template_kt/public/esplug.json b/src/tis_app_template_kt/public/esplug.json
index b20c9a7..8df3368 100644
--- a/src/tis_app_template_kt/public/esplug.json
+++ b/src/tis_app_template_kt/public/esplug.json
@@ -63,4 +63,4 @@
       "segprefix": "TIS_MGS"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/src/tis_app_template_kt/src/components/Dialog/DialogPc.vue b/src/tis_app_template_kt/src/components/Dialog/DialogPc.vue
index e01d730..d880382 100644
--- a/src/tis_app_template_kt/src/components/Dialog/DialogPc.vue
+++ b/src/tis_app_template_kt/src/components/Dialog/DialogPc.vue
@@ -1,16 +1,20 @@
 <template>
     <VueDragResize v-show="centerDialogVisible" :isDraggable="isDraggable" parentLimitation :isResizable="isResizable"
+                   ref="dragEl"
                    :parentW="parentW"
                    :parentH="parentH" :minh="minh" :minw="minw"
                    :z="400"
-                   :x="left" :y="top" :w="width" :h="height"
+                   :x="left"
+                   :y="top"
+                   :w="width"
+                   :h="height"
                    v-on:resizing="resize"
                    v-on:dragging="resize" class="drag-container">
         <div class="header">
             <span>{{DialogWidget && DialogWidget.name}}</span>
             <div class="action">
-                <!--<div class="maxsize" @click='onMaxSize'>最大化</div>-->
-                <!--<div class="minisize" >最小化</div>-->
+                <div class="maxsize" @click='onMaxSize'>最大化</div>
+                <div class="minisize" @click="minisize">最小化</div>
                 <div class="close" @click="onClose">关闭</div>
             </div>
         </div>
@@ -19,12 +23,12 @@
                    @onShow="onShow"
                    @onClose="onClose"
                    :is="DialogWidget && actives"></component>
-        <br style="clear: both"/>
     </VueDragResize>
 </template>
 
 <script>
-    import VueDragResize from "../vueDragResize/vue-drag-resize.vue";
+    //import VueDragResize from "../vueDragResize/vue-drag-resize.vue";
+import VueDragResize from 'vue-drag-resize'
     import {dialogMixins} from './dialogMixins'
 
     export default {
@@ -55,8 +59,6 @@
             minw() {
                 return 280;
             },
-
-
         },
         data() {
 
@@ -64,12 +66,12 @@
                 isMax:false,
                 isDestory:false,
                 showSizeChoice: false,
-                width: 700,
-                height: 600,
                 curWidth:600,
                 curHeight:500,
-                top: 80,
-                left: 40,
+                width: Math.round(window.innerWidth * .6),
+                height: Math.round(window.innerHeight * .6),
+                top: Math.round(window.innerHeight * .2),
+                left: Math.round(window.innerWidth * .2),
             };
         },
         methods: {
@@ -83,7 +85,22 @@
                 this.curHeight = newRect.height;
             },
             onMaxSize(){
+              this.$refs.dragEl.$el.style.left = 0
+              this.$refs.dragEl.$el.style.top = 0
+              const $contentEl = this.$refs.dragEl.$el.firstChild
+              $contentEl.style.width = window.innerWidth + 'px'
+              $contentEl.style.height = window.innerHeight + 'px'
+              return;
                 this.isMax = !this.isMax;
+              this.left = 0
+              this.top = 0
+              this.$nextTick(() => {
+                this.width = window.innerWidth
+                this.height = window.innerHeight
+              })
+            },
+            minisize() {
+                this.centerDialogVisible = false;
             },
             onClose() {
                 this.centerDialogVisible = false;
@@ -125,5 +142,16 @@
     }
     .content{
         flex: 1;
+        overflow-y: auto;
+        background: #fff;
+        ::v-deep {
+          .footer:after {
+            content: '';
+            clear: both;
+          }
+        }
+    }
+    .drag-container {
+      border: 1px solid #ddd;
     }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/tis_app_template_kt/src/components/Dialog/dialogMixins.js b/src/tis_app_template_kt/src/components/Dialog/dialogMixins.js
index ddea7a1..0f49a44 100644
--- a/src/tis_app_template_kt/src/components/Dialog/dialogMixins.js
+++ b/src/tis_app_template_kt/src/components/Dialog/dialogMixins.js
@@ -42,4 +42,4 @@ export const dialogMixins = {
             this.dialogVisible = flag;
         },
     }
-}
\ No newline at end of file
+}
diff --git a/src/tis_app_template_kt/src/tis/bus.js b/src/tis_app_template_kt/src/tis/bus.js
index 7c1d606..f306f24 100644
--- a/src/tis_app_template_kt/src/tis/bus.js
+++ b/src/tis_app_template_kt/src/tis/bus.js
@@ -166,6 +166,7 @@ const bus = new Vue({
     //获取组件
     getWidgetsByType(type) {
       //以type 或 position 命中widget,背景板默认lazy=false
+      console.log(type, this.layouts)
       return this.layouts.filter(f => (f.type === type || f.position === type)  && !f.lazy).map(f => {
         //string类型，来自配置文件，需要下载资源才能使用，懒加载组件不加载但是需要加入到数组中、、
 
diff --git a/src/tis_app_template_kt/src/tis/index.js b/src/tis_app_template_kt/src/tis/index.js
index b870834..9868b4d 100644
--- a/src/tis_app_template_kt/src/tis/index.js
+++ b/src/tis_app_template_kt/src/tis/index.js
@@ -10,7 +10,7 @@ import AsyncComputed from 'vue-async-computed'
 import axios from 'axios'
 import Vuex from 'vuex'
 import EventBusExample from '../components/EventBusExample'
-import bus, { onSetup, onMount } from 'tisbus'
+import bus, { onSetup, onMount } from './bus'
 
 Vue.component('EventBusExample', EventBusExample)
 Vue.config.productionTip = false;
@@ -118,6 +118,7 @@ export async function mount(props = {}) {
 
     // console.log("---", window.esapp)
 
+  bus.openComponentByMenu(['kt_zzgl_datapackaging'])
 }
 
 /**
diff --git a/src/tis_app_template_kt/yarn.lock b/src/tis_app_template_kt/yarn.lock
index 233cedc..8ac932b 100644
--- a/src/tis_app_template_kt/yarn.lock
+++ b/src/tis_app_template_kt/yarn.lock
@@ -1023,11 +1023,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/estree@*":
-  version "0.0.50"
-  resolved "https://registry.nlark.com/@types/estree/download/@types/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
-  integrity sha1-Hgyqk2TT/M0pMcPtlv2+ql1MyoM=
-
 "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
   version "4.17.24"
   resolved "https://registry.nlark.com/@types/express-serve-static-core/download/@types/express-serve-static-core-4.17.24.tgz?cache=0&sync_timestamp=1629707772598&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fexpress-serve-static-core%2Fdownload%2F%40types%2Fexpress-serve-static-core-4.17.24.tgz#ea41f93bf7e0d59cd5a76665068ed6aab6815c07"
@@ -5217,13 +5212,6 @@ is-promise@^2.1.0:
   resolved "https://registry.npm.taobao.org/is-promise/download/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
   integrity sha1-OauVnMv5p3TPB597QMeib3YxNfE=
 
-is-reference@^1.1.2:
-  version "1.2.1"
-  resolved "https://registry.nlark.com/is-reference/download/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7"
-  integrity sha1-iy2sCzcfS8mU/eq6nrVC0DAC0Lc=
-  dependencies:
-    "@types/estree" "*"
-
 is-regex@^1.0.4, is-regex@^1.1.4:
   version "1.1.4"
   resolved "https://registry.nlark.com/is-regex/download/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
@@ -7500,7 +7488,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.npm.taobao.org/resolve-url/download/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.10.0, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.14.2:
+resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2:
   version "1.20.0"
   resolved "https://registry.nlark.com/resolve/download/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
   integrity sha1-YpoBP7P3B1XW8LeTXMHCxTeLGXU=
@@ -7578,17 +7566,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
     hash-base "^3.0.0"
     inherits "^2.0.1"
 
-rollup-plugin-commonjs@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.npm.taobao.org/rollup-plugin-commonjs/download/rollup-plugin-commonjs-10.1.0.tgz#417af3b54503878e084d127adf4d1caf8beb86fb"
-  integrity sha1-QXrztUUDh44ITRJ6300cr4vrhvs=
-  dependencies:
-    estree-walker "^0.6.1"
-    is-reference "^1.1.2"
-    magic-string "^0.25.2"
-    resolve "^1.11.0"
-    rollup-pluginutils "^2.8.1"
-
 rollup-plugin-replace@^2.2.0:
   version "2.2.0"
   resolved "https://registry.npm.taobao.org/rollup-plugin-replace/download/rollup-plugin-replace-2.2.0.tgz?cache=0&sync_timestamp=1572273363490&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Frollup-plugin-replace%2Fdownload%2Frollup-plugin-replace-2.2.0.tgz#f41ae5372e11e7a217cde349c8b5d5fd115e70e3"
@@ -7607,7 +7584,7 @@ rollup-plugin-uglify@^6.0.4:
     serialize-javascript "^2.1.2"
     uglify-js "^3.4.9"
 
-rollup-pluginutils@^2.6.0, rollup-pluginutils@^2.8.1:
+rollup-pluginutils@^2.6.0:
   version "2.8.2"
   resolved "https://registry.npm.taobao.org/rollup-pluginutils/download/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
   integrity sha1-cvKvB0i1kjZNvTOJ5gDlqURKNR4=
@@ -8860,6 +8837,13 @@ vue-async-computed@^3.9.0:
   resolved "https://registry.nlark.com/vue-async-computed/download/vue-async-computed-3.9.0.tgz#af3181c25168bfe9d86d8ffbc7033bf9e484fe84"
   integrity sha1-rzGBwlFov+nYbY/7xwM7+eSE/oQ=
 
+vue-drag-resize@^1.5.0-rc3, vue-drag-resize@^1.5.4:
+  version "1.5.4"
+  resolved "https://registry.nlark.com/vue-drag-resize/download/vue-drag-resize-1.5.4.tgz#f583f40f356e5792aa89109b3d13ba4407c25198"
+  integrity sha1-9YP0DzVuV5KqiRCbPRO6RAfCUZg=
+  dependencies:
+    vue-drag-resize "^1.5.0-rc3"
+
 vue-eslint-parser@^7.0.0:
   version "7.11.0"
   resolved "https://registry.npmmirror.com/vue-eslint-parser/download/vue-eslint-parser-7.11.0.tgz#214b5dea961007fcffb2ee65b8912307628d0daf"