tianheng-ui 0.1.65 → 0.1.67

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tianheng-ui",
   "description": "A Vue.js project",
-  "version": "0.1.65",
+  "version": "0.1.67",
   "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];
@@ -291,7 +291,6 @@ export default {
       if (!api) return this.$message.warning("未知的接口，请检查配置信息");
 
       let params = {};
-      const inParams = api.inParams || [];
       const initParams = list => {
         list.map(item => {
           if (item.children) {
@@ -302,7 +301,7 @@ export default {
           }
         });
       };
-      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

@@ -515,7 +515,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/custom/config.js

@@ -851,7 +851,6 @@ export const businessComponents = [
             format: "",
             style: {
               label: {
-                width: "",
                 customStyle: ""
               },
               value: {
@@ -870,7 +869,6 @@ export const businessComponents = [
             format: "",
             style: {
               label: {
-                width: "",
                 customStyle: ""
               },
               value: {
@@ -890,7 +888,6 @@ export const businessComponents = [
             format: "",
             style: {
               label: {
-                width: "",
                 customStyle: ""
               },
               value: {
@@ -909,7 +906,6 @@ export const businessComponents = [
             format: "",
             style: {
               label: {
-                width: "",
                 customStyle: ""
               },
               value: {
@@ -934,6 +930,7 @@ export const businessComponents = [
       reverse: false,
       placement: "right",
       hideTimestamp: false,
+      buttonsSticky: true,
       remote: {
         open: false,
         api: "",
@@ -1039,7 +1036,9 @@ export const businessComponents = [
         ]
       },
       hideLabel: true
-    }
+    },
+    events: {},
+    rules: []
   }
 ];
 

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

@@ -182,11 +182,11 @@
             <el-form-item label="图标">
               <th-icons v-model="dialog.data.icon"></th-icons>
             </el-form-item>
-            <el-form-item label="标题宽度">
+            <!-- <el-form-item label="标题宽度">
               <el-input
                 v-model="dialog.data.options.style.label.width"
               ></el-input>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="数据类型">
               <el-select
                 style="width:100%"
@@ -238,7 +238,7 @@ export default {
           format: "", //type=date 时选填
           //样式对象
           style: {
-            label: { width: "", customStyle: "" }, // 标题样式
+            label: { customStyle: "" }, // 标题样式
             value: { customStyle: "" } // 内容样式
           }
         }

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
@@ -328,6 +331,7 @@
                 value-key="id"
                 clearable
                 placeholder=""
+                filterable
                 no-data-text="暂无接口，请前往【接口模块】创建"
               >
                 <el-option

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)">
-            <i :class="item.icon"></i>
+          <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,9 +36,11 @@ export default {
       return item => {
         let style = {
           width: this.widget.options.labelWidth,
-          textAlignLast: this.widget.options.textAlignLast
+          "text-align-last": this.widget.options.textAlignLast
         };
-        style = Object.assign(style, item.options.style.label);
+        if (item.options?.style?.label) {
+          style = Object.assign(style, item.options.style.label);
+        }
         return this.initStyle(style);
       };
     }
@@ -68,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,11 +54,14 @@
               />
             </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.length"
+      class="footer"
+      :class="{ sticky: widget.options.buttonsSticky }"
+    >
       <el-button
         v-for="(item, index) in dataModel.processInstButtons"
         :key="index"
@@ -95,7 +98,7 @@ export default {
   .el-timeline {
     padding: 0px;
   }
-  .workflow-item-header {
+  .item-header {
     margin-bottom: 5px;
     height: 20px;
     line-height: 20px;
@@ -117,15 +120,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/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
           });