centaline-data-driven-v3 0.1.31 → 0.1.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven-v3",
-  "version": "0.1.31",
+  "version": "0.1.33",
   "private": false,
   "description": "centaline-data-driven-v3",
   "main": "dist/centaline-data-driven-v3.umd.js",

package/src/components/web/Label.vue

@@ -1,6 +1,6 @@
 <template>
     <ct-field :vmodel="model">
-        <template #Control v-if="model.code1">
+        <template #Control>
             <template v-if="model.controlType == Enum.ControlType.HtmlLabel">
                 <span class="ct-html" :class="{ 'cursor-pointer': model.onChanged }" @click="clickHandle"
                     v-html="HtmlReplace(model.value)"></span>

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

@@ -51,6 +51,10 @@ const props = defineProps({
     Number,
     default: 500,
   },
+  apiParam: {
+    type: Object,
+    default: () => { },
+  }
 })
 const refTree = ref()
 const rootNode = ref();
@@ -64,7 +68,7 @@ const defaultProps = ref({
   id: 'code',
 })
 const searchStatus = ref([])
-
+const screenPara = ref(props.apiParam);
 const menuVisible = ref(false)//右键菜单显示控制
 const currentData = ref({ code: "" })// 当前节点所对应的数据
 const currentNode = ref(null)//当前节点对应的 Node
@@ -91,33 +95,34 @@ onBeforeUnmount(() => {
 
 //搜索（查询条件调用）
 function search(m) {
+  screenPara.value = m;
   if (searchStatus.value.length == 0) {
     // 重置计数器
     retryCount.value = 0
     if (qrtimer.value) clearTimeout(qrtimer.value);
     searchStatus.value.push('a');
     rootNode.value.childNodes = []
-    loadNode(rootNode.value, rootResolve.value, m)
+    loadNode(rootNode.value, rootResolve.value)
   }
   else {
     if (retryCount.value >= 50) {
-      console.warn(`搜索繁忙，请稍后再试`); 
+      console.warn(`搜索繁忙，请稍后再试`);
       return;
     }
     retryCount.value++
 
     qrtimer.value = setTimeout(() => {
-      search(m);
+      search();
     }, 200);
   }
 }
 //加载节点（点击节点加号时调用）
-function loadNode(node, resolve, m) {
+function loadNode(node, resolve) {
   if (node.level === 0) {
     loading.value = true;
     rootNode.value = node
     rootResolve.value = resolve;
-    return SearchTree(m || undefined).then(data => {
+    return SearchTree(screenPara.value || undefined).then(data => {
       loading.value = false;
       resolve(data.rows);
       load(data, true)
@@ -126,7 +131,15 @@ function loadNode(node, resolve, m) {
   if (node.level >= 1) {
     let fields = model.value.searchData("code", node.data.code, 9, 3);
     let filter = {
-      "searchData": fields
+      "searchData": {
+        // 先保留searchData的其他属性
+        ...(screenPara.value?.searchData || {}),
+        // 再合并fields数组（将两个数组合并，而不是覆盖）
+        fields: [
+          ...fields.fields,
+          ...(screenPara.value?.searchData?.fields || [])
+        ]
+      }
     };
     return SearchTree(filter).then(data => {
       loading.value = false;
@@ -204,7 +217,9 @@ function rightClick(event, object, Node) { // event、object该节点所对应
       }
     })
   }
-  document.addEventListener('click', closeMenu) // 监听事件鼠标点击事件，若点击则隐藏菜单 
+  if (menuVisible.value) {
+    document.addEventListener('click', closeMenu) // 监听事件鼠标点击事件，若点击则隐藏菜单 
+  }
 }
 //关闭菜单
 function closeMenu() {

package/src/components/web/Tree.vue

@@ -1,10 +1,11 @@
 <template>
     <div>
         <div ref="refscreenDiv" id="refscreenDiv">
-            <ct-searchscreen ref="reftreescreen" :from="'tree'" style="padding-left: 11px;" :api="searchConditionApi" :screenPara="apiParam"
-                @search="search" @loaded="screenload" ></ct-searchscreen>
+            <ct-searchscreen ref="reftreescreen" :from="'tree'" style="padding-left: 11px;" :api="searchConditionApi"
+                :screenPara="apiParam" @search="search" @loaded="screenload"></ct-searchscreen>
         </div>
-        <tree v-if="loadTree" ref="reftree" :api="searchDataApi"  @loaded="loaded" :treeHeight="treeHeight">
+        <tree v-if="loadTree" ref="reftree" :api="searchDataApi" @loaded="loaded" :treeHeight="treeHeight"
+            :apiParam="{ searchData:searchData }">
         </tree>
 
 
@@ -14,7 +15,7 @@
 import { ref, nextTick, watch, onMounted, onBeforeUnmount } from 'vue'
 import Tree from './Tree/Tree.vue';
 const emit = defineEmits(['loaded'])
-const loadTree=ref(false)
+const loadTree = ref(false)
 
 const props = defineProps({
     searchConditionApi: String,
@@ -33,19 +34,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;
-  }
+const searchData = ref([])
+const qrtimer = ref(null)
+onBeforeUnmount(() => {
+    if (qrtimer.value) {
+        clearTimeout(qrtimer.value);
+        qrtimer.value = null;
+    }
 })
 
 function setTreeHeight() {
     nextTick(() => {
         if (refscreenDiv.value) {
-          qrtimer.value = setTimeout(() => {
+            qrtimer.value = setTimeout(() => {
                 let searchHeight = refscreenDiv.value.offsetHeight;
                 treeHeight.value = props.searchtreeHeight - searchHeight;
             }, 200);
@@ -56,6 +57,7 @@ function setTreeHeight() {
 
 function search() {
     setTreeHeight();
+    searchData.value = reftreescreen.value?.model?.searchData;
     reftree.value.search(reftreescreen.value.model);
 }
 function loaded(data) {
@@ -64,15 +66,18 @@ function loaded(data) {
     } catch (e) { }
 }
 function screenload(data) {
-    loadTree.value=true
-    setTreeHeight();
+    nextTick(() => {
+        searchData.value = reftreescreen.value?.model?.searchData;
+        loadTree.value = true
+        setTreeHeight();
+    });
 }
 onMounted(() => {
 
 })
 watch(() => props.searchtreeHeight, () => {
     setTreeHeight();
-  }) 
+})
 // watch(() => reftreescreen.value?.model, // 监听子组件的someData属性  
 //     (newVal, oldVal) => {
 //         if (newVal?.searchData != oldVal?.searchData) { 

package/src/loader/src/Label.js

@@ -1,7 +1,7 @@
 import Enum from '../../utils/Enum';
 import base from '../index';
 function getFileNameVal(source) {
-   
+
     let lst = [];
     for (var i = 1; i <= 5; i++) {
         let fieldVal = "";
@@ -23,28 +23,34 @@ const Label = function (source) {
     let rtn = {
         flagJson: false,
         get value() {
-            if (source.code1) {
-                try {
-                    let _value = []
-                    var obj = JSON.parse(source.code1)
-                    if (typeof obj == 'object' && obj) {
-                        obj.forEach((v) => {
-                            if (!v.flagDeleted) {
-                                _value.push(v.name);
-                            }
-                        });
-                        rtn.flagJson = true;
-                        return _value;
-                    }
+            if (source.name1) {
+                 return source.name1;
+            }
+            else {
+                if (source.code1) {
+                    try {
+                        let _value = []
+                        var obj = JSON.parse(source.code1)
+                        if (typeof obj == 'object' && obj) {
+                            obj.forEach((v) => {
+                                if (!v.flagDeleted) {
+                                    _value.push(v.name);
+                                }
+                            });
+                            rtn.flagJson = true;
+                            return _value;
+                        }
 
-                } catch (e) {
+                    } catch (e) {
 
+                    }
                 }
+                let _value = [];
+                var joinChar = source.joinChar == undefined ? '' : source.joinChar;
+                _value = getFileNameVal(source);
+                return _value.join(joinChar);
             }
-            let _value = [];
-            var joinChar = source.joinChar == undefined ? '' : source.joinChar;
-            _value = getFileNameVal(source);
-            return _value.join(joinChar);
+
         }
     };
     rtn = base.copy(source, rtn);

package/src/main.js

@@ -65,7 +65,7 @@ app.use(centaline, {
         //获取请求头
         getRequestHeaders: function () {
             return {
-              authobject: '{token:"wufw-1988477363054436352",platform:"WEB"}',
+              authobject: '{token:"wufw-1988759777316159488",platform:"WEB"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
                 //authObject: '{token:"jiangzf-1958445358178844672",platform:"WEB"}',
                 //authObject: '{EmpID:"Token_4e09499b-4b76-46df-9ce5-5498d48ed062",MachineCode:"ae184643-f8e2-453c-a752-ba82612b592f",SSO_Token:"SSOToken_4e09499b-4b76-46df-9ce5-5498d48ed062",Platform:"WEB"}',

package/src/views/SearchList.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
-    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'RoleList/getLayoutOfSearch'"
-      :searchDataApi="'RoleList/getListOfSearchModel'"></ct-searchlist>
+    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'PersonHoliday_GuangzhouList/getLayoutOfSearch'"
+      :searchDataApi="'PersonHoliday_GuangzhouList/getListOfSearchModel'"></ct-searchlist>
 
        <!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/EmployeeMaternityList/getLayoutOfSearch'"
       :searchDataApi="'/EmployeeMaternityList/getListOfSearchModel'"></ct-searchlist> -->