eoss-ui 0.6.40 → 0.6.41

package/lib/tips.js

@@ -560,6 +560,7 @@ var ajaxStream = function ajaxStream(_ref2) {
     var lastProcessedIndex = 0;
     var done = false;
     var finishThink = false;
+    var hasThink = false;
     ajax(_extends({
       timeout: 990000,
       format: false,
@@ -613,8 +614,12 @@ var ajaxStream = function ajaxStream(_ref2) {
                   var start = parsedData.message.match(startRegex);
                   var end = parsedData.message.match(endRegex);
                   if (start) {
+                    hasThink = true;
                     var _thinkContent = start[1] ? start[1].trim() : ''; // <think> 标签内的数据
                     info.thinkContent += _thinkContent;
+                  } else if (hasThink === false) {
+                    info.content += parsedData.message;
+                    chunks += parsedData.message;
                   } else {
                     if (end) {
                       finishThink = true;

package/lib/tree-group.js

@@ -560,6 +560,7 @@ var ajaxStream = function ajaxStream(_ref2) {
     var lastProcessedIndex = 0;
     var done = false;
     var finishThink = false;
+    var hasThink = false;
     ajax(_extends({
       timeout: 990000,
       format: false,
@@ -613,8 +614,12 @@ var ajaxStream = function ajaxStream(_ref2) {
                   var start = parsedData.message.match(startRegex);
                   var end = parsedData.message.match(endRegex);
                   if (start) {
+                    hasThink = true;
                     var _thinkContent = start[1] ? start[1].trim() : ''; // <think> 标签内的数据
                     info.thinkContent += _thinkContent;
+                  } else if (hasThink === false) {
+                    info.content += parsedData.message;
+                    chunks += parsedData.message;
                   } else {
                     if (end) {
                       finishThink = true;

package/lib/tree.js

@@ -560,6 +560,7 @@ var ajaxStream = function ajaxStream(_ref2) {
     var lastProcessedIndex = 0;
     var done = false;
     var finishThink = false;
+    var hasThink = false;
     ajax(_extends({
       timeout: 990000,
       format: false,
@@ -613,8 +614,12 @@ var ajaxStream = function ajaxStream(_ref2) {
                   var start = parsedData.message.match(startRegex);
                   var end = parsedData.message.match(endRegex);
                   if (start) {
+                    hasThink = true;
                     var _thinkContent = start[1] ? start[1].trim() : ''; // <think> 标签内的数据
                     info.thinkContent += _thinkContent;
+                  } else if (hasThink === false) {
+                    info.content += parsedData.message;
+                    chunks += parsedData.message;
                   } else {
                     if (end) {
                       finishThink = true;

package/lib/upload.js

@@ -559,6 +559,7 @@ var ajaxStream = function ajaxStream(_ref2) {
     var lastProcessedIndex = 0;
     var done = false;
     var finishThink = false;
+    var hasThink = false;
     ajax(_extends({
       timeout: 990000,
       format: false,
@@ -612,8 +613,12 @@ var ajaxStream = function ajaxStream(_ref2) {
                   var start = parsedData.message.match(startRegex);
                   var end = parsedData.message.match(endRegex);
                   if (start) {
+                    hasThink = true;
                     var _thinkContent = start[1] ? start[1].trim() : ''; // <think> 标签内的数据
                     info.thinkContent += _thinkContent;
+                  } else if (hasThink === false) {
+                    info.content += parsedData.message;
+                    chunks += parsedData.message;
                   } else {
                     if (end) {
                       finishThink = true;

package/lib/utils/util.js

@@ -477,6 +477,7 @@ var ajaxStream = function ajaxStream(_ref2) {
     var lastProcessedIndex = 0;
     var done = false;
     var finishThink = false;
+    var hasThink = false;
     ajax(_extends({
       timeout: 990000,
       format: false,
@@ -530,8 +531,12 @@ var ajaxStream = function ajaxStream(_ref2) {
                   var start = parsedData.message.match(startRegex);
                   var end = parsedData.message.match(endRegex);
                   if (start) {
+                    hasThink = true;
                     var _thinkContent = start[1] ? start[1].trim() : ''; // <think> 标签内的数据
                     info.thinkContent += _thinkContent;
+                  } else if (hasThink === false) {
+                    info.content += parsedData.message;
+                    chunks += parsedData.message;
                   } else {
                     if (end) {
                       finishThink = true;

package/lib/wujie.js

@@ -560,6 +560,7 @@ var ajaxStream = function ajaxStream(_ref2) {
     var lastProcessedIndex = 0;
     var done = false;
     var finishThink = false;
+    var hasThink = false;
     ajax(_extends({
       timeout: 990000,
       format: false,
@@ -613,8 +614,12 @@ var ajaxStream = function ajaxStream(_ref2) {
                   var start = parsedData.message.match(startRegex);
                   var end = parsedData.message.match(endRegex);
                   if (start) {
+                    hasThink = true;
                     var _thinkContent = start[1] ? start[1].trim() : ''; // <think> 标签内的数据
                     info.thinkContent += _thinkContent;
+                  } else if (hasThink === false) {
+                    info.content += parsedData.message;
+                    chunks += parsedData.message;
                   } else {
                     if (end) {
                       finishThink = true;

package/lib/wxlogin.js

@@ -560,6 +560,7 @@ var ajaxStream = function ajaxStream(_ref2) {
     var lastProcessedIndex = 0;
     var done = false;
     var finishThink = false;
+    var hasThink = false;
     ajax(_extends({
       timeout: 990000,
       format: false,
@@ -613,8 +614,12 @@ var ajaxStream = function ajaxStream(_ref2) {
                   var start = parsedData.message.match(startRegex);
                   var end = parsedData.message.match(endRegex);
                   if (start) {
+                    hasThink = true;
                     var _thinkContent = start[1] ? start[1].trim() : ''; // <think> 标签内的数据
                     info.thinkContent += _thinkContent;
+                  } else if (hasThink === false) {
+                    info.content += parsedData.message;
+                    chunks += parsedData.message;
                   } else {
                     if (end) {
                       finishThink = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.6.40",
+  "version": "0.6.41",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/data-table/src/main.vue

@@ -1701,7 +1701,9 @@ export default {
               ? this.$refs.toolbar.$el.offsetHeight
               : 0;
             height -=
-              this.page === false ? 0 : this.$refs.pagination.$el.offsetHeight;
+              this.page === false || this.showPage == false
+                ? 0
+                : this.$refs.pagination.$el.offsetHeight;
             height -= this.title ? this.$refs.title.offsetHeight : 0;
             height -= parseInt(
               util.getStyle(this.$refs.esTableContent, 'padding-top'),

package/packages/flow/src/component/taskUnionExamine.vue

@@ -119,14 +119,11 @@
         />
         <!-- <span>{{ infoList.noticeInfo }}</span> -->
       </el-form-item>
-      
     </el-form>
     <div style="text-align: right">
-          <el-button type="primary" size="small" @click="subMit">
-            确定
-          </el-button>
-          <el-button @click="quit" size="small"> 取消 </el-button>
-        </div>
+      <el-button type="primary" size="small" @click="subMit"> 确定 </el-button>
+      <el-button @click="quit" size="small"> 取消 </el-button>
+    </div>
   </div>
 </template>
 
@@ -170,8 +167,8 @@ export default {
       opinion: '', //办理意见
       readOnlyNotificationType: '',
       notificationMessageReadOnly: false,
-      otherMix:false,
-      currentMix:false,
+      otherMix: false,
+      currentMix: false,
       infoList: {
         nextOtherOrgObj: [],
         nextCurrentOrgObj: [],
@@ -332,7 +329,9 @@ export default {
             } = res;
             if (res.data.customizedConfig) {
               if (res.data.customizedConfig.currentOrgSelectorCustomized) {
-                this.currentMix = res.data.customizedConfig.currentOrgSelectorSelectMix == 'true';
+                this.currentMix =
+                  res.data.customizedConfig.currentOrgSelectorSelectMix ==
+                  'true';
                 this.currentOrgTabs =
                   res.data.customizedConfig.currentOrgSelectorItemList.split(
                     ','
@@ -342,9 +341,14 @@ export default {
                     ','
                   );
                 this.currentOrgTabs.map((x, i) => {
-                  this.params[x] = { filid: param[i] == 'my'? this.params.filid = JSON.parse(
-                    sessionStorage.getItem('mainConfig')
-                  ).userModel.orgId : param[i]};
+                  this.params[x] = {
+                    filid:
+                      param[i] == 'my'
+                        ? (this.params.filid = JSON.parse(
+                            sessionStorage.getItem('mainConfig')
+                          ).userModel.orgId)
+                        : param[i]
+                  };
                 });
               } else {
                 if (this.type == 'takeAdvice') {
@@ -354,7 +358,9 @@ export default {
                 }
               }
               if (res.data.customizedConfig.foreignOrgSelectorCustomized) {
-                this.otherMix = res.data.customizedConfig.foreignOrgSelectorSelectMix == 'true';
+                this.otherMix =
+                  res.data.customizedConfig.foreignOrgSelectorSelectMix ==
+                  'true';
                 this.foreignOrgTabs =
                   res.data.customizedConfig.foreignOrgSelectorItemList.split(
                     ','
@@ -431,14 +437,17 @@ export default {
         pendingId
       } = this;
       if (
-        (type == 'takeAdvice' &&
-          (!nextCurrentOrgObj && isHideCurrentOrg == 0)) &&
-        (isHideOtherOrg == 0 && !nextOtherOrgObj) 
+        type == 'takeAdvice' &&
+        !nextCurrentOrgObj &&
+        isHideCurrentOrg == 0 &&
+        isHideOtherOrg == 0 &&
+        !nextOtherOrgObj
       ) {
         return this.$message.warning('请选择处理对象!');
       } else if (
         isHideCurrentOrg == 0 &&
-        !nextOtherOrgObj && !nextCurrentOrgObj
+        !nextOtherOrgObj &&
+        !nextCurrentOrgObj
       ) {
         return this.$message.warning('请选择处理对象!');
       }
@@ -478,7 +487,6 @@ export default {
         method: 'POST'
       };
       this.loading = true;
-      console.log(param.data,nextCurrentOrgObj,'data')
       util
         .ajax(param)
         .then((res) => {
@@ -505,12 +513,12 @@ export default {
     changeSelectUser(val, type) {
       const { nextUser, options } = val;
       let newNextUser = [];
-      let obj = {}
+      let obj = {};
       options.map((item) => {
-        if(obj[item.stype]){
-          obj[item.stype].push(item.id)
-        }else{
-          obj[item.stype] = [item.id]
+        if (obj[item.stype]) {
+          obj[item.stype].push(item.id);
+        } else {
+          obj[item.stype] = [item.id];
         }
         // if (newNextUser) {
         //   newNextUser += `,${item.stype}-${item.id}`;
@@ -518,10 +526,10 @@ export default {
         //   newNextUser = `${item.stype}-${item.id}`;
         // }
       });
-      for(let key in obj){
-        newNextUser.push(`${key}-${obj[key].join(',')}`)
+      for (let key in obj) {
+        newNextUser.push(`${key}-${obj[key].join(',')}`);
       }
-      
+
       this.infoList[type] = newNextUser.join('|');
     },
     getNodeType() {

package/packages/flow/src/main.vue

@@ -2584,7 +2584,6 @@ export default {
             this.value = this.value.replace(RegExp('同意。', 'g'), '');
             this.value = val + this.value;
           }
-          console.log(112);
           if (!this.validInfo()) {
             this.freeValid = false;
             return;
@@ -2653,7 +2652,6 @@ export default {
         return false;
       }
       if (!this.value && this.isOpinionRequired === 1) {
-        console.log(1);
         this.$message.warning('请选择输入审批意见');
         return false;
       }

package/packages/flow/src/processForm.vue

@@ -305,8 +305,8 @@ export default {
       type: String,
       default: ''
     },
-    copyHistory:{
-      type:String,
+    copyHistory: {
+      type: String,
       default: ''
     },
     id: {
@@ -317,11 +317,11 @@ export default {
       type: String,
       default: ''
     },
-    isFreeStartFlow:{
+    isFreeStartFlow: {
       type: Boolean,
       default: false
     },
-    taskParams:{
+    taskParams: {
       type: Object,
       default: () => {}
     }
@@ -431,7 +431,6 @@ export default {
     this.getUserInfo();
   },
   mounted() {
-    console.log('发起流程开始')
     this.getNodeType();
     this.getStartFlow(this.processDefinitionId);
     this.newOpinion = this.opinion;
@@ -656,26 +655,38 @@ export default {
             opinion: this.newOpinion || newOpinion
           };
           if (this.activeNames != '1') delete params.customPresetUserJson;
-          if(this.isFreeStartFlow){
-            let newParm = {}
-            newParm.copyHistory = this.copyHistory === 'needCopyPendedHistory'
-            newParm.startFlowParamJson = params
-            newParm.startFlowParamJson.businessId = '93f66a39a52c47deb7a9a25b6424f089' //this.id
-            newParm.startFlowParamJson = JSON.stringify( newParm.startFlowParamJson)
-            for(let key in this.taskParams){
-              if(Array.isArray(this.taskParams[key])){
-                this.taskParams[key] = this.taskParams[key].length>0?this.taskParams[key].join(',') : ''
+          if (this.isFreeStartFlow) {
+            let newParm = {};
+            newParm.copyHistory = this.copyHistory === 'needCopyPendedHistory';
+            newParm.startFlowParamJson = params;
+            newParm.startFlowParamJson.businessId =
+              '93f66a39a52c47deb7a9a25b6424f089'; //this.id
+            newParm.startFlowParamJson = JSON.stringify(
+              newParm.startFlowParamJson
+            );
+            for (let key in this.taskParams) {
+              if (Array.isArray(this.taskParams[key])) {
+                this.taskParams[key] =
+                  this.taskParams[key].length > 0
+                    ? this.taskParams[key].join(',')
+                    : '';
               }
             }
-            newParm.submitTaskParamJson =JSON.stringify( this.taskParams)
-            params=newParm
+            newParm.submitTaskParamJson = JSON.stringify(this.taskParams);
+            params = newParm;
           }
           util
-            .ajax({ url:this.isFreeStartFlow?freeStartFlowWithSubmitTask :  register, method: 'post', data: params })
+            .ajax({
+              url: this.isFreeStartFlow
+                ? freeStartFlowWithSubmitTask
+                : register,
+              method: 'post',
+              data: params
+            })
             .then((res) => {
               const { status, message } = res;
               this.loading = false;
-              if (status === 'success' ||  res.rCode == 0) {
+              if (status === 'success' || res.rCode == 0) {
                 this.quit(true);
                 this.$message.success('操作成功');
               } else {

package/packages/flow/src/reset.vue

@@ -823,7 +823,6 @@ export default {
             this.notificationMessageReadOnly =
               data.notificationMessageReadOnly == 'true';
             let flowList = [];
-            console.log(data.taskNodeList);
             if (data.taskNodeList && data.taskNodeList.length > 0) {
               for (let key in data.taskNodeList[0]) {
                 flowList.push({
@@ -841,7 +840,6 @@ export default {
             }
 
             this.nextNode.nodeInfo = flowList;
-            console.log(this.nextNode.nodeInfo, 'this.nextNode.nodeInfo');
             this.nextNode.nextNode = flowList[0].nodeId;
             this.taskExamine = data.taskExamine;
             this.processDefinitionId = data.taskExamine.processDefinitionId;