修改新建数据TabResource/newModelData的接口。

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "client-base-v4",
-  "version": "4.0.78",
+  "version": "4.0.79",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "client-base-v4",
-      "version": "4.0.78",
+      "version": "4.0.79",
       "dependencies": {
         "ant-design-vue": "^4.2.1"
       },
@@ -44,7 +44,7 @@
         "click-outside-vue3": "^4.0.1",
         "dayjs": "^1.11.6",
         "dingtalk-jsapi": "^2.10.3",
-        "pc-component-v3": "1.0.87-t2",
+        "pc-component-v3": "1.0.87-t3",
         "uuid": "^8.3.2",
         "v-tooltip": "^4.0.0-beta.17",
         "vue-request": "^1.2.4",
@@ -7214,9 +7214,9 @@
       }
     },
     "node_modules/pc-component-v3": {
-      "version": "1.0.87-t2",
-      "resolved": "http://wuzhixin.vip:4873/pc-component-v3/-/pc-component-v3-1.0.87-t2.tgz",
-      "integrity": "sha512-mh8Huf7w0yYmKmihJdQIenOMa9fACr2bqdvcweltp6AWFxH6iw7aVqPVrN41OFM1emD7zl23uzyF+/haWZ3MsA==",
+      "version": "1.0.87-t3",
+      "resolved": "http://wuzhixin.vip:4873/pc-component-v3/-/pc-component-v3-1.0.87-t3.tgz",
+      "integrity": "sha512-UR1qZj0EPnfZqY8nUsr8EBUs5drZm78xl3VbWiP/Po86tZetjstKodqdNijkHraXX81vWYW7GYlskCN+5L+3sw==",
       "license": "Leanwo Business Software License",
       "peer": true,
       "peerDependencies": {

src/api/dic/TabResource.js

@@ -134,7 +134,7 @@ export default {
 	 * 工具作者: 杨志杰
 	 * 获取新的modelData 
 	 */
-  newModelData: function(windowNo, tabIndex){
+  newModelData: function(windowNo, tabIndex, modelDataCreate){
     var requestUrl = 'TabResource/newModelData';
     var paramCount = 0;
     if(windowNo != null){
@@ -150,8 +150,9 @@ export default {
     return new Promise((resolve, reject) => {
       $.ajax({
         url: Common.getApiURL(requestUrl),
-        type: 'get',
-				
+        type: 'post',
+        contentType: 'application/json',
+        data: JSON.stringify(modelDataCreate),
 				
 				
 				

src/resource/dictionary/WindowServerUtil.js

@@ -146,16 +146,14 @@ export default {
 
 
   // 根据windowId查询TabId
-  newModelData: function (windowNo, tabIndex, success, error) {
+  newModelData: function (windowNo, tabIndex, modelDataCreate, success, error) {
     
 
     $.ajax({
-      type: 'get',
-      url: Common.getApiURL('TabResource/newModelData'),
-      data: {
-        windowNo: windowNo,
-        tabIndex: tabIndex,
-      },
+      type: 'post',
+      url: Common.getApiURL('TabResource/newModelData?windowNo=' + windowNo + '&tabIndex=' + tabIndex),
+      contentType: 'application/json',
+      data: JSON.stringify(modelDataCreate),
       beforeSend: function (request) {
         Common.addTokenToRequest(request);
       },

src/window/tabFormView/TabFormEdit.vue

@@ -730,10 +730,16 @@ export default {
           WindowServerUtil.newModelData(
             _self.windowNo,
             _self.tabIndex,
-            function (modelData) {
+            null,
+            function (response) {
               if (_self.$refs.loading != undefined) {
                 _self.loading = false;
               }
+              if(response.errorCode != 0){
+                Notify.error('数据新建异常', response.errorMessage, false);
+                return;
+              }
+              let modelData = response.data;
 
               modelData.editMode = true;
 

src/window/tabFormView/TabFormView.vue

@@ -1516,7 +1516,6 @@ export default {
 
     // 新建数据
     createRecord: function () {
-      // this.modelData = WindowClientUtil.newModelData(this.tab);
       var currIndex = this.currIndex;
       var totalCount = this.totalCount;
       if (this.curdWindowFunctionAccess.allowCreate != null && this.curdWindowFunctionAccess.allowCreate === true) {

src/window/tabGridView/SubTabGridEdit.vue

@@ -523,12 +523,18 @@ export default {
         WindowServerUtil.newModelData(
           _self.windowNo,
           _self.tabIndex,
-          function (modelData) {
+          null,
+          function (response) {
+            _self.loading = false;
+            if(response.errorCode != 0){
+              Notify.error('数据新建异常', response.errorMessage, false);
+              return;
+            }
+            let modelData = response.data;
             modelData.editMode = true;
             modelData.visible = true;
             modelData.tabIndex = _self.tabIndex;
             modelData.changed = true;
-            _self.loading = false;
             _self.modelDatas[_self.modelDatas.length] = modelData;
           },
           function () {
@@ -553,12 +559,19 @@ export default {
         WindowServerUtil.newModelData(
           _self.windowNo,
           _self.tabIndex,
-          function (modelData) {
+          null,
+          function (response) {
+            _self.loading = false;
+            if(response.errorCode != 0){
+              Notify.error('数据新建异常', response.errorMessage, false);
+              return;
+            }
+            let modelData = response.data;
+
             modelData.editMode = true;
             modelData.visible = true;
             modelData.tabIndex = _self.tabIndex;
             modelData.data[fieldName] = fieldValue;
-            _self.loading = false;
             _self.modelDatas[_self.modelDatas.length] = modelData;
           },
           function () {

src/window/tabGridView/TabGridEdit.vue

@@ -880,13 +880,19 @@ export default {
           );
         } else {
           // 如果不存在子页签，则可以直接在当前的界面上新建数据
-          // var modelData = WindowClientUtil.newModelData(_self.tab);
           _self.loading=true;
           WindowServerUtil.newModelData(
             _self.windowNo,
             _self.tabIndex,
-            function (modelData) {
+            null,
+            function (response) {
               _self.loading=false;
+              if(response.errorCode != 0){
+                Notify.error('数据新建异常', response.errorMessage, false);
+                return;
+              }
+              let modelData = response.data;
+
               modelData.editMode = true;
               for (var i = _self.modelDatas.length; i > 0; i--) {
                 _self.modelDatas[i]= _self.modelDatas[i - 1];

src/window1/CurdWindowModal.vue

@@ -5,7 +5,8 @@
     :window-no="mCurdWindowNo" :tab-index="mTabIndex" :type="tabEditViewType" :model-data-id="tabEditViewRecordId"
     width="100%" :current-page="tabEditViewCurrentPage" :current-index="tabEditViewCurrentIndex"
     :total-records="tabEditViewTotalRecords" :task-info-id="tabEditViewTaskInfoId"
-    :workflow-type="tabEditViewWorkflowType" :mask-closable="false" @open-tab-form-view="openTabFormView"
+    :workflow-type="tabEditViewWorkflowType" :mask-closable="false" :model-data-create="modelDataCreate"
+    @open-tab-form-view="openTabFormView"
   />
   <TabFormViewModal
     v-if="openTabViewModal"
@@ -87,6 +88,13 @@ const props = defineProps({
     type: String,
     default: null,
   },
+  // 创建新数据时，填充已知的值FieldValue
+  modelDataCreate: {
+    type: Object,
+    default: function(){
+      return {};
+    },
+  },
 });
 
 

src/window1/tabFormEdit/TabFormEdit.vue

@@ -730,11 +730,18 @@ export default {
           WindowServerUtil.newModelData(
             _self.windowNo,
             _self.tabIndex,
-            function (modelData) {
+            null,
+            function (response) {
               if (_self.$refs.loading != undefined) {
                 _self.loading = false;
               }
 
+              if(response.errorCode != 0){
+                Notify.error('数据新建异常', response.errorMessage, false);
+                return;
+              }
+              let modelData = response.data;
+
               modelData.editMode = true;
 
               _self.modelData = modelData;

src/window1/tabFormEdit/TabFormEditModal.vue

@@ -424,6 +424,13 @@ export default {
       type: String,
       default: null,
     },
+    // 创建新数据时，填充已知的值FieldValue
+    modelDataCreate: {
+      type: Object,
+      default: function(){
+        return {};
+      },
+    },
   },
   emits: ['update:open', 'OpenTabFormView'],
   data: function () {
@@ -803,11 +810,18 @@ export default {
           WindowServerUtil.newModelData(
             _self.windowNo,
             _self.tabIndex,
-            function (modelData) {
+            _self.modelDataCreate,
+            function (response) {
               if (_self.$refs.loading != undefined) {
                 _self.loading = false;
               }
 
+              if(response.errorCode != 0){
+                Notify.error('数据新建异常', response.errorMessage, false);
+                return;
+              }
+              let modelData = response.data;
+
               modelData.editMode = true;
 
               _self.modelData = modelData;

src/window1/tabFormView/TabFormView.vue

@@ -1516,7 +1516,6 @@ export default {
 
     // 新建数据
     createRecord: function () {
-      // this.modelData = WindowClientUtil.newModelData(this.tab);
       var currIndex = this.currIndex;
       var totalCount = this.totalCount;
       if (this.curdWindowFunctionAccess.allowCreate != null && this.curdWindowFunctionAccess.allowCreate === true) {

src/window1/tabGridView/NewTabButton.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="button_list">
     <div v-if="leftTabButton.length === 0" />
-    <a-breadcrumb v-if="leftTabButton && leftTabButton.length" separator="|">
-      <a-breadcrumb-item v-for="(item, index) in leftTabButton" :key="index">
+    <a-space v-if="leftTabButton && leftTabButton.length" size="small">
+      <template v-for="(item, index) in leftTabButton" :key="index">
         <a-button
           v-if="item.action === 'CREATE'"
           :icon="h(PlusSquareTwoTone)"
@@ -63,19 +63,19 @@
           {{ item.name }}
         </a-button>
         <a-button v-else :icon="h(LayoutTwoTone)">{{ item.name }}</a-button>
-      </a-breadcrumb-item>
+      </template>
 
-      <!-- <a-breadcrumb-item>
+      <!-- <a-space>
         <GridColumnDef
           :window-no="windowNo"
           :tab-index="tabIndex"
           :tab-grid-fields="tabGridFields"
           @property-changed="propertyChanged($event)"
         />
-      </a-breadcrumb-item> -->
-    </a-breadcrumb>
-    <a-breadcrumb separator="|">
-      <a-breadcrumb-item v-for="(item, index) in rightTabButton" :key="index">
+      </a-space> -->
+    </a-space>
+    <a-space size="small">
+      <template v-for="(item, index) in rightTabButton" :key="index">
         <a-button
           v-if="item.action === 'CREATE'"
           :icon="h(PlusSquareTwoTone)"
@@ -136,8 +136,8 @@
           {{ item.name }}
         </a-button>
         <a-button v-else :icon="h(LayoutTwoTone)">{{ item.name }}</a-button>
-      </a-breadcrumb-item>
-    </a-breadcrumb>
+      </template>
+    </a-space>
   </div>
 
   <Modal

src/window1/tabGridView/SubTabGridEdit.vue

@@ -522,12 +522,20 @@ export default {
         WindowServerUtil.newModelData(
           _self.windowNo,
           _self.tabIndex,
-          function (modelData) {
+          null,
+          function (response) {            
+            _self.loading = false;
+
+            if(response.errorCode != 0){
+              Notify.error('数据新建异常', response.errorMessage, false);
+              return;
+            }
+            let modelData = response.data;
+
             modelData.editMode = true;
             modelData.visible = true;
             modelData.tabIndex = _self.tabIndex;
             modelData.changed = true;
-            _self.loading = false;
             _self.modelDatas[_self.modelDatas.length] = modelData;
           },
           function () {
@@ -552,12 +560,20 @@ export default {
         WindowServerUtil.newModelData(
           _self.windowNo,
           _self.tabIndex,
-          function (modelData) {
+          null,
+          function (response) {
+            _self.loading = false;
+            
+            if(response.errorCode != 0){
+              Notify.error('数据新建异常', response.errorMessage, false);
+              return;
+            }
+            let modelData = response.data;
+
             modelData.editMode = true;
             modelData.visible = true;
             modelData.tabIndex = _self.tabIndex;
             modelData.data[fieldName] = fieldValue;
-            _self.loading = false;
             _self.modelDatas[_self.modelDatas.length] = modelData;
           },
           function () {

src/window1/tabGridView/TabGridEdit.vue

@@ -892,13 +892,21 @@ export default {
           // );
         } else {
           // 如果不存在子页签，则可以直接在当前的界面上新建数据
-          // var modelData = WindowClientUtil.newModelData(_self.tab);
           _self.loading = true;
           WindowServerUtil.newModelData(
             _self.windowNo,
             _self.tabIndex,
-            function (modelData) {
+            null,
+            function (response) {
               _self.loading = false;
+
+              
+              if(response.errorCode != 0){
+                Notify.error('数据新建异常', response.errorMessage, false);
+                return;
+              }
+              let modelData = response.data;
+
               modelData.editMode = true;
               for (var i = _self.modelDatas.length; i > 0; i--) {
                 _self.modelDatas[i] = _self.modelDatas[i - 1];