centaline-data-driven-v3 0.0.97 → 0.0.99

package/package.json

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

package/src/components/web/Button.vue

@@ -38,6 +38,21 @@
         <div>{{ model.controlLabel }}</div>
         <div class="subText">{{ model.subText }}</div>
     </el-button>
+    <!-- <ct-selectfile v-else-if="model.isOpenFileDialog" :form="model"  :vmodel="model"></ct-selectfile> -->
+    <template v-else-if="model.isOpenFileDialog" :form="model" :vmodel="model">
+        <input type="file" multiple ref="fileInput" @change="handleFileChange" style="display: none"
+            :accept="model.fileAccept" /> 
+        <el-button type="primary" @click="triggerUpload" v-bind="model.attrs"
+            :style="{ color: model.textColor, backgroundColor: model.imgUrl ? 'transparent' : model.bgColor, borderColor: model.imgUrl ? 'transparent' : model.borderColor, padding: model.imgUrl ? '0px' : null }"
+            :disabled="model.disabled || model.locked" class="btn-add">
+            <template #icon v-if="model.icon">
+                <el-icon>
+                    <component :is="model.icon"></component>
+                </el-icon>
+            </template>
+            {{ model.controlLabel }}</el-button>
+    </template>
+
     <el-button v-else type="primary" :loading="model.loading" v-bind="model.attrs" @click="clickHandle"
         :style="{ color: model.textColor, backgroundColor: model.imgUrl ? 'transparent' : model.bgColor, borderColor: model.imgUrl ? 'transparent' : model.borderColor, padding: model.imgUrl ? '0px' : null }"
         :disabled="model.disabled || model.locked">
@@ -55,13 +70,13 @@
     </el-button>
 </template>
 <script setup lang="ts">
-import { computed } from 'vue'
+import { computed, ref } from 'vue'
 import { initData } from '../../utils/mixins';
 import Button from '../../loader/src/Button';
 import Enum from '../../utils/Enum'
 import common from '../../utils/common'
 import request from '../../utils/request'
-import { ElMessage } from 'element-plus'
+import { ElMessage, UploadFile } from 'element-plus'
 const emit = defineEmits(['input', 'fieldClick', 'importComplete'])
 const props = defineProps({
     parameterAction: String,
@@ -71,6 +86,16 @@ const props = defineProps({
     flagAppMode: Boolean,
     parentModel: Object,
 })
+
+interface FileItem {
+    name: string;
+    raw: File;
+}
+
+const fileInput = ref(null); // 获取 input 元素的引用 
+const fileList = ref<FileItem[]>([]);
+
+
 const model = initData(props, Button)
 if (model.value.controlType == Enum.ControlType.ButtonAdvancedSearch) {
     model.value.icon = 'ico-open';
@@ -96,35 +121,35 @@ const headers = computed(() => {
     return common.getDataDrivenOpts().handler.getRequestHeaders();
 })
 function clickHandle() {
-  emit('fieldClick', model.value);
+    emit('fieldClick', model.value);
 }
 
 function handleAvatarBeforeUpload(file) {
-  if (model.value.form && model.value.form.$vue) {
-    let submitData = model.value.form.$vue.getFileData(model.value);
-    for (var key in submitData) {
-      if (typeof submitData[key] === "object") {
-        uploadData.value[key] = JSON.stringify(submitData[key]);
-      }
-      else {
-        uploadData.value[key] = submitData[key];
-      }
+    if (model.value.form && model.value.form.$vue) {
+        let submitData = model.value.form.$vue.getFileData(model.value);
+        for (var key in submitData) {
+            if (typeof submitData[key] === "object") {
+                uploadData.value[key] = JSON.stringify(submitData[key]);
+            }
+            else {
+                uploadData.value[key] = submitData[key];
+            }
+        }
     }
-  }
-  if(props.parentModel && props.parentModel.is && props.parentModel.is=="ct-formlist" && props.parentModel.form && props.parentModel.form.$vue){
-    let submitData = props.parentModel.form.$vue.getFileData(model.value);
-    for (var key in submitData) {
-      if (typeof submitData[key] === "object") {
-        uploadData.value[key] = JSON.stringify(submitData[key]);
-      }
-      else {
-        uploadData.value[key] = submitData[key];
-      }
+    if (props.parentModel && props.parentModel.is && props.parentModel.is == "ct-formlist" && props.parentModel.form && props.parentModel.form.$vue) {
+        let submitData = props.parentModel.form.$vue.getFileData(model.value);
+        for (var key in submitData) {
+            if (typeof submitData[key] === "object") {
+                uploadData.value[key] = JSON.stringify(submitData[key]);
+            }
+            else {
+                uploadData.value[key] = submitData[key];
+            }
+        }
     }
-  }
 }
 function handleAvatarSuccess(res) {
-  emit('importComplete', res, model.value);
+    emit('importComplete', res, model.value);
 }
 function handleAvatarError(info) {
     ElMessage({
@@ -141,8 +166,41 @@ function dropClick() {
     }
 }
 function commandClick(code) {
-  model.value.selectOptionCode = code;
-  emit('fieldClick', model.value);
+    model.value.selectOptionCode = code;
+    emit('fieldClick', model.value);
+}
+
+// 触发文件选择
+const triggerUpload = () => {
+    fileInput.value.click();
+};
+
+// 处理文件选择
+const handleFileChange = (event) => {
+    const input = event.target as HTMLInputElement;
+
+    // 安全检查
+    if (!input?.files?.length) {
+        console.warn('未选择文件');
+        return;
+    }
+
+    // 更新文件列表
+    fileList.value = Array.from(input.files).map(file => ({
+        name: file.name,
+        raw: file
+    }));
+
+    model.value.fileList = fileList.value;
+    emit('fieldClick', model.value);
+    event.target.value = '';
+
+};
+
+function generateUUID() {
+    return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>
+        (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16)
+    );
 }
 </script>
 <style scoped>

package/src/components/web/Form.vue

@@ -157,13 +157,13 @@
 
             </div>
             <template v-if="model?.aiAttr?.showAI">
-                <div :style="{ flex: ' 0 0 ' + model.aiAttr.width + 'px',  position: 'sticky', top: '0' ,'box-shadow': '-10px 0 5px -9px rgba(0, 0, 0, 0.3)' }"
+                <div :style="{ flex: ' 0 0 ' + model.aiAttr.width + 'px', position: 'sticky', top: '0', 'box-shadow': '-10px 0 5px -9px rgba(0, 0, 0, 0.3)' }"
                     v-show="showAI">
                     <div
                         :style="{ position: 'sticky', top: '0', height: dialogHeight + 'px', overflow: 'hidden', 'border-bottom-right-radius': '4px' }">
                         <AIChat :height="dialogHeight"
-                            :style="{ position: 'sticky', top: '0', height: dialogHeight + 'px' }"
-                            :field="model.aiChat" :router="model.aiRouter" :actionRouter="model.actionRouters" :form="model"
+                            :style="{ position: 'sticky', top: '0', height: dialogHeight + 'px' }" :field="model.aiChat"
+                            :router="model.aiRouter" :actionRouter="model.actionRouters" :form="model"
                             @hideAI="AIToggle" :isVisible="showAI" :tablewidth="model.aiAttr.width">
 
                         </AIChat>
@@ -174,8 +174,8 @@
         </div>
         <template v-if="model?.aiAttr?.showAI && !showAI">
             <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">
+                <img class="avatar-img" @click.stop="AIToggle" :src="util.getAssetsImage('AIChat.png')"
+                    :alt="model?.aiRouter.controlLabel" :title="model?.aiRouter.controlLabel">
             </div>
         </template>
         <div style="min-height:200px" v-if="loading"></div>
@@ -193,6 +193,7 @@ import { useRouter } from 'vue-router';
 import util from '../../utils/pub-use'
 import Enum from '../../utils/Enum';
 import AIChat from '../web/AIChat.vue';
+import { fi } from 'element-plus/es/locale';
 const emit = defineEmits(['loaded', 'failLoad', 'submit', 'AIToggle'])
 const props = defineProps({
     api: String,
@@ -259,25 +260,25 @@ const showAI = ref(false);
 const dialogHeight = ref(props.dialogHeight || (window.innerHeight - 60));
 
 const qrtimer1 = ref(null)
-const qrtimer2=ref(null)
-onBeforeUnmount(()=>{
-  if (model.value && typeof model.value.scripts !== 'undefined') {
-    model.value.scripts.formData.form = null;
-    model.value.scripts.formData.excuteData = null;
-    model.value.scripts.formData.fieldsDic = null;
-    model.value.scripts.formData = null;
-  }
-  Fields.value = null;
-  refForm.value = null;
-  model.value = null;
-  if (qrtimer1.value) {
-    clearTimeout(qrtimer1.value);
-    qrtimer1.value = null;
-  }
-  if (qrtimer2.value) {
-    clearTimeout(qrtimer2.value);
-    qrtimer2.value = null;
-  }
+const qrtimer2 = ref(null)
+onBeforeUnmount(() => {
+    if (model.value && typeof model.value.scripts !== 'undefined') {
+        model.value.scripts.formData.form = null;
+        model.value.scripts.formData.excuteData = null;
+        model.value.scripts.formData.fieldsDic = null;
+        model.value.scripts.formData = null;
+    }
+    Fields.value = null;
+    refForm.value = null;
+    model.value = null;
+    if (qrtimer1.value) {
+        clearTimeout(qrtimer1.value);
+        qrtimer1.value = null;
+    }
+    if (qrtimer2.value) {
+        clearTimeout(qrtimer2.value);
+        qrtimer2.value = null;
+    }
 })
 
 onUpdated(() => {
@@ -351,7 +352,7 @@ function doAction(data) {
 //判断是否有滚动条
 function getisScroll() {
     if (Fields.value) {
-        if(qrtimer1.value)clearTimeout(qrtimer1.value);
+        if (qrtimer1.value) clearTimeout(qrtimer1.value);
         if (refForm.value) {
             let parentDom = refForm.value.parentElement;
             if (parentDom.id == "app-form" && parentDom.scrollHeight > window.innerHeight) {
@@ -374,9 +375,15 @@ function fieldClickHandler(field) {
     let data = Form.getRouterAndSubmitData(field, model.value);
     clickHandler(data.router, data.submitData);
 }
-function clickHandler(field, submitData) {
-    RouterClickHandler(field, submitData, null, model.value, 'form')
+function clickHandler(field, submitData,formList) {
+    if (field.isOpenFileDialog) {
+        common.excuteFunStr.call(model.value.scripts, field.onChanged, {files: field.fileList,columns: formList?.source?.rows[0].columns });
+    }
+    else {
+        RouterClickHandler(field, submitData, null, model.value, 'form');
+    }
 }
+
 //组件数据验证
 function validExcute() {
     var rtnBool = true;
@@ -667,7 +674,7 @@ function buttonsWidth() {
     }
     return rtn;
 }
- 
+
 </script>
 
 <style scoped>

package/src/components/web/FormList.vue

@@ -2,6 +2,11 @@
     <div v-if="model">
         <template v-if="model.flagTemplate">
             <div class="list-button">
+                <template v-for="(v, i) in model.toolButtonsShow">
+                    <component :is="v.is" :vmodel="v" :parentModel="model" @fieldClick="toolButtonsClick"
+                        @importComplete="importComplete" @change="toolButtonsChangeHandler(v, $event)">
+                    </component>
+                </template>
                 <component v-if="model.selectRouter !== null" :is="model.selectRouter.is" :vmodel="model.selectRouter"
                     @click="popupSearchListHandle(model.selectRouter)"></component>
                 <el-button v-if="model.create" :disabled="model.disabled" class="btn-add" type="success"
@@ -439,7 +444,7 @@ function fieldsValidExcute() {
         if (model.value.form && model.value.form.fields) {
             const currentIndex = model.value.form.fields.findIndex(v => v.fieldName1 === model.value.fieldName1);
             if (currentIndex - 1 >= 0) {
-                if (model.value.form.fields[currentIndex - 1].controlType == Enum.ControlType.Group){
+                if (model.value.form.fields[currentIndex - 1].controlType == Enum.ControlType.Group) {
                     controlLabel = model.value.form.fields[currentIndex - 1].controlLabel;
                 }
             }
@@ -531,7 +536,13 @@ function rolRouterClickHandler(field, rowData, rowindex) {
     buttonClick(rowData, field);
 }
 function toolButtonsClick(field) {
-    emit('tableButtonClick', field, null);
+    if (field.isOpenFileDialog) {
+        emit('tableButtonClick', field, null,model.value);
+    } else { 
+        emit('tableButtonClick', field, null);
+
+
+    }
 }
 function toolButtonsChangeHandler(field) {
     emit('change', field);

package/src/components/web/photo.vue

@@ -13,13 +13,12 @@
         <div style="width: 100%;position: relative" ref="refct_Photo" class="block ct-file"
           :style="{ 'width': (model.maxValue1 || 100) + 'px', 'height': (model.minValue1 || 100) + 'px' }"
           :class="[model.attrs.size ? 'ct-checkbox-' + model.attrs.size : '']">
-
           <el-upload :class="model.disableUpload ? 'ct-upload-display-none' : ''" v-bind="UploadhttpRequest"
-            :uploadStatus="!model.disableUpload && !model.locked ? 'upload' : 'lock'" ref="refupload" :disabled="model.locked"
-            :accept="model.fileAccept1" :on-change="handleChange" :multiple="false" :auto-upload="true"
-            :action="action()" :headers="headers" :before-upload="beforeUploadProcess" :on-success="handleAvatarSuccess"
-            :on-error="handleAvatarError" :on-progress="uploadProcess" :on-exceed="handleExceed"
-            :show-file-list="false">
+            :uploadStatus="!model.disableUpload && !model.locked ? 'upload' : 'lock'" ref="refupload"
+            :disabled="model.locked" :accept="model.fileAccept1" :on-change="handleChange" :multiple="false"
+            :auto-upload="true" :action="action()" :headers="headers" :before-upload="beforeUploadProcess"
+            :on-success="handleAvatarSuccess" :on-error="handleAvatarError" :on-progress="uploadProcess"
+            :on-exceed="handleExceed" :show-file-list="false">
 
 
             <el-icon class="avatar-uploader-icon"
@@ -126,7 +125,7 @@
   </template>
 </template>
 <script setup lang="ts">
-import { ref, nextTick, computed, onBeforeUnmount } from 'vue'
+import { ref, nextTick, computed, onBeforeUnmount, watch } from 'vue'
 import { ElMessage, UploadProps } from 'element-plus'
 import common from '../../utils/common'
 import { changeHandler } from '../../utils/mixins';
@@ -146,15 +145,12 @@ const refupload = ref()
 const QRCodeRef = ref()
 const UploadhttpRequest = ref({})
 const model = ref(null)
-const qrtimer1=ref(null)
-const qrtimer2=ref(null)
+const qrtimer1 = ref(null)
+const qrtimer2 = ref(null)
 
 const headers = computed(() => {
   return common.getDataDrivenOpts().handler.getRequestHeaders();
 })
-const previewZIndex = computed(() => {
-  return common.getDataDrivenOpts().zindex + 100;
-})
 
 init()
 //初始化数据
@@ -204,6 +200,23 @@ function load(data) {
     });
   }
 }
+
+// 深度监听 model
+watch(
+  () => model.value, // 监听的源
+  (newValue, oldValue) => {
+    console.log('Model changed:', newValue);
+    console.log('Old value:', oldValue);
+    if (newValue?.file && newValue?.file != oldValue?.file) {
+      // 处理文件上传
+      var options = {
+        file: newValue.file.raw
+      }
+      SliceUpload(options);
+    }
+  },
+  { deep: true } // 启用深度监听
+);
 //校验上传数量
 const handleExceed: UploadProps['onExceed'] = (files) => {
   // model.value.validMessage = "附件数量最多" + model.value.maxValue1 + "张";
@@ -217,8 +230,8 @@ const handleExceed: UploadProps['onExceed'] = (files) => {
 function handleRemove(file) {
 
 
-  common.confirm(common.LocalizedString("确定删除该附件？","確定刪除該附件？"), "提示", {
-    confirmButtonText: common.LocalizedString("确定","確認"),
+  common.confirm(common.LocalizedString("确定删除该附件？", "確定刪除該附件？"), "提示", {
+    confirmButtonText: common.LocalizedString("确定", "確認"),
     cancelButtonText: "取消",
     //type: 'warning'
   }).then(() => {
@@ -321,7 +334,6 @@ async function SliceUpload(options) {
     });
   }
   // data是上传时附带的额外参数，file是文件
-
   let uid = Photo.uploadguid();
   try {
     file.uid = file.uid || uid;
@@ -492,7 +504,7 @@ function PasteUpload(event) {
         ++fileSum;
       }
     }
-    
+
     if (fileSum == items.length) {
       for (let index in items) {
         const item = items[index];
@@ -514,7 +526,7 @@ function PasteUpload(event) {
 function ListenerPaste(event) {
 
   const uploads = document.querySelectorAll('[uploadStatus="upload"]');
-   if (uploads.length == 1) {
+  if (uploads.length == 1) {
     PasteUpload(event);
   }
 

package/src/loader/src/Button.js

@@ -17,6 +17,13 @@ const Button = function (source) {
             //     return '#519DA6'
             // }
             return source.borderColor
+        },
+         //允许的文件类型（针对上传控件）
+        get fileAccept1() {
+            return source.fileAccept1 || '';
+        },
+        set fileAccept1(v) {
+            source.fileAccept1 = v;
         },
         get action() {
             if (source.controlType == Enum.ControlType.ButtonSearch) {

package/src/loader/src/Form.js

@@ -263,8 +263,9 @@ function loadFromModel(source, isFormList) {
         }
       },
       //设置表格某行某列的值
-      setListFieldValue(value, tableName, rowNum, fiedlId, attrName, flagTemplate) {
-        value = value == undefined ? "" : value.toString();
+      setListFieldValue(value, tableName, rowNum, fiedlId, attrName, flagTemplate, flagTostring) {
+        value = value == undefined ? "" : flagTostring == false ? value : value.toString();
+
         tableName = tableName ? tableName : this.form.scripts.$fd;
         let data = this.getListField(tableName, rowNum, fiedlId);
 

package/src/loader/src/Photo.js

@@ -23,16 +23,16 @@ function loadFromModel(source, SourceList, router, optionApi, videoPlayIconUrl)
             QRCodeStatusAction: '',
             fileSource: SourceList,//原始数据 
             valid: true,//验证是否通过
-            validMessage: '',//验证提示
-
-            get action() {
-                return router && router.action ? router.action : "";//上传完整地址
-            },
+            validMessage: '',//验证提示 
+            uploadFiles:[],
             get QRCodeAction() {
                 return router && router.actionForSearchRightPageKey ? router.actionForSearchRightPageKey : "";
             },
             get videoPlayIconUrl() {
                 return videoPlayIconUrl;
+            },
+             get action() {
+                return router && router.action ? router.action : "";//上传完整地址
             },
             set action(v) {
                 router.action = v;//上传完整地址
@@ -64,6 +64,18 @@ function loadFromModel(source, SourceList, router, optionApi, videoPlayIconUrl)
                 }
                 return rtn._fileList;
             },
+            get file() {
+                return this.uploadFiles;//上传完整地址
+            },
+            set file(v) {
+                if (this.uploadFiles?.length > 0) {
+                    this.uploadFiles[0] = v;
+                }
+                else { 
+                    this.uploadFiles = [];
+                   this.uploadFiles.push(v);  
+                }
+            },
             jsClearFile(model) {
                 model.fileList = [];
             },
@@ -91,6 +103,10 @@ function loadFromModel(source, SourceList, router, optionApi, videoPlayIconUrl)
                     rtn.fileList[0] = FileData;
                 });
             },
+            //外部增加上传文件
+            jsAddFile(data, model) {
+                model.file = data;
+            },
             getFormObj() {
                 var rtnFormObj = {};
                 var that = this;
@@ -342,7 +358,7 @@ function updateFile(file, model) {
     model.fileSource[0].mediaUrl = file.mediaUrl;
     model.fileSource[0].savedFileName = file.savedFileName;
     model.fileSource[0].mediaDate = file.mediaDate;
-    model.fileSource[0].mediaCode = file.mediaCode; 
+    model.fileSource[0].mediaCode = file.mediaCode;
 
 }
 function uploadguid() {
@@ -380,7 +396,7 @@ function viewerfile(file, model) {
 function selfValidExcute(eventName, model) {
     if (model.required) {
         if (Photo.getfileListLength(model) === 0) {
-            model.validMessage = common.LocalizedString("必须上传附件","必須上傳附件");
+            model.validMessage = common.LocalizedString("必须上传附件", "必須上傳附件");
             model.valid = false;
             model.displayValidMessage = model.validMessage;
             return false;

package/src/loader/src/Router.js

@@ -14,7 +14,7 @@ const Router = function (source) {
       return source.text;
     },
     set controlLabel(v) {
-      return source.text=v;
+      return source.text = v;
     },
     //动作对应的 控制器  
     get action() {
@@ -23,6 +23,13 @@ const Router = function (source) {
     set action(v) {
       return source.action = v;
     },
+    //允许的文件类型（应用于 ButtonType 为 openFileDialog 的类型）
+    get fileAccept() {
+      return source.fileAccept || '';
+    },
+    set fileAccept(v) {
+      source.fileAccept = v;
+    },
     // action的url对应的FieldName，如果此处有值，则忽略action
     get actionField() {
       return source.actionField;
@@ -63,6 +70,10 @@ const Router = function (source) {
     get isCheckbox() {
       return source.buttonType === Enum.ButtonType.Checkbox;
     },
+    //按钮类型为openFileDialog
+    get isOpenFileDialog() {
+      return source.buttonType === Enum.ButtonType.openFileDialog;
+    },
 
     //是否需要警示标志
     get flagAlert() {

package/src/utils/Enum.js

@@ -588,7 +588,11 @@ const Enum = {
     /// <summary>
     /// Checkbox
     /// </summary>
-    Checkbox: 4
+    Checkbox: 4,
+    /// <summary>
+    /// file
+    /// </summary>
+    openFileDialog: 5,
   },
 
   /// <summary>

package/src/utils/common.js

@@ -598,8 +598,9 @@ const common = {
   strCharLen(str) {
     var len = 0;
     if (str) {
-      for (var i = 0; i < str.length; i++) {
-        var c = str.charCodeAt(i);
+      let newstr = common.extractTagContent(str);
+      for (var i = 0; i < newstr.length; i++) {
+        var c = newstr.charCodeAt(i);
         //单字节加1
         if ((c >= 0x0001 && c <= 0x007e) || (0xff60 <= c && c <= 0xff9f)) {
           len++;
@@ -611,6 +612,22 @@ const common = {
 
     return len;
   },
+  /**
+     * @method
+     * @param {String} str 需要计算的字符串
+     * @desc 获取文字。
+     * @returns {obj} 返回值
+     */
+  extractTagContent(htmlContent) {
+
+    if (typeof htmlContent === 'string') {
+      const result = htmlContent.replace(/<[^>]*>/g, '').trim();
+      return result || htmlContent;
+    } else {
+      return htmlContent;
+    }
+
+  },
   /**
    * @method
    * @param {Object} obj 需要克隆的对象