cloud-web-corejs 1.0.54-dev.163 → 1.0.54-dev.164

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.163",
+  "version": "1.0.54-dev.164",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/form-widget/field-widget/baseAttachment-widget.vue

@@ -62,6 +62,9 @@ export default {
   watch: {
     fieldModel(val) {
       this.handleChangeEvent(val);
+    },
+    'option':function(){
+
     }
   },
   computed: {

package/src/components/xform/form-designer/form-widget/field-widget/button-widget.vue

@@ -5,7 +5,7 @@
     <el-button ref="fieldEditor" :type="field.options.type" :size="field.options.size" class="button-sty"
                :plain="field.options.plain" :round="field.options.round"
                :circle="field.options.circle" :icon="field.options.icon"
-               :disabled="field.options.disabled"
+               :disabled="!designState &&field.options.disabled"
                @click.native="handleButtonWidgetClick">
       {{ getI18nLabel(field.options.label)}}</el-button>
   </static-content-wrapper>

package/src/components/xform/form-designer/form-widget/field-widget/fieldMixin.js

@@ -484,6 +484,11 @@ modules = {
         let formScriptEnabled = this.field.options.formScriptEnabled || false;
         let scriptCode = this.field.options.formScriptCode || "getList";
         if (formScriptEnabled) {
+          let tableParam = this.tableParam;
+          /*if(tableParam && tableParam.column.params.optionItems){
+            this.field.options.optionItems = this.$baseLodash.cloneDeep(tableParam.column.params.optionItems);
+            return
+          }*/
           let accessParam = this.handleCustomEvent(
             this.field.options.formScriptParam
           );
@@ -1086,12 +1091,17 @@ modules = {
         : (this.fieldModel = ""));
     },
     loadOptions: function (e) {
-      this.field.options.optionItems = baseRefUtil.translateOptionItems(
+      let optionItems = baseRefUtil.translateOptionItems(
         e,
         this.field.type,
         this.field.options.labelKey || "label",
         this.field.options.valueKey || "value"
       );
+      this.field.options.optionItems = optionItems
+      let tableParam = this.tableParam;
+      if(tableParam){
+        tableParam.column.params.optionItems = optionItems;
+      }
     },
     reloadOptions: function (e) {
       this.field.options.optionItems = baseRefUtil.translateOptionItems(

package/src/components/xform/form-designer/form-widget/field-widget/select-widget.vue

@@ -18,7 +18,7 @@
                @change="handleChangeEvent"
                :style="'width:'+field.options.widgetWidth+' !important;'"
                :class="{'custom-width':field.options.widgetWidth!=null}">
-      <el-option v-for="item in field.options.optionItems" :key="item[valueField]" :label="getI18nLabel(item[labelField])"
+      <el-option v-for="(item,index) in field.options.optionItems" :key="index" :label="getI18nLabel(item[labelField])"
                  :value="item[valueField]" :disabled="item.disabled">
       </el-option>
     </el-select>

package/src/components/xform/form-render/indexMixin.js

@@ -317,6 +317,88 @@ modules = {
       let wfParam = this.wfParam;
       if (!wfParam.hasWf) return;
       let refList = this.widgetRefList;
+
+      /*let toDo = (target, options, e) => {
+        let widget = options ? null : (target.field || target.widget);
+        let isWfFlag = options ? true : this.hasConfig(widget, 'wfFlag');
+        let widgetType = widget?.type;
+        let enabledByWf = options ? options.enabledByWf : widget?.options?.enabledByWf;
+        let hiddenByWf = options ? options.hiddenByWf : widget?.options?.hiddenByWf;
+        let widgetName = options ? options.name : widget?.options?.name;
+        if (isWfFlag) {
+          if (this.hasConfig(widget, 'disabled') || !!options) {
+            let disabled = null;
+            if (!enabledByWf) {
+              disabled = true;
+              // setDisabled(target,true);
+              let onClick = options ? options.onClick : widget.options.onClick;
+              if (onClick && onClick.startsWith("this.getFormRef().$baseReload()")) {
+                // setDisabled(target,false);
+                disabled = false;
+              }
+            } else {
+              // setDisabled(target,false);
+              disabled = false;
+            }
+            if (widgetType == 'reset_button' && enabledByWf === undefined) {
+              // setDisabled(target,false)
+              disabled = false;
+            }
+            if (disabled !== null) {
+              if (options) {
+                options.disabled = disabled;
+              } else {
+                widget.options.disabled = disabled;
+              }
+            }
+          }
+
+          let hidden = null;
+          if (hiddenByWf) {
+            // setHidden(target,true);
+            // widget.options.hidden = true;
+            hidden = true
+          }
+          if (widget && widgetType == 'save_button' && hiddenByWf === undefined) {
+            // setHidden(target,true)
+            // widget.options.hidden = true;
+            hidden = true
+          }
+          if (hidden !== null) {
+            if (options) {
+              options.hidden = hidden;
+            } else {
+              widget.options.hidden = hidden;
+            }
+          }
+        }
+
+        /!*if (widget?.type == "data-table") {
+          debugger
+          let loopDo = (t,e) => {
+            if (t.children && t.children.length) {
+              t.children.forEach(item => {
+                loopDo(item,e)
+              })
+            } else {
+              if (t.columnOption) {
+                toDo(null,t.columnOption,e)
+              }
+            }
+          }
+          widget.options.tableColumns.forEach(item => {
+            loopDo(item,e)
+            this.loopHandleWidget(item.widgetList, (item1) => {
+              toDo(item1)
+            });
+          })
+
+        }*!/
+        if (target && widgetType == 'baseAttachment') {
+            target.initOption();
+        }
+      }
+
       for (let key in refList) {
         let target = refList[key];
         let widget = target.field || target.widget;
@@ -324,38 +406,97 @@ modules = {
         if (formItemFlag) {
           target.setDisabled && target.setDisabled(true);
         }
+        toDo(target);
+      }*/
 
-        let isWfFlag = this.hasConfig(widget, 'wfFlag');
+      let toDo2 = (widget, options, e) => {
+        // let widget = options ? null : (target.field || target.widget);
+        let isWfFlag = options ? true : this.hasConfig(widget, 'wfFlag');
         let widgetType = widget?.type;
-        let enabledByWf = widget?.options?.enabledByWf;
-        let hiddenByWf = widget?.options?.hiddenByWf;
-
+        let enabledByWf = options ? options.enabledByWf : widget?.options?.enabledByWf;
+        let hiddenByWf = options ? options.hiddenByWf : widget?.options?.hiddenByWf;
+        let widgetName = options ? options.name : widget?.options?.name;
         if (isWfFlag) {
-          if (target.setDisabled) {
+          if (this.hasConfig(widget, 'disabled') || !!options) {
+            let disabled = null;
             if (!enabledByWf) {
-              target.setDisabled(true);
-              let onClick = target.field.options.onClick;
+              disabled = true;
+              // setDisabled(target,true);
+              let onClick = options ? options.onClick : widget.options.onClick;
               if (onClick && onClick.startsWith("this.getFormRef().$baseReload()")) {
-                target.setDisabled(false);
+                // setDisabled(target,false);
+                disabled = false;
               }
             } else {
-              target.setDisabled(false);
+              // setDisabled(target,false);
+              disabled = false;
             }
             if (widgetType == 'reset_button' && enabledByWf === undefined) {
-              target.setDisabled(false)
+              // setDisabled(target,false)
+              disabled = false;
+            }
+            if (disabled !== null) {
+              if (options) {
+                options.disabled = disabled;
+              } else {
+                widget.options.disabled = disabled;
+              }
             }
           }
 
+          let hidden = null;
           if (hiddenByWf) {
-            target.setHidden(true);
+            // setHidden(target,true);
+            // widget.options.hidden = true;
+            hidden = true
           }
-          if (widgetType == 'save_button' && hiddenByWf === undefined) {
-            target.setHidden(true)
+          if (widget && widgetType == 'save_button' && hiddenByWf === undefined) {
+            // setHidden(target,true)
+            // widget.options.hidden = true;
+            hidden = true
+          }
+          if (hidden !== null) {
+            if (options) {
+              options.hidden = hidden;
+            } else {
+              widget.options.hidden = hidden;
+            }
           }
         }
 
+        if (widget?.type == "data-table") {
+          let loopDo = (t,e) => {
+            if (t.children && t.children.length) {
+              t.children.forEach(item => {
+                loopDo(item)
+              })
+            } else {
+              if (t.columnOption) {
+                toDo2(null,t.columnOption)
+              }
+            }
+          }
+          widget.options.tableColumns.forEach(item => {
+            loopDo(item)
+            this.loopHandleWidget(item.widgetList, (item1) => {
+              toDo(item1)
+            });
+          })
+
+        }
+        /*if (target && widgetType == 'baseAttachment') {
+          target.initOption();
+        }*/
       }
 
+      this.loopHandleWidget(this.formJson.widgetList,(widget)=>{
+        let formItemFlag = widget?.formItemFlag
+        if (formItemFlag) {
+          widget.options.disabled = true;
+        }
+        toDo2(widget);
+      });
+
     },
     hanldeWfWidget2() {
       let wfParam = this.wfParam;
@@ -372,11 +513,13 @@ modules = {
       let hasModifyItem = false;
       let refList = this.widgetRefList;
       let saveButton;
+      let saveButtonOptions;
       let bdService = this.bdService;
-      for (let key in refList) {
+
+      /*for (let key in refList) {
         let target = refList[key];
         let widget = target.field || target.widget;
-        /*
+        /!*
         let wfEdit = widget?.options.wfEdit;
         if (wfEdit) {
           let wfConfigData = widget?.options?.wfConfigData || [];
@@ -406,7 +549,7 @@ modules = {
               }
             }
           })
-        }*/
+        }*!/
         let flag = this.hanldeWfWidgetItem(target)
         if (!hasModifyItem && flag) {
           hasModifyItem = true
@@ -414,71 +557,110 @@ modules = {
         if (!saveButton && widget?.options?.saveButton) {
           saveButton = target;
         }
-      }
+      }*/
+
+      this.loopHandleWidget(this.formJson.widgetList,(widget)=>{
+        let flag = this.hanldeWfWidgetItem(widget)
+        if (!hasModifyItem && flag) {
+          hasModifyItem = true
+        }
+        if (!saveButtonOptions && widget?.options?.saveButton) {
+          saveButtonOptions = widget?.options;
+        }
+      });
+
+
       if (hasModifyItem) {
-        saveButton.setDisabled && saveButton.setDisabled(false);
-        saveButton.setHidden(false);
+        if(saveButtonOptions){
+          saveButtonOptions.disabled = false;
+          saveButtonOptions.hidden = false;
+        }
+        /*saveButton.setDisabled && saveButton.setDisabled(false);
+        saveButton.setHidden(false);*/
       }
     },
-    hanldeWfWidgetItem(target) {
+    hanldeWfWidgetItem(widget) {
       let hasModifyItem = false;
-      let widget = target.field || target.widget;
+      // let widget = target.field || target.widget;
       let wfEdit = widget?.options.wfEdit;
-      if (wfEdit) {
-        let bdService = this.bdService;
-        let wfParam = this.wfParam;
-        let wfInfo = wfParam.wfInfo
-        let modelKey = wfInfo.modelKey;
-        let companyCode = this.$store.getters.companyCode;
-        let taskStep = (wfInfo.taskStep ?? "") + "";
-
-        let handleWfConfigData = (options) => {
-          if (!options || !options.wfEdit) return
-          let wfConfigData = options.wfConfigData || [];
-          wfConfigData.forEach(item => {
 
-            let type = item.type;
-            let taskStepList = item.taskSteps ? item.taskSteps.split(',') : []
-            if (type && taskStepList.includes(taskStep)) {
-              let companyCodeStr = item.companyCodes;
-              let companyCodes = companyCodeStr ? companyCodeStr.split(",").filter(item => !!item) : [];
-              let flag1 = !item.serveName || item.serveName == bdService;
-              let flag2 = !item.modelKey || item.modelKey == modelKey;
-              let flag3 = !companyCodes.length || companyCodes.includes(companyCode)
-              if (flag1 && flag2 && flag3) {
-                if (type === 1) {
-                  //可编辑
-                  hasModifyItem = true;
-                  if (options.disabled !== undefined) options.disabled = false;
-                  // target.setDisabled && target.setDisabled(false);
-                  // target.setHidden(false);
-                  options.hidden = false;
-                } else if (type === 2) {
-                  //仅显示
-                  // target.setDisabled && target.setDisabled(true);
-                  if (options.disabled !== undefined) options.disabled = true;
-                  // target.setHidden(false);
-                  options.hidden = false;
-                } else if (type === 3) {
-                  // target.setHidden(true);
-                  options.hidden = true;
-                }
+      let bdService = this.bdService;
+      let wfParam = this.wfParam;
+      let wfInfo = wfParam.wfInfo
+      let modelKey = wfInfo.modelKey;
+      let companyCode = this.$store.getters.companyCode;
+      let taskStep = (wfInfo.taskStep ?? "") + "";
+
+      let handleWfConfigData = (widget,columnOptions) => {
+        let options = widget?.options || columnOptions;
+        if (!options || !options.wfEdit) return
+        let wfConfigData = options.wfConfigData || [];
+        let flag = false;
+        wfConfigData.forEach(item => {
+          let type = item.type;
+          let taskStepList = item.taskSteps ? item.taskSteps.split(',') : []
+          if (type && taskStepList.includes(taskStep)) {
+            let companyCodeStr = item.companyCodes;
+            let companyCodes = companyCodeStr ? companyCodeStr.split(",").filter(item => !!item) : [];
+            let flag1 = !item.serveName || item.serveName == bdService;
+            let flag2 = !item.modelKey || item.modelKey == modelKey;
+            let flag3 = !companyCodes.length || companyCodes.includes(companyCode)
+            if (flag1 && flag2 && flag3) {
+              if (type === 1) {
+                //可编辑
+                hasModifyItem = true;
+                if (options.disabled !== undefined) options.disabled = false;
+                // target.setDisabled && target.setDisabled(false);
+                // target.setHidden(false);
+                options.hidden = false;
+                flag = true;
+              } else if (type === 2) {
+                //仅显示
+                // target.setDisabled && target.setDisabled(true);
+                if (options.disabled !== undefined) options.disabled = true;
+                // target.setHidden(false);
+                options.hidden = false;
+                flag = true;
+              } else if (type === 3) {
+                // target.setHidden(true);
+                options.hidden = true;
+                flag = true;
               }
-            } else if (type == "data-table") {
-              target.options.tableColumns.forEach(item => {
-                handleWfConfigData(item.columnOption)
-              })
-              target.widgetList.forEach(item => {
-                handleWfConfigData(item.options)
-              })
-              target.buttons.forEach(item => {
-                handleWfConfigData(item.options)
-              })
             }
-          })
+          }
+        })
+        /*if (flag && e && widget.type == 'baseAttachment') {
+          e.initOption();
+        }*/
+      }
+      handleWfConfigData(widget)
+      if (widget.type == "data-table") {
+        let loopDo = (t) => {
+          if (t.children && t.children.length) {
+            t.children.forEach(item => {
+              loopDo(item)
+            })
+          } else {
+            if (t.columnOption) {
+              handleWfConfigData(null,t.columnOption)
+            }
+          }
         }
-        handleWfConfigData(widget?.options)
+
+        widget.options.tableColumns.forEach(item => {
+          loopDo(item)
+          this.loopHandleWidget(item.widgetList, (item1) => {
+            handleWfConfigData(item1)
+          });
+        })
+        /*this.loopHandleWidget(widget.widgetList, (item1) => {
+          handleWfConfigData(item1.options)
+        });
+        this.loopHandleWidget(widget.buttons, (item1) => {
+          handleWfConfigData(item1.options)
+        });*/
       }
+
       return hasModifyItem;
     },
     loadDefaultEntityData(callback) {
@@ -515,16 +697,23 @@ modules = {
               formCode: formCode,
               callback: (wfParam) => {
                 this.setFormData(formData);
+
                 let {hasWf} = wfParam;
                 this.hasWf = hasWf;
                 this.wfParam = wfParam;
+
+                if (hasWf) {
+                    this.hanldeWfWidget();
+                    this.hanldeWfWidget2();
+                }
+
                 this.showFormContent = true;
                 this.$nextTick(() => {
                   this.handleShowHideRule();
                   if (hasWf) {
                     setTimeout(() => {
-                      this.hanldeWfWidget();
-                      this.hanldeWfWidget2();
+                      // this.hanldeWfWidget();
+                      // this.hanldeWfWidget2();
                       callback && callback()
                       callback1 && callback1(wfParam)
                     }, 1000)
@@ -1854,6 +2043,128 @@ modules = {
     confirmFormDrawer() {
       this.formDrawerOption.confirm && this.formDrawerOption.confirm()
     },
+
+    loopHandleWidget: function (e, callback) {
+      let t = this;
+      e
+      && e.length > 0
+      && e.forEach(function (e) {
+        t.loopHandleWidgetItem(e, callback);
+      });
+    },
+    loopHandleWidgetItem: function (e, callback) {
+      let t = this;
+      let dataId = this.dataId;
+      let currentFormData = this.currentFormData;
+      let fieldKeyName = this.getFieldKeyName(e)
+      let defaultValue = e.options.defaultValue === undefined || e.options.defaultValue === "" ? null : e.options.defaultValue;
+      if ('container' === e.category) {
+        callback(e)
+        if ('vf-dialog' === e.type || 'vf-drawer' === e.type) ;
+        else if ('data-table' === e.type) {
+          if (!!e.widgetList) {
+            e.widgetList.forEach((childItem) => {
+              this.loopHandleWidgetItem(childItem, callback);
+            });
+          }
+          if (!!e.buttons) {
+            e.buttons.forEach((childItem) => {
+              this.loopHandleWidgetItem(childItem, callback);
+            });
+          }
+        } else if ('list-h5' === e.type) {
+          if (!!e.widgetList && (e.widgetList.length > 0)) {
+            e.widgetList.forEach((childItem) => {
+              this.loopHandleWidgetItem(childItem, callback);
+            });
+          }
+        } else if ('grid' === e.type) {
+          e.cols
+          && e.cols.length > 0
+          && e.cols.forEach(function (e) {
+            t.loopHandleWidgetItem(e, callback);
+          });
+        } else if ('table' === e.type) {
+          e.rows
+          && e.rows.length > 0
+          && e.rows.forEach(function (e) {
+            e.cols
+            && e.cols.length > 0
+            && e.cols.forEach(function (e) {
+              t.loopHandleWidgetItem(e, callback);
+            });
+          });
+        } else if ('h5-table' === e.type) {
+          e.rows
+          && e.rows.length > 0
+          && e.rows.forEach(function (e) {
+            e.cols
+            && e.cols.length > 0
+            && e.cols.forEach(function (e) {
+              t.loopHandleWidgetItem(e, callback);
+            });
+          });
+        } else if ('tab' === e.type) {
+          e.tabs
+          && e.tabs.length > 0
+          && e.tabs.forEach(function (e) {
+            e.widgetList
+            && e.widgetList.length > 0
+            && e.widgetList.forEach(function (e) {
+              t.loopHandleWidgetItem(e, callback);
+            });
+          });
+        } else if ('detail' === e.type) {
+          if (e.panes) {
+            e.panes.forEach(function (e) {
+              if (e.widgetList) {
+                e.widgetList.forEach(function (e) {
+                  t.loopHandleWidgetItem(e, callback);
+                });
+              }
+              if (e.buttonWidgetList) {
+                e.buttonWidgetList.forEach(function (e) {
+                  t.loopHandleWidgetItem(e, callback);
+                });
+              }
+            });
+          }
+          if (e.widgetList) {
+            e.widgetList.forEach(function (e) {
+              t.loopHandleWidgetItem(e, callback);
+            });
+          }
+        } else if ('detail-pane' === e.type) {
+          if (e.widgetList) {
+            e.widgetList.forEach(function (e) {
+              t.loopHandleWidgetItem(e, callback);
+            });
+          }
+          if (e.buttonWidgetList) {
+            e.buttonWidgetList.forEach(function (e) {
+              t.loopHandleWidgetItem(e, callback);
+            });
+          }
+        } else {
+          'grid-col' === e.type || e.type,
+          e.widgetList
+          && e.widgetList.length > 0
+          && e.widgetList.forEach(function (e) {
+            t.loopHandleWidgetItem(e, callback);
+          });
+        }
+
+      } else {
+        callback && callback(e)
+        /*if (dataId || currentFormData.hasOwnProperty(fieldKeyName)) {
+          let c = currentFormData[fieldKeyName] ?? null;
+          this.$set(this.formDataModel, fieldKeyName, baseRefUtil.deepClone(c));
+        } else {
+          this.$set(this.formDataModel, fieldKeyName, defaultValue);
+        }*/
+      }
+    },
+
   }
 };