tianheng-ui 0.1.66 → 0.1.68

package/package.json

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

package/packages/FormMaking/GenerateForm.vue

@@ -181,7 +181,7 @@ export default {
     hendleElementRemoteData(item) {
       if (!item.options.remote || !item.options.remote.open) return;
       if (item.type === "upload" || item.type === "button") return;
-      
+
       let api = "";
       if (item.options.remote.api.constructor === String) {
         api = this.formConfig.config.network[item.options.remote.api];
@@ -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;
@@ -291,18 +292,18 @@ export default {
       if (!api) return this.$message.warning("未知的接口，请检查配置信息");
 
       let params = {};
-      const inParams = api.inParams || [];
       const initParams = list => {
         list.map(item => {
           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);
           }
         });
       };
-      initParams(inParams);
+      api.inParams && initParams(api.inParams);
       if (api.needPage) {
         params.pageNum = params.pageNum || 1;
         params.pageSize = params.pageNum || 20;

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
@@ -515,7 +516,7 @@ export default {
     "config.mounted.api"(val) {
       this.handleFieldsApiChange(val);
     },
-    "data.options.remoteFunc"(val) {
+    "data.options.remote.api"(val) {
       this.handleFieldsApiChange(val);
     },
     apiOptions() {

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

@@ -906,7 +906,6 @@ export const businessComponents = [
             format: "",
             style: {
               label: {
-                width: "",
                 customStyle: ""
               },
               value: {
@@ -931,6 +930,7 @@ export const businessComponents = [
       reverse: false,
       placement: "right",
       hideTimestamp: false,
+      buttonsSticky: true,
       remote: {
         open: false,
         api: "",
@@ -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/tabs.vue

@@ -42,10 +42,10 @@
 
       <el-form-item label="数据类型">
         <el-radio-group
-          v-model="widget.options.remote"
+          v-model="widget.options.remote.open"
           @input="
             val => {
-              if (!val) widget.options.remoteFunc = '';
+              if (!val) widget.options.remote.api = '';
             }
           "
         >
@@ -58,7 +58,7 @@
         <div v-if="widget.options.remote">
           <el-select
           style="width:100%"
-          v-model="widget.options.remoteFunc"
+          v-model="widget.options.remote.api"
           placeholder="请选择"
           no-data-text="暂无数据，请查阅相关文档说明"
           clearable

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

@@ -62,11 +62,11 @@
 
       <el-form-item label="上传地址" :required="true">
         <el-radio-group
-          v-model="widget.options.remote"
+          v-model="widget.options.remote.open"
           size="mini"
           @input="
             val => {
-              if (!val) widget.options.remoteFunc = '';
+              if (!val) widget.options.remote.api = '';
             }
           "
         >
@@ -76,7 +76,7 @@
         <el-select
           v-if="widget.options.remote"
           style="width:100%"
-          v-model="widget.options.remoteFunc"
+          v-model="widget.options.remote.api"
           placeholder="请选择"
           no-data-text="暂无数据，请查阅相关文档说明"
           clearable

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

@@ -20,6 +20,9 @@
       <el-form-item label="隐藏时间">
         <el-switch v-model="widget.options.hideTimestamp"></el-switch>
       </el-form-item>
+      <el-form-item label="操作悬浮">
+        <el-switch v-model="widget.options.buttonsSticky"></el-switch>
+      </el-form-item>
 
       <el-form-item label="节点数据">
         <el-radio-group
@@ -49,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="{
@@ -98,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',
@@ -109,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"
           >
@@ -239,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
@@ -325,16 +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>
@@ -396,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: ""
@@ -419,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;
@@ -429,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/alliance.vue

@@ -79,7 +79,6 @@ export default {
         ...row.options.columns[colIndex].list[newIndex],
         options: {
           ...row.options.columns[colIndex].list[newIndex].options
-          // remoteFunc: "func_" + key
         },
         key,
         // 绑定键值

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

@@ -20,43 +20,8 @@
 
 <script>
 import { itemsComponent, eventMixin } from "../mixins/index";
-import * as Axios from "lib/theme-chalk/js/axios";
 export default {
-  mixins: [itemsComponent, eventMixin],
-  data() {
-    return {
-      axios: null
-    };
-  },
-  created() {
-    const oauthConfig = localStorage.getItem("TH_OauthConfig") || "{}";
-    this.axios = Axios.init(JSON.parse(oauthConfig));
-  },
-  methods: {
-    // hendleRemoteData() {
-    //   const remoteFunc = this.config.network[this.widget.options.remoteFunc];
-    //   console.log(remoteFunc);
-    //   const requestConfig = {
-    //     url: remoteFunc.url,
-    //     method: remoteFunc.method,
-    //     headers: remoteFunc.headers
-    //   };
-    //   let params = { ...remoteFunc.params };
-    //   if (remoteFunc.needPage) {
-    //     params.pageNum = 1;
-    //     params.pageSize = 20;
-    //   }
-    //   if (remoteFunc.method.toLowerCase() === "get") {
-    //     requestConfig.params = params;
-    //   } else {
-    //     params = Object.assign(params, this.models);
-    //     requestConfig.data = params;
-    //   }
-    //   this.axios(requestConfig).then(res => {
-    //     this.$emit("button-submit", requestConfig);
-    //   });
-    // }
-  }
+  mixins: [itemsComponent, eventMixin]
 };
 </script>
 

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

@@ -14,14 +14,14 @@
     >
       <el-descriptions-item v-for="(item, index) in dataModel" :key="index">
         <template slot="label">
-          <div :style="labelStyle(item)">
+          <div class="item-label" :style="labelStyle(item)">
             <i v-if="item.icon" :class="item.icon"></i>
             <span v-html="item.label"></span>
             <span v-if="widget.options.colon">:</span>
           </div>
         </template>
         <a v-if="item.type === 'url'" :href="item.value">{{ item.value }}</a>
-        <span v-else v-html="item.value"></span>
+        <span v-else class="item-value" v-html="item.value"></span>
       </el-descriptions-item>
     </el-descriptions>
   </div>
@@ -36,7 +36,7 @@ export default {
       return item => {
         let style = {
           width: this.widget.options.labelWidth,
-          textAlignLast: this.widget.options.textAlignLast
+          "text-align-last": this.widget.options.textAlignLast
         };
         if (item.options?.style?.label) {
           style = Object.assign(style, item.options.style.label);
@@ -70,6 +70,12 @@ export default {
 
 <style lang="scss" scoped>
 .component-descriptions {
+  .item-label {
+    color: #333;
+  }
+  .item-value {
+    color: #666;
+  }
   .el-descriptions {
     padding: 0px;
   }

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

@@ -3,8 +3,6 @@
     <el-upload
       class="upload-demo"
       :action="uploadUrl"
-      :headers="widget.options.remote ? widget.options.remoteFunc.headers : {}"
-      :data="widget.options.remote ? widget.options.remoteFunc.params : {}"
       :multiple="widget.options.multiple"
       :limit="widget.options.length"
       :width="widget.options.size.width"
@@ -66,11 +64,11 @@ export default {
   },
   computed: {
     uploadUrl() {
-      if (this.widget.options.remote) {
+      if (this.widget.options.remote.open) {
         const info = sessionStorage.getItem("th_oauth_info");
         let baseUrl = "";
         if (info) baseUrl = JSON.parse(info).baseUrl;
-        const func = this.config.network[this.widget.options.remoteFunc];
+        const func = this.config.network[this.widget.options.remote.api];
         if (!func) {
           this.$message.warning("未知的请求接口，请检查配置信息");
           return "";

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

@@ -24,7 +24,7 @@
         "
       >
         <div>
-          <div class="workflow-item-header">
+          <div class="item-header">
             <div class="title">{{ item.name }}</div>
             <div
               v-if="
@@ -54,13 +54,18 @@
               />
             </th-cell>
           </div>
-          <div class="workflow-item-footer"></div>
         </div>
       </el-timeline-item>
     </el-timeline>
-    <div v-if="dataModel.processInstButtons.length" class="footer">
+    <div
+      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"
@@ -95,7 +100,7 @@ export default {
   .el-timeline {
     padding: 0px;
   }
-  .workflow-item-header {
+  .item-header {
     margin-bottom: 5px;
     height: 20px;
     line-height: 20px;
@@ -117,15 +122,20 @@ export default {
       height: 24px;
     }
   }
-  .workflow-item-footer {
-  }
 
   .footer {
     display: flex;
+    align-items: center;
+    justify-content: space-evenly;
 
     .el-button {
       flex: 1;
     }
   }
+  .sticky {
+    position: sticky;
+    bottom: 0;
+    z-index: 99;
+  }
 }
 </style>

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;
           }
         }
       };

package/packages/FormMaking/util/generateCode.js

@@ -29,9 +29,9 @@ function findRemoteFunc(list, funcList, tokenFuncList, blankList) {
           });
         }
       } else {
-        if (list[i].options.remote && list[i].options.remoteFunc) {
+        if (list[i].options.remote.open && list[i].options.remote.api) {
           funcList.push({
-            func: list[i].options.remoteFunc,
+            func: list[i].options.remote.api,
             label: list[i].name,
             model: list[i].model
           });