centaline-data-driven-v3 0.0.91 → 0.0.93

package/package.json

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

package/src/assets/commonApp.css

@@ -47,7 +47,7 @@
   left: 0px;
   right: 0px;
   border-radius: 0px 0px 4px 4px;
-  position: absolute;
+  position: fixed;
   background-color: rgb(255, 255, 255);
   width: 100%;
   margin: auto;

package/src/components/app/Form.vue

@@ -155,6 +155,22 @@ init()
 function init() {
     showLoadingToast({ message: '', duration: 10000 });
     loading.value = true
+    const isAndroid = /Android/i.test(navigator.userAgent);
+    if (isAndroid) {
+        // 动态检测键盘状态
+        let viewportHeight = window.innerHeight;
+
+        window.addEventListener('resize', () => {
+            const newHeight = window.innerHeight;
+            const keyboardHeight = viewportHeight - newHeight;
+
+            if (keyboardHeight > 100) { // 键盘弹出
+                document.querySelector('.button-absoluteAPP').style.bottom = `${keyboardHeight}px`;
+            } else { // 键盘收起
+                document.querySelector('.button-absoluteAPP').style.bottom = '0';
+            }
+        });
+    }
     nextTick(function () {
         if (props.drowerClose && props.drowerClose == 'open') {
             return;
@@ -248,7 +264,7 @@ function setFormHeight() {
             h2 = refForm.value.offsetTop
         }
         let formHeight = h1 - h2
-        if ((common.flagMicroMessenger()||common.flagHK())&&model.value.buttons.findIndex((v) => { return v.show }) > -1) {
+        if ((common.flagMicroMessenger() || common.flagHK()) && model.value.buttons.findIndex((v) => { return v.show }) > -1) {
             formHeight = formHeight - 64
         }
         model.value.formHeight = formHeight

package/src/components/app/TextBox.vue

@@ -11,7 +11,7 @@
         <van-field clearable :type="model.inputType" :rows="model.rows" v-bind="model.attrs" v-model="model.code1"
             :readonly="model.readonly" :disabled="model.locked" :maxlength="model.maxValue1"
             :show-word-limit="model.showWordLimit" :label-align="model.inputType == 'textarea' ? 'top' : 'left'"
-            @input="changeHandler(model, emit)" class="ct-text" autocomplete="off">
+            @input="input()" @blur="change()" class="ct-text" autocomplete="off">
             <template #label v-if="model.showLabel && model.controlLabel">
                 <div :class="[model.required ? 'requiredLabel' : '']"
                     :style="model.isList ? 'white-space: nowrap' : ''">
@@ -49,7 +49,16 @@ function popupSearchListHandle() {
     let isSingle = model.value.moreActionRouter.isSingle
     emit('popupSearchList', isSingle, model, model.value.moreActionRouter);
 }
-
+function input() {
+  if(model.value.controlType===Enum.ControlType.MultiLineText || model.value.controlType===Enum.ControlType.TextBox){
+  }
+  else{
+    change();
+  }
+} 
+function change() {
+  changeHandler(model.value, emit);
+}
 defineExpose({
     model
 })

package/src/components/app/searchScreen.vue

@@ -163,6 +163,7 @@ function load(data) {
         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(';');
@@ -204,7 +205,7 @@ function setscreendata() {
             v.controlType !== Enum.ControlType.LineFeed
         );
     });
-    if (screens.length > 1) {
+    if (screens.length > 3) {
         ismore.value = true;
         screens = screens.splice(0, 3);
     }

package/src/components/web/ContainerControl.vue

@@ -12,7 +12,7 @@
                     <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 && col.width>0 ? col.width + 'px' : '100%'), 'flex': (col.width && col.width>0? '0 0 ' + col.width + 'px' : '100%') }">
+                        :style="{ 'width': (col.width && col.width>0 ? col.width + 'px' : ''), 'flex': (col.width && col.width>0? '0 0 ' + col.width + 'px' : '') }">
                         <component ref="Fields" :is="col.is" :vmodel="col" :parameterAction="parameterAction"
                             v-bind="col.bindPara" @fieldClick="fieldClickHandler(col)" @change="change(col)"
                             @popupSearchList="popupSearchListHandler"></component>

package/src/components/web/Form.vue

@@ -173,8 +173,8 @@
 
         </div>
         <template v-if="model?.aiAttr?.showAI && !showAI">
-            <div class="btn-avatar" @click="AIToggle">
-                <img class="avatar-img" :src="util.getAssetsImage('AIChat.png')" :alt="model?.aiRouter.controlLabel"
+            <div class="btn-avatar" @click.stop="AIToggle">
+                <img class="avatar-img" @click.stop="AIToggle" :src="util.getAssetsImage('AIChat.png')" :alt="model?.aiRouter.controlLabel"
                     :title="model?.aiRouter.controlLabel">
             </div>
         </template>
@@ -267,6 +267,7 @@ onBeforeUnmount(()=>{
     model.value.scripts.formData.fieldsDic = null;
     model.value.scripts.formData = null;
   }
+  Fields.value = null;
   refForm.value = null;
   model.value = null;
   if (qrtimer1.value) {
@@ -686,6 +687,7 @@ function buttonsWidth() {
 .avatar-img {
     height: 50px;
     animation: bounce 0.5s infinite ease-in-out;
+    cursor: pointer;
     /* 使用ease-in-out让动画更平滑 */
 }
 

package/src/components/web/Label.vue

@@ -2,7 +2,7 @@
     <ct-field :vmodel="model">
         <template #Control v-if="model.code1">
             <template v-if="model.controlType==Enum.ControlType.HtmlLabel">
-                <span class="ct-html" @click="clickHandle" v-html="model.value"></span>
+                <span class="ct-html" :class="{ 'cursor-pointer': model.onChanged }"  @click="clickHandle" v-html="model.value"></span>
             </template>
             <template v-else-if="model.flagJson">
                 <el-tag v-for="item in model.value" :key="item" type="info" :disable-transitions="true" style="margin: 2px 6px 2px 0px;">{{ item
@@ -16,7 +16,7 @@
                         <div :style="{ 'width': (model.value.length > 66 ? '400px' : 'auto') }" v-html="model.value">
                         </div>
                     </template>
-                    <span class="ct-lable" @mouseover="onMouseOver($event)" v-html="model.value" @click="clickHandle"></span>
+                    <span class="ct-lable" :class="{ 'cursor-pointer': model.onChanged }"  @mouseover="onMouseOver($event)" v-html="model.value" @click="clickHandle"></span>
                 </el-tooltip>
                 <span class="unitName">{{ model.unitName1 }}</span>
             </template>
@@ -92,4 +92,8 @@ defineExpose({
     --el-tag-text-color: var(--el-color-info);
     color: var(--el-color-info);
 }
+
+.cursor-pointer {
+  cursor: pointer; /* 鼠标悬停时显示为“小手”形状 */
+}
 </style>

package/src/components/web/SearchScreen.vue

@@ -118,6 +118,7 @@ function load(data) {
         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(';');

package/src/loader/src/SearchScreen.js

@@ -3,6 +3,7 @@ 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) {
@@ -27,395 +28,7 @@ function loadSearchScreenApi(action, callBack, screenPara, prevParam, failCallBa
 }
 function loadSearchScreenModel(source, prevParam) {
     let rtn = {
-        formData: {
-            form: null,
-            formTable: null,
-            excuteData: null,//fields
-            fieldsDic: null,//fieldsDic
-            _excuteListData: undefined,
-            enableRelationFields(FlagRelation) {
-              this.form.enableRelationFields = FlagRelation
-            },
-            //获取code1
-            getCode1ByField1(id) {
-              var rtn1 = this.fieldsDic[id];
-              if (rtn1) {
-                return rtn1.code1;
-              }
-            },
-      
-            //获取code2
-            getCode2ByField1(id) {
-              var rtn1 = this.fieldsDic[id];
-              if (rtn1) {
-                return rtn1.code2;
-              }
-            },
-            setActionRouter(id, attrKey, attrValue) {
-              var router = this.form.actionRouters.find((v1) => {
-                return v1.key === id;
-              });
-              if (router) {
-                router[attrKey] = attrValue;
-              }
-            },
-            //获取Field的属性attrKey的值
-            getValueByFieldName(id, attrKey) {
-              attrKey = common.initialsToLowerCase(attrKey);
-              var rtn1 = this.fieldsDic[id];
-              if (rtn1) {
-                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);
-              var rtn1 = this.fieldsDic[id];
-              if (rtn1) {
-                if (attrKey == 'code1' && rtn1.controlType === Enum.ControlType.NumericTextBox
-                  && attrValue != undefined && attrValue != null && attrValue != '') {
-                  if (rtn1.decimals1 != undefined && rtn1.decimals1 != null && rtn1.decimals1 > -1) {
-                    attrValue = Number(attrValue).toFixed(rtn1.decimals1)
-                  }
-                }
-                else if (attrKey == 'code1' && (rtn1.controlType === Enum.ControlType.File
-                  || rtn1.controlType === Enum.ControlType.SliceUpload || rtn1.controlType === Enum.ControlType.PhotoSelect)
-                  && attrValue != undefined && attrValue != null && attrValue != '') {
-                  rtn1.jsSetFile(attrValue, rtn1);
-                }
-                rtn1[attrKey] = attrValue;
-                if (rtn1.controlType === Enum.ControlType.Tags) {
-                  rtn1["value"] = JSON.parse(attrValue);
-                }
-                if (rtn1.controlType === Enum.ControlType.SearchListBox
-                  || rtn1.controlType === Enum.ControlType.ComboBox
-                  || rtn1.controlType === Enum.ControlType.MultiSelectWithSearch
-                  || rtn1.controlType === Enum.ControlType.MultiSelectNoSearch
-                ) {
-                  if (rtn1["options"].length == 0) {
-                    rtn1["options"] = [{ value: '', label: '' }];
-                  }
-                  if (attrKey == 'code1') {
-                    rtn1["value"] = attrValue;
-                    rtn1["options"][0]["value"] = attrValue
-                  }
-                  if (attrKey == 'name1') {
-                    rtn1["options"][0]["label"] = attrValue
-                  }
-                  if (rtn1.itemKey) rtn1.itemKey = Math.random()
-                }
-                if (rtn1.is == 'ct-button') {
-                  if (common.flagApp() && this.form.$vue.loaded) {
-                    this.form.$vue.loaded(this.form)
-                  }
-                }
-                hiddenHandle(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];
-              if (rtn1) {
-                if (typeof rtn1.code1 !== 'undefined') {
-                  rtn1.code1 = code1;
-                  hiddenHandle(rtn1);//隐藏关联的
-                }
-                if (typeof rtn1.code2 !== 'undefined') {
-                  rtn1.code2 = code2;
-                }
-              }
-            },
-            clearMedia(id) {
-              var rtn1 = this.fieldsDic[id];
-              for (let i = 0; i < rtn1.fileSourceList.length; i++) {
-                rtn1.fileSourceList[i].flagDeleted = true;
-              }
-              rtn1.fileList = [];
-            },
-            setTabsSelect(id) {
-              if (this.form && this.form.$vue) {
-                var f = this.fieldsDic[id];
-                if (this.form.isHorizontalLayout) {
-                  this.form.$vue.activeName = f.collapseName.toString() === '-1' ? this.form.$vue.activeName : f.collapseName.toString();
-                }
-              }
-            },
-            //路由提交
-            submit(fieldName1) {
-              if (this.form && this.form.$vue) {
-                this.form.$vue.fieldClickHandler({ fieldName1: fieldName1 });
-              }
-            },
-      
-            //获取列表数据
-            get excuteListData() {
-              if (this._excuteListData) {
-                return this._excuteListData;
-              }
-              else {
-                if (this.excuteData !== null) {
-                  this._excuteListData = this.excuteData.filter((v) => {
-                    return typeof v.is !== undefined && (v.is === 'ct-formlist' || v.is === 'ct-repeat');
-                  });
-                }
-              }
-              return this._excuteListData;
-            },
-            setExcuteListData(fields) {
-              this._excuteListData = null;
-              if (fields !== null) {
-                this.excuteData = fields;
-                this._excuteListData = fields.filter((v) => {
-                  return typeof v.is !== undefined && (v.is === 'ct-formlist' || v.is === 'ct-repeat');
-                });
-              }
-            },
-            //获取列表的Field
-            getListField(tableName, rowNum, fiedlId) {
-              let listData = this.excuteListData.find((v) => {
-                return v.name === tableName;
-              });
-              if (listData) {
-                let field = null;
-                //正在编辑的Field
-                if (rowNum === null && (fiedlId === null || listData.currentEventField.fieldName1 === fiedlId)) {
-                  field = listData.currentEventField;
-                }
-                //正在编辑的行
-                else if (rowNum === null && listData.currentRowIndex === 0) {
-                  let fields = listData.currentRow.data;
-                  field = fields[fiedlId];
-                }
-                //源数据
-                else {
-                  if (rowNum === null && listData.currentRowIndex) {
-                    rowNum = listData.currentRowIndex;
-                  }
-      
-                  if (rowNum === 0 || (rowNum && fiedlId)) {
-                    try {
-                      let fields = listData.rows[rowNum].field;
-                      field = fields.find((v) => {
-                        return v.fieldName1 === fiedlId;
-                      });
-                    } catch (e) {
-                      if (listData.rows.length <= rowNum) {
-                        common.message('获取列表行索引超出界限', 'error')
-                      }
-                    }
-                  }
-                }
-      
-                return { listData: listData, field: field };
-              }
-            },
-            //获取列表的行数（注意 这里包括列头）
-            getListCount(tableName) {
-              tableName = tableName ? tableName : this.form.scripts.$fd;
-              let data = this.getListField(tableName, null, null);
-              if (data) {
-                return data.listData.rows.length;
-              }
-            },
-            //获取表格某行某列的值
-            getListFieldValue(tableName, rowNum, fiedlId, attrName, defaultValue) {
-              tableName = tableName ? tableName : this.form.scripts.$fd;
-              let data = this.getListField(tableName, rowNum, fiedlId);
-      
-              attrName = common.initialsToLowerCase(attrName);
-              attrName = attrName ? attrName : 'code1';
-      
-              if (!fiedlId) {
-                fiedlId = data.listData.currentEventField.fieldName1;
-              }
-              if (fiedlId && rowNum === null && fiedlId === data.listData.currentEventField.fieldName1) {
-                data.field = data.listData.currentEventField;
-              }
-              rowNum = rowNum !== null ? rowNum : data.listData.currentRowIndex;
-      
-              //若该行正在编辑，则取编辑状态的。
-              if (data && data.listData && data.listData.currentRow.data && data.listData.currentRow.data[fiedlId]
-                && data.listData.currentRow.data.$sourceIndex === rowNum && data.listData.currentRow.isSet) {
-                return data.listData.currentRow.data[fiedlId][attrName];
-              }
-              else if (data && data.field) {
-                if (typeof defaultValue !== 'undefined' && data.listData.rows[rowNum].deleted) {//若该行被删除时，则直接返回默认值
-                  return defaultValue;
-                }
-                return data.field[attrName];
-              }
-            },
-            //设置表格某行某列的值
-            setListFieldValue(value, tableName, rowNum, fiedlId, attrName, flagTemplate) {
-              value = value == undefined ? "" : value.toString();
-              tableName = tableName ? tableName : this.form.scripts.$fd;
-              let data = this.getListField(tableName, rowNum, fiedlId);
-      
-              attrName = common.initialsToLowerCase(attrName);
-              attrName = attrName ? attrName : 'code1';
-      
-              if (!fiedlId) {
-                fiedlId = data.listData.currentEventField.id;
-              }
-      
-              rowNum = rowNum ? rowNum : data.listData.currentRowIndex;
-      
-              if (data) {
-                //正在编辑的行
-                if (data.listData.currentRow.data && data.listData.currentRow.data[fiedlId] && rowNum > -1
-                  && data.listData.currentRow.data.$sourceIndex === data.listData.source.rows[rowNum].$sourceIndex) {
-                  let currentField = data.listData.currentRow.data[fiedlId];
-                  currentField[attrName] = value;
-                  //校验自己
-                  if (currentField.validExcute) {
-                    currentField.validExcute();
-                  }
-                  if (data.field) {
-                    data.field[attrName] = value;
-                  }
-                }
-                else if (data.field) {
-                  if (data.field) {
-                    data.field[attrName] = value;
-                  }
-                  if (data.field.source) {
-                    data.field.source[attrName] = value;
-                  }
-                  if (flagTemplate) {
-                    data.field[attrName] = value;
-                  }
-                  if (data.listData.flagTemplate && data.listData.$vue) {
-                    data.listData.$vue.itemKey = Math.random()
-                  }
-                }
-      
-                //如果有汇总列，触发重新计算汇总
-                if (data.listData.showSummary) {
-                  data.listData.tableData.push({});
-                  data.listData.tableData.pop();
-                }
-      
-                return true;
-              }
-              return false;
-            },
-            //设置表格选择路由
-            setListSelectRouter(tableId, attrKey, attrValue) {
-              let listData = this.excuteListData.find((v) => {
-                return v.fieldName1 === tableId;
-              });
-              if (listData) {
-                var router = listData.selectRouter;
-                if (router) {
-                  router[attrKey] = attrValue;
-                }
-              }
-            },
-            //设置表格属性值
-            setListAttr(tableId, attrName, attrValue) {
-              let listData = this.excuteListData.find((v) => {
-                return v.fieldName1 === tableId;
-              });
-              if (listData) {
-                listData[attrName] = attrValue
-              }
-            },
-            //新增表格数据
-            insertRow(tableId, rows) {
-              let listData = this.excuteListData.find((v) => {
-                return v.fieldName1 === tableId;
-              });
-              if (listData) {
-                listData.$vue.insertRow(rows);
-              }
-            },
-            //添加单选表格数据
-            insertSingleRow(tableId, row) {
-              let listData = this.excuteListData.find((v) => {
-                return v.fieldName1 === tableId;
-              });
-              if (listData) {
-                listData.$vue.insertSingleRow(row);
-              }
-            },
-            //新增或替换表格数据
-            insertOrUpdateRow(tableId, row) {
-              let listData = this.excuteListData.find((v) => {
-                return v.fieldName1 === tableId;
-              });
-              if (listData) {
-                listData.$vue.insertOrUpdateRow(row);
-              }
-            },
-            //删除表格数据
-            deleteRow(tableId, row) {
-              let listData = this.excuteListData.find((v) => {
-                return v.id === tableId;
-              });
-              if (listData) {
-                listData.$vue.delRow(row);
-              }
-            },
-            //清空表格数据
-            clear(tableId) {
-              let listData = this.excuteListData.find((v) => {
-                return v.fieldName1 === tableId;
-              });
-              if (listData) {
-                listData.$vue.deleteAll();
-              }
-            },
-      
-            //获取后台数据，并返回脚本。
-            execServerScript(action, object, successCallback) {
-              let formData = this;//作用域保存
-      
-              //是否是行内触发的
-              let data = this.getListField(this.form.scripts.$fd, null, null);
-              object.editMode = data ? 1 : 0;
-      
-              request.postHandler(common.globalUri(), { action: action, para: object }).then(
-                function (response) {
-                  if (response.rtnCode === Enum.ReturnCode.Successful) {
-                    var data = response.content;
-                    if (response.clientActionType === Enum.ClientActionType.ExcuteScript && data) {
-                      common.excute.call(formData.form.scripts, data);
-                    }
-                    else
-                      if (response.clientActionType === Enum.ClientActionType.None && data && successCallback) {
-                        //因为要传参，并直接执行方法，故successCallback回调里要使用formData的话，要加this
-                        //若不能接受this，也可修改common.excute方法
-                        //successCallback.call(formData.form.scripts, data);
-      
-                        //优化，不需要加this
-                        common.excuteFun.call(formData.form.scripts, successCallback, data);
-                      }
-                  }
-                }
-              );
-            },
-            execRouter(routerKey) {
-              let field = { fieldName1: routerKey };
-              this.form.$vue.fieldClickHandler(field);
-            },
-            //消息提示 type主题:success/warning/info/error。 duration 显示时间, 毫秒。设为 0 则不会自动关闭。 showClose 是否显示关闭按钮。
-            message(message, type, center, duration, showClose, dangerouslyUseHTMLString) {
-              common.message(message, type, center, duration, showClose, dangerouslyUseHTMLString)
-            },
-      
-          },
+        formData:formData,
         get title() {
             return source.title;
         },

package/src/main.js

@@ -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_19b970bd-bd37-4ded-853c-c0c001270a60",MachineCode:"7c4b2ffd-920a-462c-a586-37bbfb45c4fe",SSO_Token:"SSOToken_19b970bd-bd37-4ded-853c-c0c001270a60",Platform:"IOS"}',
+                authObject: '{EmpID:"Token_35daf643-69e6-4da4-addf-c6c9ffdf59ff",MachineCode:"7c4b2ffd-920a-462c-a586-37bbfb45c4fe",SSO_Token:"SSOToken_35daf643-69e6-4da4-addf-c6c9ffdf59ff",Platform:"IOS"}',
             };
         },
         getToken() {