centaline-data-driven-v3 0.0.61 → 0.0.62

package/package.json

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

package/src/components/Layout/Layout.vue

@@ -1,8 +1,9 @@
 <template>
     <div class="ct-Layout" v-if="Layout !== null && !loading">
         <ct-layoutchildren :rowindex="rowindex" :actionRouter="actionRouter" :rowdata="vmodel" :vmodel="LayoutList"
-            :flagflex="true" :parameterAction="parameterAction" :rowMenuDisplayCountForAPP="rowMenuDisplayCountForAPP"
-            @click="clickHandler" @changeHandler="changeHandler"></ct-layoutchildren>
+            :flagflex="true" :fields="fields" :parameterAction="parameterAction"
+            :rowMenuDisplayCountForAPP="rowMenuDisplayCountForAPP" @click="clickHandler"
+            @changeHandler="changeHandler"></ct-layoutchildren>
     </div>
 </template>
 <script setup lang="ts">
@@ -18,6 +19,7 @@ const props = defineProps({
     listData: Array,
     apiParam: Object,
     parameterAction: String,
+    fields: Array,
     formListactionRouter: {
         type: Array,
         default: [],
@@ -46,6 +48,9 @@ function init() {
         if (typeof props.vmodel !== "undefined") {
             load(props.vmodel, props.cellLayout);
         }
+        else if (props.fields) {
+            load(null, props.cellLayout);
+        }
     });
 }
 function load(data, cellLayout) {
@@ -106,6 +111,7 @@ function load(data, cellLayout) {
     }
     loading.value = false;
 }
+
 function getValue(data, val) {
     return val.split(".").reduce((data, currentVal) => {
         var rtn = data[common.initialsToLowerCase(currentVal)];
@@ -218,10 +224,10 @@ function xmlToJson(xml) {
                             }
                             else if (props.vmodel.delete && attribute.nodeValue == 'delete') {
                                 obj["rightRouter"] = true
-                            } 
+                            }
                             else if (props.vmodel.delete && attribute.nodeValue == 'moveup') {
                                 obj["rightRouter"] = true
-                            } 
+                            }
                             else if (props.vmodel.delete && attribute.nodeValue == 'movedown') {
                                 obj["rightRouter"] = true
                             } else {
@@ -302,7 +308,12 @@ function clickHandler(routerKey, rowindex, forname, forrowindex, flagHaveAlert)
     }
 }
 function changeHandler(field) {
-    emit("changeHandler", field, props.vmodel.$sourceIndex);
+    if (props.fields) {
+        emit("changeHandler", field);
+    }
+    else {
+        emit("changeHandler", field, props.vmodel.$sourceIndex);
+    }
 }
 </script>
 <style scoped>

package/src/components/Layout/LayoutChildren.vue

@@ -3,14 +3,14 @@
         <div style="display: flex;height: max-content;cursor: pointer;" :class="[flagflex == true ? 'flagflex' : '',model.className]"
             v-if="model.rightRouter && model.value != ''" :style="model.styleObject" @click="clickHandlerLayout()">
             <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index"
-                :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" :parameterAction="parameterAction"
+                :is="item.is" :vmodel="item" :rowindex="rowindex" :fields="fields" :forname="forname" :forrowindex="forrowindex" :parameterAction="parameterAction"
                 :rowMenuDisplayCountForAPP="rowMenuDisplayCountForAPP" @click="clickHandler" @changeHandler="changeHandler"></component>
         </div>
     </template>
     <div style="display: flex;height: max-content;" :class="[flagflex == true ? 'flagflex' : '',model.className]"
         v-else-if="model.value != '' && model.visibility != '0'" :style="model.styleObject">
         <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index"
-            :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex" :parameterAction="parameterAction"
+            :is="item.is" :vmodel="item" :rowindex="rowindex" :fields="fields" :forname="forname" :forrowindex="forrowindex" :parameterAction="parameterAction"
             :rowMenuDisplayCountForAPP="rowMenuDisplayCountForAPP" @click="clickHandler" @changeHandler="changeHandler"></component>
     </div>
 </template>
@@ -26,6 +26,7 @@ const props = defineProps({
     forname: String,
     forrowindex: String,
     parameterAction: String,
+    fields:Array,
     flagflex: {
         type: Boolean,
         default: false,

package/src/components/Layout/LayoutChildren1.vue

@@ -3,14 +3,14 @@
         <div style="display: flex;height: max-content;cursor: pointer;" v-if="model.rightRouter && model.value != ''"
             :style="model.styleObject" :class="model.className" @click="clickHandlerLayout($event)">
             <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index"
-                :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex"
+                :is="item.is" :vmodel="item" :rowindex="rowindex" :fields="fields" :forname="forname" :forrowindex="forrowindex"
                 :rowMenuDisplayCountForAPP="rowMenuDisplayCountForAPP" @click="clickHandler"></component>
         </div>
     </template>
     <div style="display: flex;height: max-content;" v-else-if="model.value != '' && model.visibility != '0'"
         :style="model.styleObject" :class="model.className">
         <component v-for="(item, index) in model.fields" :actionRouter="actionRouter" :rowdata="rowdata" :key="index"
-            :is="item.is" :vmodel="item" :rowindex="rowindex" :forname="forname" :forrowindex="forrowindex"
+            :is="item.is" :vmodel="item" :rowindex="rowindex" :fields="fields" :forname="forname" :forrowindex="forrowindex"
             :rowMenuDisplayCountForAPP="rowMenuDisplayCountForAPP" @click="clickHandler"></component>
     </div>
 </template>
@@ -26,6 +26,7 @@ const props = defineProps({
     forname: String,
     forrowindex: String,
     parameterAction: String,
+    fields:Array,
     rowMenuDisplayCountForAPP:{
         type: Number,
         default: 4,

package/src/components/Layout/LayoutField.vue

@@ -17,10 +17,23 @@ const props = defineProps({
     forname: String,
     forrowindex: String,
     parameterAction: String,
+    fields: Array,
 })
 const model = ref(null)
 model.value = CellLayout(props.vmodel);
-const field = props.rowdata[model.value.fieldName]
+const field = ref({})
+init()
+function init() {
+    if (props.fields) {
+        field.value= props.fields.find((v) => {
+            return v.fieldName1 === model.value.fieldName;
+        });
+    }
+    else {
+        field.value = props.rowdata[model.value.fieldName]
+    }
+}
+
 function changeHandler(field) {
     emit('changeHandler', field);
 }

package/src/components/app/Field.vue

@@ -10,6 +10,11 @@
                     </div>
                 </slot>
             </template>
+            <template #left-icon>
+                <slot name="PreLabel">
+                    <template v-if="model.preLabel1"><span style="display: flex;height: 28px;align-items: center;" v-html="model.preLabel1"></span></template>
+                </slot>
+            </template>
             <template #input>
                 <slot name="Control">
 

package/src/components/web/ContainerControl.vue

@@ -2,15 +2,22 @@
     <el-container v-if="model.fields.length > 0"
         :class="model.controlType != Enum.ControlType.Compound ? 'ct-container' : ''">
         <template v-if="model.controlType == Enum.ControlType.Compound">
-            <template v-for="(col, index) in model.fields" :key="index">
-                <div style="display: flex; flex: 0 0 100%;" v-if="col.show !== false && col.lineFeed"></div>
-                <div v-if="col.show !== false"
-                    :class="index > 0 && (col.controlLabel == '' || col.is == 'ct-button') ? 'complex-left-10' : ''"
-                    :style="{ 'width': (col.width != '0' ? col.width + 'px' : '100%'), 'flex': (col.width != '0' ? '0 0 ' + col.width + 'px' : '100%') }">
-                    <component ref="Fields" :is="col.is" :vmodel="col" :parameterAction="parameterAction"
-                        v-bind="col.bindPara" @fieldClick="fieldClickHandler(col)" @change="change(col)"
-                        @popupSearchList="popupSearchListHandler"></component>
-                </div>
+            <template v-if="model.layoutTemplate">
+                <ct-layout :fields="model.fields" :cellLayout="model.layoutTemplate" :parameterAction="parameterAction"
+                    :key="itemKey" @changeHandler="change">
+                </ct-layout>
+            </template>
+            <template v-else>
+                <template v-for="(col, index) in model.fields" :key="index">
+                    <div style="display: flex; flex: 0 0 100%;" v-if="col.show !== false && col.lineFeed"></div>
+                    <div v-if="col.show !== false"
+                        :class="index > 0 && (col.controlLabel == '' || col.is == 'ct-button') ? 'complex-left-10' : ''"
+                        :style="{ 'width': (col.width != '0' ? col.width + 'px' : '100%'), 'flex': (col.width != '0' ? '0 0 ' + col.width + 'px' : '100%') }">
+                        <component ref="Fields" :is="col.is" :vmodel="col" :parameterAction="parameterAction"
+                            v-bind="col.bindPara" @fieldClick="fieldClickHandler(col)" @change="change(col)"
+                            @popupSearchList="popupSearchListHandler"></component>
+                    </div>
+                </template>
             </template>
         </template>
         <template v-else>
@@ -46,14 +53,14 @@ const props = defineProps({
 })
 const model = initData(props, ContainerControl)
 const Fields = ref()
-
+const itemKey = ref(0)
 model.value.selfValidExcute = () => {
     let rtnBool = true;
     if (typeof Fields.value !== 'undefined') {
         Fields.value.forEach((f) => {
             if (f.model && typeof f.model.validExcute !== 'undefined') {
                 if (!f.model.validExcute(f.model)) {
-                    model.value.displayValidMessage=f.model.displayValidMessage
+                    model.value.displayValidMessage = f.model.displayValidMessage
                     rtnBool = false;
                 }
             }

package/src/components/web/File.vue

@@ -662,33 +662,11 @@ function PasteUpload(event) {
   }
 }
 
-function ListenerPaste(event) {
-  var target = event.target;
+function ListenerPaste(event) { 
   const uploads = document.querySelectorAll('[uploadStatus="upload"]');
-
-  if (!window.uploads) {
-    window.uploads = { count: 0, length: uploads.length };
-  }
-  if (uploads.length > 1) {
-    window.uploads.count = window.uploads.count + 1;
-    window.uploads.length = uploads.length;
-
-    if (window.uploads.count == window.uploads.length) {
-      window.uploads = null;
-      ElMessage({
-        message: "存在多个上传组件，请点击粘贴上传！",
-        type: 'info',
-        showClose: true,
-      });
-      return false;
-    }
-  }
-  else if (uploads.length == 1) {
-    window.uploads = null;
+   if (uploads.length == 1) { 
     PasteUpload(event);
   }
-
-
 }
 
 // 添加粘贴事件监听器

package/src/components/web/Image.vue

@@ -0,0 +1,23 @@
+<template>
+    <ct-field :vmodel="model">
+        <template #Control v-if="model.code1">
+            <div class="ct-image" style="width:100%;text-align: center">
+                <el-image :src="model.code1"
+                    :style="{ 'width': model.minValue1 ? model.minValue1 + 'px' : null, 'height': model.maxValue1 ? model.maxValue1 + 'px' : null, 'border-radius': (model.width1 || 0) + 'px' }">
+                </el-image>
+            </div>
+        </template>
+    </ct-field>
+</template>
+<script lang="ts" setup>
+const props = defineProps({
+    parameterAction: String,
+    vmodel: Object,
+    source: Object,
+})
+const model = props.vmodel
+defineExpose({
+    model
+})
+</script>
+<style scoped></style>

package/src/components/web/PhotoSelectList.vue

@@ -16,7 +16,7 @@
                                 @change="chooseRadio(item)" v-model="item.ischeck" :label="true">&nbsp;</el-radio>
                             <el-checkbox v-else style="margin: 0 5px;" @change="choose(item, true)"
                                 v-model="item.ischeck"></el-checkbox>
-                            <ct-layout :vmodel="item" :cellLayout="layout" :rowindex="index" :flagMediaSelect="true"
+                            <ct-layout :vmodel="item" :cellLayout="layout" :key="itemKey" :rowindex="index" :flagMediaSelect="true"
                                 @rolRouterclick="rolRouterCellClickHandler">
                             </ct-layout>
                         </div>
@@ -96,6 +96,7 @@ const options = ref([])
 const mediaLabelID = ref('')
 const loading = ref(true)
 const selectedMode = ref(2)
+const itemKey = ref(0)
 const optionAttrs = {
     label: 'name',
     value: 'code',
@@ -159,6 +160,7 @@ function load(data) {
                 options.value = data
             });
         }
+        itemKey.value = Math.random()
     } catch (e) {
         ElMessage({
             message: e,

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

@@ -584,8 +584,8 @@ function importComplete(res, field) {
         }
     }
     else {
-        if (field && field.changeCallBackFunName) {
-            this.changeCallBackHandler(field, field.changeCallBackFunName, res.content);
+        if (field && field.callBackFunName) {
+            this.changeCallBackHandler(field, field.callBackFunName, res.content);
         }
         else {
             doAction(res)

package/src/components/web/photo.vue

@@ -511,28 +511,8 @@ function PasteUpload(event) {
 
 function ListenerPaste(event) {
 
-  var target = event.target;
   const uploads = document.querySelectorAll('[uploadStatus="upload"]');
-
-  if (!window.uploads) {
-    window.uploads = { count: 0, length: uploads.length };
-  }
-  if (uploads.length > 1) {
-    window.uploads.count = window.uploads.count + 1;
-    window.uploads.length = uploads.length;
-
-    if (window.uploads.count == window.uploads.length) {
-      window.uploads = null;
-      ElMessage({
-        message: "存在多个上传组件，请点击上传！",
-        type: 'info',
-        showClose: true,
-      });
-      return false;
-    }
-  }
-  else if (uploads.length == 1) {
-    window.uploads = null;
+   if (uploads.length == 1) {
     PasteUpload(event);
   }
 

package/src/loader/src/Field.js

@@ -741,6 +741,13 @@ const Base = function (source, moreActionRouter) {
         set vueComponentName(v) {
             source.vueComponentName = v;
         },
+        // 控件类型为 VueCustomizedComponent 时 对应的 前端vue的组件名称
+        get layoutTemplate() {
+            return source.layoutTemplate;
+        },
+        set layoutTemplate(v) {
+            source.layoutTemplate = v;
+        },
         //Field结束
 
         collapseName: -1,//所属分组

package/src/loader/src/File.js

@@ -393,8 +393,10 @@ function handleAvatarSuccess(res, file, fileList, model) {
             model.fileList.push(res.content[0]);
             i = model.fileList.findIndex(v => v.uid === file.uid);
         }
+        data.uid = file.uid;
 
-        model.fileList[i] = { ...model.fileList[i], data }
+        model.fileList[i] = data;
+        //model.fileList[i] = { ...model.fileList[i], data }
         // rtn.fileList = fileList;//无数据会监听不到
     }
     else {

package/src/loader/src/Form.js

@@ -70,6 +70,12 @@ function loadFromModel(source, isFormList) {
           return rtn1[attrKey];
         }
       },
+      getValueByFieldNameFromParent(id, attrKey) {
+        if(this.form && this.form.parentModelForm){
+          return this.form.parentModelForm.getValueByFieldName(id, attrKey);
+        }
+        return null;
+      },
       //设置Field的属性attrKey的值
       setValueByFieldName(id, attrKey, attrValue) {
         attrKey = common.initialsToLowerCase(attrKey);
@@ -110,6 +116,12 @@ function loadFromModel(source, isFormList) {
           requiredHandle(rtn1, this.form);
         }
       },
+      setValueByFieldNameFromParent(id, attrKey, attrValue) {
+        if(this.form && this.form.parentModelForm){
+          return this.form.parentModelForm.setValueByFieldName(id, attrKey, attrValue);
+        }
+        return null;
+      },
       //设置Field的v1、v2的值
       setV1AndV2ByField1(id, code1, code2) {
         var rtn1 = this.fieldsDic[id];
@@ -395,6 +407,32 @@ function loadFromModel(source, isFormList) {
         common.message(message, type, center, duration, showClose, dangerouslyUseHTMLString)
       },
 
+    },    
+    getValueByFieldName(id, attrKey) {
+      attrKey = common.initialsToLowerCase(attrKey);
+      var rtn1 = this.fieldsDic[id];
+      if (rtn1) {
+          return rtn1[attrKey];
+      }
+    },
+    setValueByFieldName(id, attrKey, attrValue) {
+      attrKey = common.initialsToLowerCase(attrKey);
+      var rtn1 = this.fieldsDic[id];
+      if (rtn1) {
+        if(attrKey=='code1' && rtn1.controlType===4 
+          && attrValue!=undefined && attrValue!=null && attrValue!=''){
+            if(rtn1.decimals1 != undefined && rtn1.decimals1 != null && rtn1.decimals1>-1){
+              attrValue = Number(attrValue).toFixed(rtn1.decimals1)
+            }
+          }
+        rtn1[attrKey] = attrValue;
+        // this.self.hatchHandle(id, attrKey, attrValue, rtn1);
+
+        //用于处理源数据改动,强制更新视图数据 todo
+        // if (rtn1.self.$forceUpdate) {
+        //     rtn1.self.$forceUpdate();
+        // }
+      }
     },
     get source() {
       return source;
@@ -470,7 +508,9 @@ function loadFromModel(source, isFormList) {
             item.fields = []
             if (item.compoundFields) {
               item.compoundFields.forEach((v) => {
-                item.fields.push(LibFunction.GetControl(v, source, showLabel, isList))
+                let itemCompound = LibFunction.GetControl(v, source, showLabel, isList);
+                itemCompound.form = rtn;
+                item.fields.push(itemCompound)
               });
             }
           }

package/src/loader/src/LibFunction.js

@@ -247,8 +247,11 @@ const LibFunction = {
                 item = NumberWithPlusAndMinus(item)
                 item.is = 'ct-numberwithplusandminus'
                 break;
-            case Enum.ControlType.VueCustomizedComponent: 
-                item.is = 'ct-'+item.vueComponentName.toLowerCase();
+            case Enum.ControlType.VueCustomizedComponent:
+                item.is = 'ct-' + item.vueComponentName.toLowerCase();
+                break;
+            case Enum.ControlType.Image:
+                item.is = 'ct-image'
                 break;
             default:
                 item = Label(item)

package/src/loader/src/SearchScreen.js

@@ -77,8 +77,7 @@ function loadSearchScreenModel(source, prevParam) {
                 return v.controlType === Enum.ControlType.ButtonSearch;
             });
             var screens = rtn.sourceFieldsArr.filter((v, i) => {
-                return (advIndex === -1 || i < advIndex) && v.controlType !== Enum.ControlType.From
-                    || v.controlType == Enum.ControlType.Hidden;
+                return (advIndex === -1 || i < advIndex) && v.controlType !== Enum.ControlType.From;
             });
 
             rtnscreens = this.initScreen(screens);

package/src/main.js

@@ -21,8 +21,8 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 }
 
 app.use(centaline, {
-    baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
-    //baseUrl: "http://10.88.22.66:6060/onecard-api/",
+    //baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
+    baseUrl: "http://10.88.22.66:6060/xian/",
     //baseUrl: "http://10.1.245.50:38735/max-uplink-api/",
     //baseUrl: "http://10.1.245.111:38028/",
     flagRouterSelf: true,
@@ -63,8 +63,8 @@ app.use(centaline, {
             return {
                 //authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQBe-ydVay1xvvOl3sJA2HiPIxElSIJBIIcXdAQEfPFK-YZt4Nlm2EChqtDafOYWqpRG6kxLoTxZhUTSRxHLUPH_DHfOmt5SDWt1gHScieHapNiol94q5pXYoNFJAvJ6isGHWmNMYVcBjWtyCr_iW2JZ93-fqPc8f18MwGIqFRCIO1GXmWGYd9npCZJ6N5JjYZ7g8AAAD__w.HgtNKtHWooj8c9Hy_vB8CfKq-qOeHMp0irnW0DfXtHo"}',
                 //oldToken: 'd92d4a3b-2274-42e8-96f0-100ffb579b6e',
-                //authObject: '{token:"1-7acf3f06-c2ea-471c-a5fa-07e1c2a81728"}',
-                authObject: '{EmpID:"Token_0f977713-7a8d-420b-9536-967f8c8183c7",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_0f977713-7a8d-420b-9536-967f8c8183c7",Platform:"WEB"}',
+                authObject: '{token:"1-62bcf715-79c4-4a23-9780-269ea2f31478"}',
+                //authObject: '{EmpID:"Token_1f937895-684b-4db0-83e5-6a18ce16763b",MachineCode:"7a216b39-84af-43bb-842b-07604ac37a10",SSO_Token:"SSOToken_1f937895-684b-4db0-83e5-6a18ce16763b",Platform:"WEB"}',
             };
         },
         // 请求完成事件，可判断是否登录过期执行响应操作

package/src/utils/mixins.js

@@ -125,7 +125,6 @@ function validExcuteMessage(validtemp, model) {
 
 //路由操作事件
 export function RouterClickHandler(field, submitData, action, model, source, callBack) {
-    debugger
     if (source == 'form') {
         model.scripts.$fd = field.id;
         model.scripts.$result = [];
@@ -889,8 +888,8 @@ export function RouterClickHandler(field, submitData, action, model, source, cal
                                 if (callBack) {
                                     callBack(data);
                                 }
-                                if (field && field.changeCallBackFunName) {
-                                    model.$vue.changeCallBackHandler(field, field.changeCallBackFunName, data.content);
+                                if (field && field.callBackFunName) {
+                                    model.$vue.changeCallBackHandler(field, field.callBackFunName, data.content);
                                 }
                                 else if (field.isRefersh) {
                                     model.$vue.load(model.$vue.Form.loadFromModel(data.content));
@@ -1623,8 +1622,8 @@ export function RouterMouseenterHandler(field, submitData, action, model, source
                                 if (callBack) {
                                     callBack(data);
                                 }
-                                if (field && field.changeCallBackFunName) {
-                                    model.$vue.changeCallBackHandler(field, field.changeCallBackFunName, data.content);
+                                if (field && field.callBackFunName) {
+                                    model.$vue.changeCallBackHandler(field, field.callBackFunName, data.content);
                                 }
                                 else if (field.isRefersh) {
                                     model.$vue.load(model.$vue.Form.loadFromModel(data.content));

package/src/views/SearchList.vue

@@ -1,8 +1,8 @@
 <template>
   <div id="app-search" style="width:100%;height:100%;position: fixed;">
-    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
-      :searchDataApi="'/propertyPublishList/getListOfSearchModel'"
-      :searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist>
+    <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/admin/SchoolTeachingPlanList/getLayoutOfSearch'"
+      :searchDataApi="'/admin/SchoolTeachingPlanList/getListOfSearchModel'"
+      :searchStatsApi="'/admin/SchoolTeachingPlanList/getListStats'"></ct-searchlist>
     <ct-dialoglist ref="dialogList"></ct-dialoglist>
 
   </div>