tianheng-ui 0.1.67 → 0.1.68

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tianheng-ui",
   "description": "A Vue.js project",
-  "version": "0.1.67",
+  "version": "0.1.68",
   "author": "shu lang <403732931@qq.com>",
   "license": "MIT",
   "private": false,

package/packages/FormMaking/GenerateForm.vue

@@ -259,6 +259,7 @@ export default {
       const params = {};
       for (let e of api.inParams) {
         const value =
+          e.defaultValue ||
           getProperty(this.models, e.pAlias) ||
           getProperty(this.query, e.pAlias) ||
           null;
@@ -296,7 +297,8 @@ export default {
           if (item.children) {
             initParams(item.children);
           } else {
-            const value = getProperty(this.models, item.pAlias) || null;
+            const value =
+            item.defaultValue || getProperty(this.models, item.pAlias) || null;
             setProperty(params, item.pAlias, value);
           }
         });

package/packages/FormMaking/WidgetConfig.vue

@@ -102,6 +102,7 @@
             :config="config"
             :apiOptions="apiOptions"
             :is="compsData[data.type].content"
+            @remote-params="handleFieldsApiChange"
           ></component>
 
           <el-collapse-item

package/packages/FormMaking/WidgetTools.vue

@@ -480,8 +480,10 @@ export default {
             });
           } else if (item.type === "table" || item.type === "tableH5") {
             initList(item.options.columns);
-          } else if (item.options.remote?.open || item.options.remote?.api) {
-            fieldsApi[item.model] = item.options.remote.api;
+          } else if (item.type === "workflow") {
+            initList(item.options.buttons);
+          }  else if (item.options.remote?.open || item.options.remote?.api) {
+            fieldsApi[item.model || item.name] = item.options.remote.api;
           }
         }
       };

package/packages/FormMaking/custom/config.js

@@ -998,43 +998,44 @@ export const businessComponents = [
             timestamp: "2023-05-05 14:30"
           }
         ],
-        processInstButtons: [
-          {
-            name: "通过",
-            options: {
-              remote: {
-                api: ""
-              },
-              type: "primary",
-              icon: "",
-              size: "small",
-              plain: false,
-              round: false,
-              circle: false,
-              disabled: false,
-              loading: false,
-              customStyle: ""
-            }
-          },
-          {
-            name: "驳回",
-            options: {
-              remote: {
-                api: ""
-              },
-              type: "primary",
-              icon: "",
-              size: "small",
-              plain: false,
-              round: false,
-              circle: false,
-              disabled: false,
-              loading: false,
-              customStyle: ""
-            }
-          }
-        ]
+        processInstButtons: null
       },
+      buttons: [
+        {
+          name: "通过",
+          options: {
+            remote: {
+              api: ""
+            },
+            type: "primary",
+            icon: "",
+            size: "small",
+            plain: false,
+            round: false,
+            circle: false,
+            disabled: false,
+            loading: false,
+            customStyle: ""
+          }
+        },
+        {
+          name: "驳回",
+          options: {
+            remote: {
+              api: ""
+            },
+            type: "primary",
+            icon: "",
+            size: "small",
+            plain: false,
+            round: false,
+            circle: false,
+            disabled: false,
+            loading: false,
+            customStyle: ""
+          }
+        }
+      ],
       hideLabel: true
     },
     events: {},

package/packages/FormMaking/custom/configs/workflow.vue

@@ -52,7 +52,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item v-if="!widget.options.remote.open" label-width="0">
+      <el-form-item v-else label-width="0">
         <draggable
           :list="widget.options.defaultValue.processInstTaskRsps"
           v-bind="{
@@ -101,9 +101,20 @@
           >
         </div>
       </el-form-item>
-      <el-form-item v-if="!widget.options.remote.open" label-width="0">
+
+      <el-form-item>
+        <el-tooltip
+          slot="label"
+          effect="light"
+          content="流程节点的默认操作，可被远端节点数据的 processInstButtons 配置属性覆盖"
+          placement="top"
+        >
+          <span style="color: #409EFF;">操作按钮</span>
+        </el-tooltip>
+      </el-form-item>
+      <el-form-item label-width="0">
         <draggable
-          :list="widget.options.defaultValue.processInstButtons"
+          :list="widget.options.buttons"
           v-bind="{
             group: { name: 'options' },
             ghostClass: 'ghost',
@@ -112,8 +123,7 @@
           handle=".drag"
         >
           <div
-            v-for="(item, index) in widget.options.defaultValue
-              .processInstButtons"
+            v-for="(item, index) in widget.options.buttons"
             class="draggable-item"
             :key="index"
           >
@@ -242,8 +252,7 @@
             >
           </div>
           <div
-            v-for="(item, index) in widget.options.defaultValue
-              .processInstButtons"
+            v-for="(item, index) in widget.options.buttons"
             class="list-item th-is_hover"
             :class="{
               'th-is_active': dialog.data && dialog.data.name === item.name
@@ -328,17 +337,17 @@
               <el-select
                 v-model="dialog.data.options.remote.api"
                 style="width:100%"
-                value-key="id"
                 clearable
                 placeholder=""
                 filterable
                 no-data-text="暂无接口，请前往【接口模块】创建"
+                @change="handleRemoteApiChange"
               >
                 <el-option
                   v-for="item in apiOptions"
                   :key="item.id"
                   :label="item.name"
-                  :value="item"
+                  :value="item.id"
                 >
                 </el-option>
               </el-select>
@@ -400,9 +409,8 @@ export default {
           timestamp: "节点时间"
         });
       } else {
-        this.widget.options.defaultValue.processInstButtons.push({
-          name: `操作${this.widget.options.defaultValue.processInstButtons
-            .length + 1}`,
+        this.widget.options.buttons.push({
+          name: `操作${this.widget.options.buttons.length + 1}`,
           options: {
             remote: {
               api: ""
@@ -423,7 +431,7 @@ export default {
     handleRemoveOption(index, type) {
       if (type === "processInstTaskRsps")
         this.widget.options.defaultValue.processInstTaskRsps.splice(index, 1);
-      else this.widget.options.defaultValue.processInstButtons.splice(index, 1);
+      else this.widget.options.buttons.splice(index, 1);
     },
     handleRemoteChange(val) {
       if (val) return;
@@ -433,13 +441,16 @@ export default {
       const data =
         action === "processInstTaskRsps"
           ? this.widget.options.defaultValue.processInstTaskRsps[index]
-          : this.widget.options.defaultValue.processInstButtons[index];
+          : this.widget.options.buttons[index];
       this.dialog = {
         show: true,
         action,
         data,
         index
       };
+    },
+    handleRemoteApiChange(val) {
+      this.$emit("remote-params", val);
     }
   }
 };

package/packages/FormMaking/custom/items/workflow.vue

@@ -58,12 +58,14 @@
       </el-timeline-item>
     </el-timeline>
     <div
-      v-if="dataModel.processInstButtons.length"
+      v-if="dataModel.processInstButtons || widget.options.buttons.length"
       class="footer"
       :class="{ sticky: widget.options.buttonsSticky }"
     >
       <el-button
-        v-for="(item, index) in dataModel.processInstButtons"
+        v-for="(item, index) in dataModel.processInstButtons
+          ? dataModel.processInstButtons
+          : widget.options.buttons"
         :key="index"
         :style="item.options.customStyle"
         :type="item.options.type"

package/packages/FormMaking/index.vue

@@ -349,9 +349,9 @@ export default {
           } else if (item.type === "table" || item.type === "tableH5") {
             initList(item.options.columns);
           } else if (item.type === "workflow") {
-            initList(item.options.defaultValue.processInstButtons);
+            initList(item.options.buttons);
           } else if (item.options.remote?.open || item.options.remote?.api) {
-            fieldsApi[item.model] = item.options.remote.api;
+            fieldsApi[item.model || item.name] = item.options.remote.api;
           }
         }
       };