centaline-data-driven-v3 0.0.90 → 0.0.92

package/src/components/web/SearchList/SearchTable.vue

@@ -230,7 +230,7 @@
     </div>
 </template>
 <script setup lang="ts">
-import { ref, nextTick, onActivated, onDeactivated } from 'vue'
+import { ref, nextTick, onActivated, onDeactivated, onBeforeUnmount } from 'vue'
 import common from '../../../utils/common'
 import request from '../../../utils/request'
 import SearchStats from './SearchStats.vue';
@@ -345,7 +345,19 @@ const getRowsRouterRef = (el, index) => {
 }
 const refHeadTr = ref()
 const refTableHead = ref()
-
+onBeforeUnmount(()=>{
+  if (model.value && typeof model.value.scripts !== 'undefined') {
+    model.value.scripts.formData.formTable = null;
+    model.value.scripts.formData = null;
+  }
+  window.removeEventListener("resize",  setTableHeight)
+  if(refTableParent.value){
+    refTableParent.value.removeEventListener("scroll", getScrollAttr);
+    refTableParent.value=null
+  }
+  refSearchTable.value = null;
+  model.value = null;
+})
 onActivated(() => {
     nextTick(() => {
         setTableHeight();
@@ -395,9 +407,7 @@ function load(data) {
     emit("loaded");
     setTableHeight()
     nextTick(() => {
-        window.addEventListener("resize", (ev) => {
-            setTableHeight();
-        });
+        window.addEventListener("resize", setTableHeight);
         currentRow.value = null;
         rowColorChange(model.value.selectIndex, true)
         fiexdHead()

package/src/components/web/SearchList.vue

@@ -44,7 +44,7 @@ import searchTable from './SearchList/searchTable.vue';
 import SearchCategory from './SearchList/SearchCategory.vue';
 import SearchSideMenu from './SearchList/SearchSideMenu.vue';
 import SearchSideRight from './SearchList/SearchSideRight.vue';
-import { ref, nextTick, onMounted, watch, onActivated } from 'vue'
+import { ref, nextTick, onMounted, watch, onActivated, onBeforeUnmount } from 'vue'
 const emit = defineEmits(['loaded', 'failLoad', 'tableLoaded', 'scrollHandle', 'rowClickHandle', 'refreshParent', 'submit', 'flagNotificationParentAfterContentChanged','drag'])
 const props = defineProps({
     vmodel: Object,
@@ -122,6 +122,9 @@ const RefSideRight = ref()
 const refSideMenu = ref()
 const flagShow = ref(true)
 const isLayout = ref(true)
+onBeforeUnmount(()=>{
+  window.removeEventListener('resize',resizeSearchList)
+})
 onMounted(() => {
     nextTick(() => {
         if (refMain.value) {
@@ -275,9 +278,7 @@ function tableLoaded() {
                 sideMenuClickHandler(status);
             }
         }
-        window.addEventListener("resize", (ev) => {
-            resizeSearchList();
-        });
+        window.addEventListener("resize", resizeSearchList);
     }
     else {
         flagSideBarOfData.value = false;

package/src/components/web/SearchScreen.vue

@@ -22,9 +22,9 @@
                             @SaveSearchWhere="SaveSearchWhere" @SearchWhereManage="SearchWhereManage"
                             @clickSearchWhere="clickSearchWhere"></component>
                         <br v-else-if="col.controlType === Enum.ControlType.LineFeed" />
-                        <component v-else :from="from" class="list-field" v-bind="col.listBind"
-                            :is="col.is" :vmodel="col" :parameterAction="model.parameterAction"
-                            @search="searchHandler(col)" @change="changeHandler(col)">
+                        <component v-else :from="from" class="list-field" v-bind="col.listBind" :is="col.is"
+                            :vmodel="col" :parameterAction="model.parameterAction" @search="searchHandler(col)"
+                            @change="changeHandler(col)">
                         </component>
                     </template>
                 </template>
@@ -55,7 +55,6 @@
 <script setup lang="ts">
 import { ref, nextTick, onDeactivated } from 'vue'
 import SearchScreen from '../../loader/src/SearchScreen'
-import Form from '../../loader/src/Form'
 import Enum from '../../utils/Enum'
 import common from '../../utils/common';
 const emit = defineEmits(['loaded', 'failLoad', 'showTitle', 'search', 'resetSearch', 'saveShortcut'])
@@ -114,6 +113,19 @@ function searchComplate(flagLoad) {
 //加载数据
 function load(data) {
     model.value = data;
+    if (model.value.scripts) {
+        model.value.scripts.formData = model.value.formData;
+        model.value.scripts.formData.form = model.value;
+        model.value.scripts.formData.excuteData = model.value.screen;
+        model.value.scripts.formData.fieldsDic = model.value.screenDic;
+        model.value.scripts.formData.source = SearchScreen;
+    }
+    if (model.value.onload) {
+        let onloads = model.value.onload.split(';');
+        onloads.forEach((v) => {
+            common.excute.call(model.value.scripts, v);
+        });
+    }
     setScreenShow();
     loading.value = false;
     emit('loaded', model.value.flagSearch);
@@ -139,8 +151,7 @@ function setScreenShow() {
 }
 //组件值发生变化时操作
 function changeHandler(field) {
-    SearchScreen.hiddenHandle(field, model.value);
-    Form.clearRelatedHandle(field, model.value.screen)
+    SearchScreen.changeHandler(field, model.value);
 }
 //按钮执行
 function searchHandler(field) {

package/src/components/web/Tree/Tree.vue

@@ -32,7 +32,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import { ref, nextTick, ComponentPublicInstance } from 'vue'
+import { ref, nextTick, ComponentPublicInstance, onBeforeUnmount } from 'vue'
 import common from '../../../utils/common'
 import { RouterClickHandler } from '../../../utils/mixins';
 import Enum from '../../../utils/Enum'
@@ -80,17 +80,24 @@ const handleSetInputMap = (el: refItem, item) => {
   }
 };
 
+const qrtimer=ref(null)
+onBeforeUnmount(()=>{
+  if (qrtimer.value) {
+    clearTimeout(qrtimer.value);
+    qrtimer.value = null;
+  }
+})
+
 //搜索（查询条件调用）
 function search(m) {
-  let timer;
   if (searchStatus.value.length == 0) {
-    clearTimeout(timer);
+    if(qrtimer.value)clearTimeout(qrtimer.value);
     searchStatus.value.push('a');
     rootNode.value.childNodes = []
     loadNode(rootNode.value, rootResolve.value,m) 
   }
   else {
-    timer = setTimeout(() => {
+    qrtimer.value = setTimeout(() => {
       search(m);
     }, 200);
   }

package/src/components/web/Tree.vue

@@ -11,7 +11,7 @@
     </div>
 </template>
 <script lang="ts" setup>
-import { ref, nextTick, watch, onMounted } from 'vue'
+import { ref, nextTick, watch, onMounted, onBeforeUnmount } from 'vue'
 import Tree from './Tree/Tree.vue';
 const emit = defineEmits(['loaded'])
 const loadTree=ref(false)
@@ -33,10 +33,19 @@ const refscreenDiv = ref()
 const reftreescreen = ref()
 const reftree = ref()
 const treeHeight = ref(0)
+
+const qrtimer=ref(null)
+onBeforeUnmount(()=>{
+  if (qrtimer.value) {
+    clearTimeout(qrtimer.value);
+    qrtimer.value = null;
+  }
+})
+
 function setTreeHeight() {
     nextTick(() => {
         if (refscreenDiv.value) {
-            setTimeout(() => {
+          qrtimer.value = setTimeout(() => {
                 let searchHeight = refscreenDiv.value.offsetHeight;
                 treeHeight.value = props.searchtreeHeight - searchHeight;
             }, 200);

package/src/components/web/ViewerFile.vue

@@ -228,6 +228,7 @@ const displayAreaHeight = ref(0)
 const downloadUrl = ref("")
 const downloadLoading = ref(false)
 const mediaLabelShow=ref(false)
+const qrtimer=ref(null)
 
 groupCountLen.value = 0;
 props.MediaAlbum.forEach((item, n) => {
@@ -294,7 +295,7 @@ function handDownloadUrl(url) {
     else {
         downloadUrl.value = getDownloadUrl(url) + "?download=1&" + Math.random();
     }
-    setTimeout(function () {
+    qrtimer.value = setTimeout(function () {
         downloadLoading.value = false;
     }, 1000);
 }
@@ -421,7 +422,11 @@ function enterFullscreen(n) {
     refviewerP360.value.enterFullscreen(n);
 }
 onUnmounted(() => {
-    window.onresize = null;
+  window.onresize = null;
+  if (qrtimer.value) {
+    clearTimeout(qrtimer.value);
+    qrtimer.value = null;
+  }
 })
 </script>
 <style scoped>

package/src/components/web/appContainer.vue

@@ -10,7 +10,7 @@
     </div>
 </template>
 <script setup>
-import { ref, nextTick, watch, onMounted } from 'vue'
+import { ref, nextTick, watch, onMounted, onBeforeUnmount } from 'vue'
 import AppContainer from '../../loader/src/AppContainer';
 import appContainerLayout from './appContainer/appContainerLayout.vue'
 
@@ -29,6 +29,9 @@ const appContainerLeft = ref(0)
 const appContainerHeight = ref(0)
 const appContainerWidth = ref(0)
 const refappContainer = ref()
+onBeforeUnmount(()=>{
+  window.removeEventListener('resize',setresize)
+})
 function init() {
 
     //初始化

package/src/components/web/dialog.vue

@@ -2,7 +2,7 @@
     <render />
 </template>
 <script setup>
-import { h, ref, onActivated, resolveComponent } from 'vue'
+import { h, ref, onActivated, resolveComponent, onBeforeUnmount } from 'vue'
 const emit = defineEmits(['close'])
 const props = defineProps({
     vmodel: Object,
@@ -12,6 +12,9 @@ const contentTop = ref(0)
 const content = ref()
 const captionBarButtons = ref([])
 const modelSelf = ref(null)
+onBeforeUnmount(()=>{
+  modelSelf.value=null
+})
 onActivated(() => {
     if (contentTop.value && content) {
         content.value.scrollTop = contentTop.value;
@@ -29,7 +32,7 @@ function scrollHandle(ev) {
     ev.stopPropagation();
 }
 
-const render = () => {
+const render = () => { 
     return h('div', {}, [
         h('div', {
             style: {

package/src/components/web/other/PopupSearchListTable.vue

@@ -57,7 +57,7 @@
     </div>
 </template>
 <script setup lang="ts">
-import { ref, nextTick } from 'vue'
+import { ref, nextTick, onBeforeUnmount } from 'vue'
 import { ElMessage } from 'element-plus'
 import common from '../../../utils/common'
 import { RouterClickHandler } from '../../../utils/mixins';
@@ -86,6 +86,11 @@ const isBusy = ref(false)
 const elTableHeight = ref(0)
 const selectCount = ref(0)
 const multipleTable = ref()
+
+onBeforeUnmount(()=>{
+  multipleTable.value.$el.querySelector('.el-scrollbar__wrap').removeEventListener('scroll', scrollHandle);
+  multipleTable.value=null;
+})
 function load(data) {
     loadingOne.value = false;
     model.value = data;

package/src/components/web/photo.vue

@@ -146,6 +146,8 @@ const refupload = ref()
 const QRCodeRef = ref()
 const UploadhttpRequest = ref({})
 const model = ref(null)
+const qrtimer1=ref(null)
+const qrtimer2=ref(null)
 
 const headers = computed(() => {
   return common.getDataDrivenOpts().handler.getRequestHeaders();
@@ -222,7 +224,7 @@ function handleRemove(file) {
   }).then(() => {
     Photo.deleteFile(file, false, model.value);
     selfValidExcute("remove");
-    setTimeout(() => {
+    qrtimer1.value = setTimeout(() => {
       QRCodeLocate();
     }, 1080);
 
@@ -274,7 +276,7 @@ function uploadProcess(event, file, fileList) {
   file.loadProgress = parseInt(event.percent); // 动态获取文件上传进度
   if (file.loadProgress >= 100) {
     file.loadProgress = 100;
-    setTimeout(() => {
+    qrtimer2.value = setTimeout(() => {
       file.progressFlag = false;
     }, 1000); // 一秒后关闭进度条
   }
@@ -522,10 +524,21 @@ function ListenerPaste(event) {
 document.addEventListener('paste', ListenerPaste);
 onBeforeUnmount(() => {
   //销毁定时上传
-  clearTimeout(model.value.qrtimer);
+  if (model.value.qrtimer) {
+    clearTimeout(model.value.qrtimer);
+    model.value.qrtimer = null;
+  }
   window.removeEventListener('scroll', model.value.QRCodeLocate, true)
   //销毁贴事件监听器 
   document.removeEventListener('paste', ListenerPaste)
+  if (qrtimer1.value) {
+    clearTimeout(qrtimer1.value);
+    qrtimer1.value = null;
+  }
+  if (qrtimer2.value) {
+    clearTimeout(qrtimer2.value);
+    qrtimer2.value = null;
+  }
 })
 defineExpose({
   model

package/src/loader/src/Field.js

@@ -829,6 +829,11 @@ const Base = function (source, moreActionRouter) {
                     }
                     else {
                         this.value = this.defaultCode1
+                        if(this.searchName){
+                            this.searchName=''
+                            this.searchValue=''
+                            this.searchValue1=''
+                        }
                     }
 
                 }

package/src/loader/src/SearchScreen.js

@@ -1,7 +1,9 @@
+import base from '../index';
 import LibFunction from './LibFunction';
 import Enum from '../../utils/Enum';
 import common from '../../utils/common';
 import request from '../../utils/request';
+import formData from '../../utils/formData';
 
 function loadSearchScreenApi(action, callBack, screenPara, prevParam, failCallBack) {
     if (action) {
@@ -26,6 +28,7 @@ function loadSearchScreenApi(action, callBack, screenPara, prevParam, failCallBa
 }
 function loadSearchScreenModel(source, prevParam) {
     let rtn = {
+        formData:formData,
         get title() {
             return source.title;
         },
@@ -41,6 +44,22 @@ function loadSearchScreenModel(source, prevParam) {
         get parameterAction() {
             return source.parameterAction
         },
+        _scripts: null,
+        get scripts() {
+            if (rtn._scripts !== null) {
+                return rtn._scripts;
+            }
+            else {
+                if (source.scripts) {
+                    rtn._scripts = base.common.eval(source.scripts);
+                    return rtn._scripts;
+                }
+                else {
+                    rtn._scripts = base.common.eval("");
+                    return rtn._scripts;
+                }
+            }
+        },
         _screen: null,
         _btnScreen: null,
         _highScreen: null,
@@ -415,12 +434,52 @@ function getAction(api, callback) {
             }
         });
 }
+function changeHandler(field, model){
+      hiddenHandle(field, model);
+      clearRelatedHandle(field, model.screen)
+      if (field.onChanged) {
+        if (model.scripts) {
+          model.scripts.formData.setExcuteListData(model.screen);
+        }
+        model.scripts.$fd = field.id;
+        common.excute.call(model.scripts, field.onChanged);
+      }
+      if (field.onAfterChanged && field.controlType !== Enum.ControlType.NumericTextBox) {
+        var router = model.actionRouters.find((v) => {
+          return v.key === field.onAfterChanged;
+        });
+        if (router) {
+          model.$vue.clickHandler(router);
+        }
+        else {
+          if (model.scripts) {
+            model.scripts.formData.setExcuteListData(model.fields);
+          }
+          model.scripts.$fd = field.id;
+          common.excute.call(model.scripts, field.onAfterChanged);
+        }
+      }
+}
+//清除关联当前组件的组件值
+function clearRelatedHandle(field, fields) {
+    var f = fields.filter((v) => {
+      return v.parentField && field.fieldName1 && (',' + v.parentField + ',').indexOf(',' + field.fieldName1 + ',') > -1;
+    });
+    f.forEach((v) => {
+      if (v.reset) {
+        v.reset();
+      }
+      clearRelatedHandle(v, fields)
+    });
+  }
 const SearchScreen = {
     loadSearchScreenApi,
     loadSearchScreenModel,
     hiddenHandle,
     isHandle,
     getNewSearchValue,
-    getAction
+    getAction,
+    changeHandler,
+    clearRelatedHandle
 };
 export default SearchScreen;

package/src/main.js

@@ -30,10 +30,10 @@ app.use(centaline, {
     //baseUrl: "http://10.1.245.111:38028/",
 
     flagRouterSelf: true,
-    flagApp: true,//是否app端
+    flagApp: false,//是否app端
     zindex: 999,
     showRequestSuccessMessage: true,
-    showRequestErrorMessage: true,
+    showRequestErrorMessage: false,
     language: 'HK',
     handler: {
         // 打开tab页
@@ -68,7 +68,7 @@ app.use(centaline, {
                 //authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"1-bce18a8d-21f0-4022-a6ca-450de105cafc"}',
-                authObject: '{EmpID:"Token_24ffcd48-4caa-4158-af20-b6dea70d869e",MachineCode:"7c4b2ffd-920a-462c-a586-37bbfb45c4fe",SSO_Token:"SSOToken_24ffcd48-4caa-4158-af20-b6dea70d869e",Platform:"IOS"}',
+                authObject: '{EmpID:"Token_0b4aa384-effe-43ec-9912-dddce2cd9709",MachineCode:"7c4b2ffd-920a-462c-a586-37bbfb45c4fe",SSO_Token:"SSOToken_0b4aa384-effe-43ec-9912-dddce2cd9709",Platform:"WEB"}',
             };
         },
         getToken() {

package/src/utils/common.js

@@ -285,7 +285,10 @@ const common = {
         showDialog({ title: '提示', message: message, closeOnClickOverlay: true, confirmButtonText: this.LocalizedString('确定', '確認'), className: 'showDialogMessage' });
       }
       else {
-        showToast(message);
+        showToast({
+          message: message,
+          duration: 3000,
+        });
       }
 
     }