Merge branch 'qin_s3'

# Conflicts:
#	src/components/DesignForm/public/expand/lowcodeImage.vue

src/components/DesignForm/app/index.vue

@@ -1970,6 +1970,7 @@ const editFormSendFlow = (val: any) => {
 const viewType = ref(1);
 const viewLayout = ref<any>();
 const resetViewClickStates = (excludeView?: string) => {
+   console.log("切换视图展示方式-----------resetViewClickStates------>",excludeView)
     if (!props.viewPage || typeof props.viewPage !== 'object') return;
     const views = ['list', 'date', 'time', 'gantt', 'map','group', 'card', 'chart'];
     views.forEach(view => {
@@ -1989,7 +1990,7 @@ const tabsView = (val: any, types: number) => {
   viewType.value = types;                                                             
   val.isClick = true;
   viewLayout.value = val;
-  // console.log("切换视图展示方式",val)
+  console.log("切换视图展示方式",val,"-----",types)
   switch (types) {
     case 2:
       resetViewClickStates('date');
@@ -2832,10 +2833,8 @@ const getNonValue = () => {
         />
       </el-col>
       <el-col v-if="viewType == 7" :span="24">
-        
-
         <SeeContChart
-          :echats-views="[echatsViewsdf]"
+          :echats-views="echatsViewsdf"
           :table-key="formBasicConfig.name"
           :types="1"
         />

src/components/DesignForm/public/expand/datePicker.vue

@@ -8,6 +8,7 @@ const props = withDefaults(
   defineProps<{
     modelValue?: string;
     disabled?: boolean;
+    isEdit?: boolean;
     data?: any;
   }>(),
   {}
@@ -133,6 +134,7 @@ const shichang = computed(() => {
     :value-format="valueFormat"
     :format="props.data.control.format"
     clearable
+    :disabled="props.isEdit"
   />
 
   <!-- 2 天 3 小时 -->

src/components/DesignForm/public/expand/digitpage.vue

@@ -24,6 +24,7 @@ const props = withDefaults(
     modelValue?: string;
     disabled?: boolean;
     rowIndex:number;
+    isEdit?: boolean;
   }>(),
   {}
 );
@@ -143,6 +144,7 @@ const judgeIsDisabled = (key: string) => {
     oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^\./g, '')"
     placeholder="请输入"
     clearable
+    :disabled="props.isEdit"
   >
     <template #append v-if="config.append">
       <div v-if="getInputSlot()">

src/components/DesignForm/public/expand/lowcodeImage.vue

@@ -57,6 +57,7 @@ const props = withDefaults(
     formTableSetUp?: Object;
     imgUrl?: string;
     type: string;
+    isEdit: boolean;
   }>(),
   {}
 );
@@ -335,7 +336,7 @@ const fit = computed(()=>{
       />
   
   <el-upload
-    v-if="props.type!=4&&props.type!=5&&props.data.control.defaultAllowsChange==''"
+    v-if="props.type!=4&&props.type!=5&&props.data.control.defaultAllowsChange==''&&!props.isEdit"
     v-bind="$props"
     class="upload-demo"
     :action="uploadUrl"
@@ -343,6 +344,7 @@ const fit = computed(()=>{
     :on-success="handleAvatarSuccess"
     :before-upload="beforeAvatarUpload"
     v-loading="imgLoading"
+    :disabled="props.isEdit"
   >
     <el-image
         v-if="props.data.control.useDefaultImg"
@@ -351,6 +353,24 @@ const fit = computed(()=>{
         :style="getFormItemInputStyle(configStyle, 2)"
         :fit="fit"
       />
+  </el-upload>
+  <el-upload
+    v-if="props.type==1&&!props.isEdit"
+    v-bind="$props"
+    class="upload-demo"
+    :action="uploadUrl"
+    :show-file-list="false"
+    :on-success="handleAvatarSuccess"
+    :before-upload="beforeAvatarUpload"
+    v-loading="imgLoading"
+    :disabled="props.isEdit"
+  >
+    <el-image
+        :src="props.modelValue?props.modelValue:NoImgPage"
+        class="avatar"
+        :style="getFormItemInputStyle(configStyle, 2)"
+        :fit="fit"
+      />
   </el-upload>
     <!-- <img referrerpolicy="no-referrer" :src="url" :style="styleObject" :fit="fit" :class="[boderAndShadowClassIsActive ? boderAndShadowClass : '', radiusClassIsActive ? radiusClass : '',mp, floatFlag ? floatStyle : '']"  /> -->
     <!-- <div></div> -->
@@ -410,6 +430,7 @@ const fit = computed(()=>{
     v-loading="imgLoading"
     :on-success="handleAvatarSuccess1"
     style="margin-top: 10px;"
+    :disabled="props.isEdit"
   >
       <template #trigger>
         <div style="display: none;">

src/components/DesignForm/public/expand/org.vue

@@ -12,6 +12,7 @@ const props = withDefaults(
     modelValue?: string;
     disabled?: boolean;
     data?: any;
+    isEdit?: boolean;
   }>(),
   {}
 );
@@ -332,7 +333,7 @@ const disabled1 = computed(()=>{
     collapse-tags
     collapse-tags-tooltip
     :max-collapse-tags="4"
-    :disabled="disabled1"
+    :disabled="disabled1||props.isEdit"
   />
   <div></div>
 </template>

src/components/DesignForm/public/expand/pickpost.vue

@@ -14,6 +14,7 @@ const props = withDefaults(
     disabled?: boolean;
     type?: number;
     data?: object;
+    isEdit?: boolean;
   }>(),
   {}
 );
@@ -204,6 +205,7 @@ const writeInfo = (val: any) => {
         placeholder="请选择行政组织"
         @change="orgChange"
         clearable
+        :disabled="props.isEdit"
       />
     </el-col>
     <el-col :span="24">
@@ -212,6 +214,7 @@ const writeInfo = (val: any) => {
         v-loading="orgPostTreeLoading"
         placeholder="请选择岗位"
         clearable
+        :disabled="props.isEdit"
       >
         <el-option
           v-for="item in postOptions"

src/components/DesignForm/public/expand/pickrole.vue

@@ -10,6 +10,7 @@ const props = withDefaults(
     modelValue?: string;
     disabled?: boolean;
     type?: number;
+    isEdit?: boolean;
   }>(),
   {}
 );
@@ -43,7 +44,7 @@ onBeforeMount(() => {
 });
 </script>
 <template>
-  <el-select v-model="value" placeholder="请选择" clearable>
+  <el-select v-model="value" placeholder="请选择" clearable :disabled="props.isEdit">
     <el-option
       v-for="item in roleLiet"
       :key="item.id"

src/components/DesignForm/public/expand/rangedUserTree.vue

@@ -11,6 +11,7 @@ const props = withDefaults(
         disabled?: boolean
         orgAndManTree?: any;
         data?: any;
+        isEdit?: boolean;
     }>(),
     {}
 )
@@ -307,7 +308,7 @@ function hasNodesInTree(tree) {
             filterable
             @click="handleTreeSelectClick"
             @visible-change="handleVisibleChange"
-            :disabled="props.disabled"
+            :disabled="props.isEdit"
             :popper-append-to-body="false"
         >
             <!-- 自定义空状态 -->
@@ -368,4 +369,4 @@ function hasNodesInTree(tree) {
     color: #606266;
     cursor: not-allowed;
 }
-</style>
+</style>

src/components/DesignForm/public/expand/treeSelect.vue

@@ -16,6 +16,7 @@ const props = withDefaults(
     config?: Object;
     data?: Object;
     options?: Object;
+    isEdit?: boolean;
   }>(),
   {}
 );
@@ -45,6 +46,7 @@ const cascaderProps = {
     :data="props.data"
     clearable
     :render-after-expand="false"
+    :disabled="props.isEdit"
   />
 </template>
 <style lang="scss" scoped></style>

src/components/DesignForm/public/expand/uploadPage.vue

@@ -28,6 +28,7 @@ const props = withDefaults(
     control?: Object;
     config?: Object;
     data?: Object;
+    isEdit?: boolean;
   }>(),
   {}
 );
@@ -153,6 +154,7 @@ const uploadSuccess = (response: any, uploadFile: any, uploadFiles: any) => {
       :on-error="uploadError"
       :on-success="uploadSuccess"
       :on-remove="uploadRemove"
+      :disabled="props.isEdit"
     >
       <i class="icon-plus" v-if="props.control?.listType == 'picture-card'"></i>
       <el-button type="primary" plain v-else-if="props.control?.listType == 'picture'">

src/components/DesignForm/public/form/formGroup.vue

@@ -764,6 +764,8 @@ const currentNodePowerKey = inject('currentNodeKey') as any
 
 //获取当前节点授权
 const curNodePowerAry = () => {
+  console.log("获取当前节点授权",currentNodePowerKey)
+  console.log("获取当前节点授权",allNodePwoer)
   if(currentNodePowerKey && currentNodePowerKey.value && currentNodePowerKey.value != ""){
     if(allNodePwoer.value && Array.isArray(allNodePwoer.value) && allNodePwoer.value.length > 0){
       let powerAry: any[] = []
@@ -787,6 +789,7 @@ const curNodePowerAry = () => {
 */
 const judgeIsShow = (key: string) => {
   let myPower = curNodePowerAry()     //获取权限数组
+  console.log("判断此组件是否可见",myPower)
   if(Array.isArray(myPower) && myPower.length > 0){
     let isOk = true
     myPower.forEach((item:powerAryInfo) => {

src/components/DesignForm/public/form/formItem.vue

@@ -739,7 +739,7 @@ const judgeIsShow = (key: string) => {
 @ 功能: 判断是否禁用
 */
 const judgeIsDisabled = (key: string) => {
-//   console.log("判断是否禁用", key);
+  console.log("判断是否禁用", key);
 // console.log("测试是否获取授权-1-->",allNodePwoer)
 //     console.log("测试是否获取授权-2-->",currentNodePowerKey)
   if (type.value === 3) {
@@ -755,7 +755,7 @@ const judgeIsDisabled = (key: string) => {
 
 
   let myPower = curNodePowerAry()
-//  console.log("测试是否获取授权-3-->",myPower)
+ console.log("测试是否获取授权-3-->",Array.isArray(myPower),myPower)
   if(Array.isArray(myPower) && myPower.length > 0){
     let isOk = false
     myPower.forEach((item:powerAryInfo) => {
@@ -763,6 +763,10 @@ const judgeIsDisabled = (key: string) => {
         isOk = !item.isEdit
       }
     })
+
+    console.log("判断是否禁用------key------->", key);
+    console.log("判断是否禁用------isOk------->", isOk);
+
     return isOk
   }else{
     return false
@@ -1114,7 +1118,7 @@ const diGuiJilian = (val: any, options: any[]) => {
 
 </script>
 <template>
-
+{{ data.type }}
   <BaiduMap
     v-if="judgeIsShow(data.name) && data.type === 'baidumap' && type != 4"
     :data="data"
@@ -1332,6 +1336,7 @@ const diGuiJilian = (val: any, options: any[]) => {
         :is="currentComponent"
         v-bind="control"
         :disabled="judgeIsDisabled(data.name)"
+        :isEdit="judgeIsDisabled(data.name)"
         :placeholder="
           data.control.placeholder
             ? data.control.placeholder
@@ -1367,6 +1372,7 @@ const diGuiJilian = (val: any, options: any[]) => {
             <AKSelect
               :data="getInputSlot('p')"
               :disabled="judgeIsDisabled(data.name)"
+              :isEdit="judgeIsDisabled(data.name)"
               :transform-option="transformOption"
               @change="inputSlotChange"
               type="slot"
@@ -1379,6 +1385,7 @@ const diGuiJilian = (val: any, options: any[]) => {
             <AKSelect
               :data="getInputSlot()"
               :disabled="judgeIsDisabled(data.name)"
+              :isEdit="judgeIsDisabled(data.name)"
               :transform-option="transformOption"
               type="slot"
               @change="inputSlotChange"
@@ -1406,6 +1413,7 @@ const diGuiJilian = (val: any, options: any[]) => {
       <el-radio-group
         v-bind="control"
         :disabled="judgeIsDisabled(data.name)"
+        :isEdit="judgeIsDisabled(data.name)"
         v-model="value"
         v-if="data.type === 'radio'"
         @change="onValueChange(data.type)"
@@ -1414,6 +1422,7 @@ const diGuiJilian = (val: any, options: any[]) => {
         <el-radio
           :key="index"
           :label="transformOption(item.value)"
+          :disabled="judgeIsDisabled(data.name)"
           v-for="(item, index) in props.data.options"
         >
           <span :style="getFormItemInputStyle(configStyle, 5)">{{ item.label }}</span>
@@ -1422,6 +1431,7 @@ const diGuiJilian = (val: any, options: any[]) => {
       <el-checkbox-group
         v-bind="control"
         :disabled="judgeIsDisabled(data.name)"
+        :isEdit="judgeIsDisabled(data.name)"
         v-model="value"
         v-if="data.type === 'checkbox'"
         @change="onValueChange(data.type)"
@@ -1431,6 +1441,7 @@ const diGuiJilian = (val: any, options: any[]) => {
           v-for="(item, index) in props.data.options"
           :key="index"
           :label="transformOption(item.value)"
+          :disabled="judgeIsDisabled(data.name)"
         >
           <span :style="getFormItemInputStyle(configStyle, 5)">{{ item.label }}</span>
         </el-checkbox>
@@ -1439,6 +1450,7 @@ const diGuiJilian = (val: any, options: any[]) => {
         v-if="data.type === 'select' || (type === 5 && data.type === 'inputSlot')"
         :data="data"
         :disabled="judgeIsDisabled(data.name)"
+        :isEdit="judgeIsDisabled(data.name)"
         v-model="value"
         :options="props.data.options"
         :remote-method="getAxiosOptions"
@@ -1459,6 +1471,7 @@ const diGuiJilian = (val: any, options: any[]) => {
         :config="config"
         :name="control.file || 'file'"
         :disabled="judgeIsDisabled(data.name)"
+        :isEdit="judgeIsDisabled(data.name)"  
         :options="options"
         v-model="value"
       />
@@ -1471,6 +1484,7 @@ const diGuiJilian = (val: any, options: any[]) => {
         :config="config"
         :name="control.file || 'file'"
         :disabled="judgeIsDisabled(data.name)"
+        :isEdit="judgeIsDisabled(data.name)"
         :options="options"
         v-model="value"
       />
@@ -1483,6 +1497,7 @@ const diGuiJilian = (val: any, options: any[]) => {
         :control="control"
         :config="config"
         :disabled="judgeIsDisabled(data.name)"
+        :isEdit="judgeIsDisabled(data.name)"
         :options="options"
         v-model="value"
       />
@@ -1492,6 +1507,7 @@ const diGuiJilian = (val: any, options: any[]) => {
         :is="currentComponent"
         v-bind="control"
         :disabled="judgeIsDisabled(data.name)"
+        :isEdit="judgeIsDisabled(data.name)"
         :options="options"
         v-model="value"
       />
@@ -1511,6 +1527,7 @@ const diGuiJilian = (val: any, options: any[]) => {
         :is="currentComponent"
         v-bind="control"
         :disabled="judgeIsDisabled(data.name)"
+        :isEdit="judgeIsDisabled(data.name)"
         :data="data"
         :placeholder="
           data.control.placeholder
@@ -1594,6 +1611,7 @@ const diGuiJilian = (val: any, options: any[]) => {
         :is="currentComponent"
         v-bind="control"
         :disabled="judgeIsDisabled(data.name)"
+        :isEdit="judgeIsDisabled(data.name)"
         :placeholder="
           data.control.placeholder
             ? data.control.placeholder
@@ -1613,6 +1631,7 @@ const diGuiJilian = (val: any, options: any[]) => {
         :is="currentComponent"
         v-bind="control"
         :disabled="judgeIsDisabled(data.name)"
+        :isEdit="judgeIsDisabled(data.name)"
         :data="data"
         :type="type"
         :rowIndex="rowIndex"
@@ -1624,6 +1643,7 @@ const diGuiJilian = (val: any, options: any[]) => {
         :is="currentComponent"
         v-bind="control"
         :disabled="judgeIsDisabled(data.name)"
+        :isEdit="judgeIsDisabled(data.name)"
         :placeholder="
           data.control.placeholder
             ? data.control.placeholder
@@ -1645,6 +1665,7 @@ const diGuiJilian = (val: any, options: any[]) => {
             v-bind="control"
             v-model="value"
             :disabled="judgeIsDisabled(data.name)"
+            :isEdit="judgeIsDisabled(data.name)"
             style="height: 500px"
           />
         </div>

src/components/DesignForm/public/form/select.vue

@@ -20,6 +20,7 @@ const props = withDefaults(
 		options?: any
 		type?: string
 		remoteMethod?: Function
+		isEdit?: boolean
     }>(),
     {
 		options: () => {
@@ -113,7 +114,7 @@ const remoteMethod = (name: string) => {
 <template>
 	<el-select
 		v-bind="data.control"
-		:disabled="disabled"
+		:disabled="props.isEdit"
 		v-model="value"
 		:loading="state.loading"
 		:remoteMethod="remoteMethod"

src/views/sysworkflow/lowcodepage/appPage/appPageForm/echatesUnit/seeContChart.vue

@@ -68,6 +68,7 @@ provide("haveMyBiCherBi",haveMyBiChears)
         <el-tabs v-model="pickChar" class="demo-tabs" @tab-change="pickChartTable">
             <el-tab-pane label="公共报表" name="all">
                 <div v-for="item in dataList">
+                    
                     <BarPage
                         v-if="item.type == 'bar'"
                         :data="item"

src/views/sysworkflow/lowcodepage/pageFlow/aiPage.vue

@@ -221,7 +221,7 @@ const scrollToBottom = () => {
 }
 .scroBox{
     padding: 10px 15px;
-    height: calc(100vh - 150px);
+    height: calc(100vh - 165px);
     
 }
 .ai-conversation {

src/views/sysworkflow/lowcodepage/pageFlow/flowStep.vue

@@ -251,11 +251,11 @@ const judgeNodeClass = (val:number,stepVal:number):string => {
 }
 .flowBody{
   padding: 10px 15px;
-  height: calc(100vh - 220px);
+  height: calc(100vh - 225px);
 }
 .flowBodyNofoot{
   padding: 10px 15px;
-  height: calc(100vh - 100px);
+  height: calc(100vh - 105px);
 }
 .svgBox{
   background: linear-gradient(135deg, #0020C2, #4d6cff);

src/views/sysworkflow/lowcodepage/pageFlow/newTableFlow.vue

@@ -255,7 +255,7 @@ const initData = () => {
   state.id = 0;
   state.loading = true;
   let aryLen = flowFactor.length;
-  console.log("改变表单值--flowMap.value--1->", flowMap.value);
+  console.log("改变表单值--flowMap.value--1- >", flowMap.value);
   flowMap.value = [];
   console.log("改变表单值--flowMap.value--->", flowMap.value);
   if (aryLen > 0) flowFactor.splice(0, aryLen);
@@ -716,6 +716,8 @@ provide(constAiEffect, ({ key, value, field,rowdex}: any) => {
   }  
 })
 
+provide('flowNodePower', currterNodePower)
+provide('currentNodeKey', nodeKey)
 </script>
 <template>
   <div v-if="openOrClose" class="drawerClass">

src/widget/number/index.vue

@@ -280,6 +280,7 @@ const judgeIsEdit = (key: string) => {
 
 
     <div v-if="type === 4" class="form-value" v-html="value" />
+    
     <el-input v-else v-model="value" :disabled="editDisabled" placeholder="请输入编码" clearable >
         <template #prefix>NO.</template>
       </el-input>

src/widget/region/region.vue

@@ -31,6 +31,7 @@ const props = withDefaults(
         numrun?: number
         modelValue?: any // 子表和弹性布局时时有传
         tProp?: string // 子表时的form-item的prop值，用于子表校验用
+        isEdit?: boolean
     }>(),
     {}
 )
@@ -230,7 +231,7 @@ const valueArea = computed(() => {
 </script>
 <template>
     <el-input
-v-model="value" :disabled="editDisabled" clearable placeholder="请选择地址" style="width:100%"
+v-model="value" :disabled="props.isEdit" clearable placeholder="请选择地址" style="width:100%" 
         :style="getFormItemInputStyle(configStyle, 2)" :input-style="getFormItemInputStyle(configStyle, 3)"
         @click="openAddress" />
 
@@ -244,7 +245,7 @@ v-model="addressBox" title="选择地址" width="700px" :append-to-body="true" :
 
         <RegionColumns v-model="region" class="region-container" :city="cityFlag" :area="areaFlag" />
         <el-input
-v-if="detailFlag" v-model="locDetail" class="region-container1" rows="2" type="textarea"
+v-if="detailFlag" v-model="locDetail" class="region-container1" rows="2" type="textarea" 
             placeholder="请输入详细地址" />
 
         <template #footer>
@@ -271,4 +272,4 @@ v-if="detailFlag" v-model="locDetail" class="region-container1" rows="2" type="t
     width: calc(70%);
     margin-bottom: 10px;
 }
-</style>
+</style>