centaline-data-driven 1.5.95 → 1.5.97

package/build/centaline/centaline.path.js

@@ -65,6 +65,8 @@ const paths = {
     "dynamicCalendar": "./src/centaline/dynamicCalendar/index.js", //日历控件
     "dynamicLH": "./src/centaline/dynamicLH/index.js", //html 标签
     "dynamicImage": "./src/centaline/dynamicImage/index.js", //图片
+    "dynamicAppContainer": "./src/centaline/dynamicAppContainer/index.js", //
+
   },
   "plugs": {
     "api": "./src/centaline/api/index.js", //调用API插件

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven",
-  "version": "1.5.95",
+  "version": "1.5.97",
   "description": "ccai",
   "author": "hjc <3226136347@qq.com>",
   "private": false,

package/release-log.md

@@ -1,3 +1,22 @@
+# v1.5.97
+2024-01-29
+新增
+
+容器布局组件 appContainer
+
+优化
+
+列表组件增加重新加载方法
+
+单选框点击文字选中时，没有触发change事件
+
+# v1.5.96
+2024-01-22
+优化
+
+日历控件只显示当前月天
+
+
 # v1.5.95
 2024-01-11
 优化

package/src/Form.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
     <!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
-    <ct-form :api="'/Worklist/getLayoutOfMyApply'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
+    <ct-form :api="'/necessaryfile/ContractConfirmImport/getContractConfirmImportForm'" :apiParam="apiParam" :topHeight="topHeight"></ct-form>
     <ct-dialog-list></ct-dialog-list>
   </div>  
 </template>
@@ -12,7 +12,7 @@
     data() {
       return {
         apiParam:{
-          "instanceID":"1735136386186612736","actionType":3
+          
         },
         topHeight:10,
       }

package/src/centaline/dynamicAppContainer/index.js

@@ -0,0 +1,13 @@
+import dynamicAppContainer from './src/dynamicAppContainer'
+import api from '../api/index'
+
+dynamicAppContainer.install = function (Vue) {
+  Vue.component(dynamicAppContainer.name, dynamicAppContainer);
+  Vue.use(api);
+}
+
+if (typeof window !== 'undefined' && window.Vue) {
+  window.Vue.use(dynamicAppContainer);
+}
+
+export default dynamicAppContainer;

package/src/centaline/dynamicAppContainer/src/dynamicAppContainer.vue

@@ -0,0 +1,67 @@
+<template>
+  <div class="common-layout"  v-loading="loading">
+
+    <appContainerLayout :apps="model.apps" :layouts="model.layouts" v-if="model !== null && !loading" :firstLoad="true"></appContainerLayout>
+  </div>
+</template>
+
+<script>
+import appContainerLayout from "./dynamicAppContainerLayout.vue";
+import dynamicElement from '../../mixins/dynamicElement'
+
+export default {
+  name: 'ct-appContainer',
+  mixins: [dynamicElement],
+  components: {
+    "appContainerLayout": appContainerLayout,
+  },
+  props: {
+    api: String,
+    vmodel: Object,
+    source: Object,
+    apiParam: Object,
+  },
+  data() {
+    return {
+      loading: true
+    }
+  },
+  methods: {
+    init() {
+      var self = this;
+      //初始化
+      this.loading = true;
+      this.$nextTick(function () {
+        if (typeof self.source !== 'undefined') {
+          self.load(self.loaderObj.AppContainer(self.source));
+        }
+       else if (typeof self.api !== 'undefined') {
+          self.loaderObj.AppContainer(self.api, this.apiParam, self.load);
+        }
+        else if (self.vmodel) {
+          self.load(self.vmodel);
+        }
+      });
+    },
+    load(data) { 
+      this.model = data;
+      this.model.self = this;
+      this.loading = false;
+    },
+  },
+  mounted() {
+    this.init();
+  },
+}
+</script>
+<style>
+body {
+  height: 100%;
+  overflow: hidden;
+  background: #ddd;
+}
+
+html {
+  height: 100%;
+}
+</style>

package/src/centaline/dynamicAppContainer/src/dynamicAppContainerLayout.vue

@@ -0,0 +1,136 @@
+<template>
+    <div style="width: 100%;" :class="{ 'isFlex': isFlex }">
+        <template v-for="(item, index) in layouts" style="width: 100%;">
+            <component :is="'el'+item.containerLayoutType" :width="item.width"
+                :style="{ width: item.width, height: item.height, 'margin-top': !firstLoad && item.containerLayoutType == 'Container' ? '0px' : '', 'padding-bottom': '5px' }"
+                :height="item.height">
+                <template v-if="item.appID">
+                    <template v-for="(app) in getAppParm(item.appID)">
+                        <template v-if="app.relationAppID == '' || (app.relationAppID != '' &&
+                            JSON.stringify(apiParam) != '{}')">
+                            <component :is="'ct-'+app.appType" :searchConditionApi="app.searchConditionAction"
+                                :appID="app.appID" :ref="'ref' + app.appID" :key="index" 
+                                :searchDataApi="app.searchDataAction" @rowClickHandle="rowClickHandle" :apiParam="apiParam"
+                                :style="{ 'padding-left': index > 0 ? '10px' : '' }" :from="'hasTop'">
+                            </component>
+                            <!-- <ct-searchlist :searchConditionApi="app.searchConditionAction" :appID="item.appID"
+                                :ref="'ref' + item.appID" :key="index" :searchDataApi="app.searchDataAction"
+                                @rowClickHandle="rowClickHandle" :apiParam="apiParam"></ct-searchlist> -->
+                        </template>
+                    </template>
+                </template>
+
+                <dynamicAppContainerLayout v-if="item.layouts && item.layouts.length > 0" :layouts="item.layouts"
+                    :apps="apps" :apiParam="screenPara" :parentAppID="appID" :firstLoad="false" />
+            </component>
+
+        </template>
+
+    </div>
+</template>
+<script>
+import dynamicSearchList from "../../dynamicSearchList/src/dynamicSearchList";
+import dynamicCalendar from "../../dynamicCalendar/src/dynamicCalendar";
+
+export default {
+    name: 'dynamicAppContainerLayout',
+    components: {
+        "ct-Calendar": dynamicCalendar,
+        "ct-Search": dynamicSearchList,
+    },
+    props: {
+        layouts: {
+            type: Array,
+            default: () => [],
+        },
+        apps: {
+            type: Array,
+            default: () => { },
+        },
+        apiParam: {
+            type: Object,
+            default: () => { },
+        },
+        parentAppID: {
+            type: String,
+            default: "",
+        },
+        firstLoad: {
+            type: Boolean,
+            default: true,
+        },
+    },
+    data() {
+        return {
+            screenPara: {},
+            appID: "",
+            appIDs: {}
+        }
+    },
+    computed: {
+        isFlex() {
+            return this.layouts.some(n => {
+                return n.containerLayoutType == "Aside"
+            })
+
+        },
+
+    },
+    created() {
+    },
+    mounted() {
+    },
+    methods: {
+        getAppParm(appID) {
+            let item = this.apps.filter((v) => {
+                return v.appID === appID
+            });
+            this.appIDs[appID] = appID
+            return item;
+        },
+        rowClickHandle(data, appID) {
+            this.appID = appID;
+            this.screenPara = data;
+        },
+    },
+    watch: {
+        //监听父级传过来的的数据
+        apiParam: function (newVal, oldVal) {
+            let self = this;
+            self.$nextTick(() => {
+                //循环同级组件，相同父级关联ID重新调用查询
+                for (let appID in self.appIDs) {
+
+                    let index = self.apps.findIndex((v) => {
+                        return v.appID === appID
+                    });
+                    let item = self.apps[index];
+                    if (!(item && item.relationAppID)) {
+                        return;
+                    }
+                    else if (item && (self.parentAppID && item.relationAppID == self.parentAppID)) {
+                        if (self.apiParam && JSON.stringify(self.apiParam) != '{}') {
+                            if (self.$refs['ref' + appID][0].reload)
+                                self.$refs['ref' + appID][0].reload(self.apiParam)
+                        }
+                    }
+
+                }
+
+            })
+        },
+    },
+} 
+</script>
+<style scoped>
+.isFlex {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
+}
+
+.el-header,
+.el-main {
+    padding: 0px;
+}
+</style>

package/src/centaline/dynamicCalendar/src/dynamicCalendar.vue

@@ -42,7 +42,7 @@
           <section
             v-for="(item, index) in getDayData(value.day)"
             :key="index"
-            v-if="model.columns"
+            v-if="value.isCurrentMonth&&model.columns"
           >
             <div v-for="(col, index) in model.columns" :key="index">
               <div v-if="col.fieldName != 'operation'">

package/src/centaline/dynamicCb/src/dynamicCb.vue

@@ -7,7 +7,7 @@
         </div>
         <div class="ct-radios">
           <el-checkbox v-model="model.value" :disabled="model.lock" @change="changeCheckBoxHandler"></el-checkbox>
-		  <span v-show="model.sufLabel1" style="margin-left:1px;color: #767A81;">{{ model.sufLabel1 }}</span>
+		      <span v-show="model.sufLabel1" style="margin-left:1px;color: #767A81;">{{ model.sufLabel1 }}</span>
         </div>
       </div>
       <transition name="el-fade-in">
@@ -56,8 +56,9 @@
         }
       },
       toggleCheckbox() {
-    this.model.value = !this.model.value;
-  },
+        this.model.value = !this.model.value;
+        this.changeCheckBoxHandler();
+      },
       changeCheckBoxHandler: function (event) {
         this.changeHandler();
         if(this.model.autoSearch) this.$emit('click');

package/src/centaline/dynamicSearchList/src/dynamicSearchList.vue

@@ -1,5 +1,5 @@
 <template>
-  <div ref="main" style="width: 100%;height: 100%;display: flex;" :class="{'domDisabled':pageDisabled}">
+  <div ref="main" style="width: 100%;height: 100%;display: flex;" :class="{'domDisabled':pageDisabled}"  v-if="flagShow">
     <div class="ct-search-list" :style="{'height': pageHeightReal? pageHeightReal:'100%','width':searchWidth?searchWidth+'px':'100%'}" > 
       <div slot="header" class="clearfix" v-if="typeof title !== 'undefined' && showTitle">
         <span style="font-weight:bold">{{title}}</span>
@@ -7,7 +7,7 @@
       <ct-searchcategory v-if="searchCategoryApi" ref="category" :api="searchCategoryApi"  @loadedCategory="categoryLoaded" 
       @loadedCategoryError="categoryLoadedError" @changeCategory="categorychange" ></ct-searchcategory>
 
-      <ct-searchscreen ref="screen" :api="searchConditionApi" :key="reloadKeyScreen"
+      <ct-searchscreen ref="screen" :api="searchConditionApi" :key="reloadKeyScreen" 
       @loaded="screenLoaded" :screenPara="screenPara" @resetSearch="resetSearch()"
       :categoryLoaded="loaded.categoryLoaded" @search="search()" @saveShortcut="saveShortcut" 
       @showTitle="showTitleScreenHandler"></ct-searchscreen>
@@ -51,7 +51,8 @@
       'ct-SearchSideMenu': dynamicSearchSideMenu,
       'ct-Detail': ()=>import('../../dynamicDetail/src/dynamicDetail.vue'),
     },
-    props: {
+  props: {
+     appID:String,
       vmodel: Object,
       searchCategoryApi: String,
       searchConditionApi: String,
@@ -122,6 +123,7 @@
         drowerClose:'',
         listHeight:0,
         pageHeightReal: '',
+        flagShow: true
         
       }
     },
@@ -189,13 +191,23 @@
         this.reloadKeyScreen='s'+this.reloadKey;
         this.reloadKeyTable='t'+this.reloadKey;
       },
+       
+      reload() {
+        this.screenPara=this.apiParam;
+        let self = this;
+        this.flagShow = false;
+        self.$nextTick(() => { 
+          this.flagShow = true;
+        })
+      },
       search() {
+        
         this.selectIndex=-1;
         if (this.$refs.table.model) {
           this.pageDisabled=true;
           this.$refs.table.getPage(1);          
         }
-        else {
+        else { 
           this.$refs.table.searchComplate(this.$refs.screen.model,this.$refs.screen.model.defaultSearch);
         }
       },
@@ -358,7 +370,7 @@
       },
       rowClickHandle() {
         var self = this;
-        if ( self.selectIndex !== self.$refs.table.model.selectIndex && self.$refs.table.model.rowSelectRouter) {
+        if (self.selectIndex !== self.$refs.table.model.selectIndex && self.$refs.table.model.rowSelectRouter) {
           self.selectIndex = self.$refs.table.model.selectIndex;
           self.rowCount = self.$refs.table.model.listData.length;
           if (this.sideBarStatus && this.sideBarStatus == "open") {
@@ -375,15 +387,15 @@
           }
           try {
             let ApiParam = {};
-            if (self.$refs.table.model.rowSelectRouter.submitListField) {
+            if (self.$refs.table.model.rowSelectRouter.submitListField&&self.$refs.table.model.listData.length>0) {
               self.$refs.table.model.rowSelectRouter.submitListField.forEach((k) => {
+                
                 ApiParam[k] = self.$refs.table.model.listData[self.selectIndex][k];
               });
             }
-
-            this.$emit("rowClickHandle",ApiParam);
-          } 
-          catch (e) {}
+            this.$emit("rowClickHandle", ApiParam, self.appID);
+          }
+          catch (e) { }
         }
       },
       refreshRowHandle(){