agilebuilder-ui 1.1.2-tmp8 → 1.1.2-tmp9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.1.2-tmp8",
+  "version": "1.1.2-tmp9",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/organization-input/src/organization-input.vue

@@ -179,6 +179,11 @@ export default {
     openTree: {
       type: Boolean,
       default: true
+    },
+    // 当前表单变量数据信息
+    pageModels: {
+      type: Object,
+      default: null
     }
   },
   data() {
@@ -214,8 +219,20 @@ export default {
       }
     },
     getPropName(prop, isJoinTable, tableName) {
+      if (prop && prop.startsWith('${')) {
+        // 格式是：${page.xxx} 或 ${data.xxx}
+        prop = prop.substring(prop.indexOf('.')+1, prop.length - 1)
+      }
       return getPropNameWhenJoinTable(prop, isJoinTable, tableName)
     },
+    getPropType(prop) {
+      let type = 'data'
+      if (prop && prop.startsWith('${')) {
+        // 格式是：${page.xxx} 或 ${data.xxx}
+        type = prop.substring(2, prop.indexOf('.'))
+      }
+      return type
+    },
     // 清空已选的结果
     emptyOrganizationResult() {
       const orgFields = this.fields
@@ -225,7 +242,8 @@ export default {
           // 人员时：id、name、loginName、email、telephone
           // 部门或工作组时：id、name
           const model = this.getPropName(orgField.model)
-          this.setValue(model, null)
+          const propType = this.getPropType(orgField.model)
+          this.setValue(model, null, propType)
         })
         this.selectOrganizationAllInfo = {}
         this.selectOrganizationInfo = null
@@ -255,34 +273,43 @@ export default {
           const orgDataType = orgField.type
           const orgSelectData = this.getOrgSelectData(orgDataType, orgData, this.isUserTree(treeType), isMulti)
           const model = this.getPropName(orgField.model)
-          this.getOrgDataModel(model, orgSelectData, isMulti, orgDataType, isRemove, removeItems)
+          const propType = this.getPropType(orgField.model)
+          this.getOrgDataModel(model, orgSelectData, isMulti, orgDataType, isRemove, removeItems, propType)
         })
       }
     },
     /**
      * @param orgDataType 字段属性：id、name、loginName、code、email、telephone
      */
-    getOrgDataModel(model, orgSelectData, isMulti, orgDataType, isRemove, removeItems) {
+    getOrgDataModel(model, orgSelectData, isMulti, orgDataType, isRemove, removeItems, propType) {
       if (isMulti) {
         // 表示是替换或添加操作
-        const orgResult = this.getModelValue(model)
+        const orgResult = this.getModelValue(model, propType)
         // 表示替换结果
         this.selectOrganizationAllInfo[orgDataType] = orgSelectData
-        this.setValue(model, orgSelectData)
+        this.setValue(model, orgSelectData, propType)
         // 参数分别为：属性名、原来的值、新替换的值
         this.$emit('replace', model, orgResult, orgSelectData)
       } else {
-        this.setValue(model, orgSelectData)
+        this.setValue(model, orgSelectData, propType)
       }
     },
-    getModelValue(model) {
+    getModelValue(model, propType) {
+      let models = this.models
+      if(propType && propType === 'page') {
+        models = this.pageModels
+      }
       let modelValue = ''
       if (this.isJoinTable === false && model && model.indexOf('.') > 0) {
-        const parentObj = this.getParentObject(model, this.models)
+        const parentObj = this.getParentObject(model, models)
         modelValue = parentObj[model.substring(model.lastIndexOf('.') + 1)]
       } else {
-        model = this.getPropName(model)
-        modelValue = this.models[model]
+        const name = this.getPropName(model)
+        if(propType && propType === 'page') {
+          modelValue = models?models[name]: null
+        } else {
+          modelValue = models[name]
+        }
       }
       return modelValue
     },
@@ -469,7 +496,8 @@ export default {
             const fieldSetting = fieldSettings[0]
             if (fieldSetting) {
               const model = this.getPropName(fieldSetting.model)
-              const selectInfo = this.getModelValue(model)
+              const propType = this.getPropType(fieldSetting.model)
+              const selectInfo = this.getModelValue(model, propType)
               if (selectInfo && selectInfo !== null && selectInfo !== '') {
                 this.selectOrganizationInfo = selectInfo
                 this.searchField = prop
@@ -491,20 +519,28 @@ export default {
         }
       }
     },
-    setValue(model, finallyOrgResult) {
-      if (this.models) {
+    setValue(model, finallyOrgResult, propType) {
+      if(!propType) {
+          propType = this.getPropType(model)
+      }
+      let models = this.models
+      if(propType && propType === 'page') {
+        models = this.pageModels
+      }
+      this.setEntityValue(model, finallyOrgResult, models)
+    },
+    setEntityValue(model, finallyOrgResult, models) {
+      if (models) {
         if (this.isJoinTable === false && model && model.indexOf('.') > 0) {
-          const parentObj = this.getParentObject(model, this.models)
+          const parentObj = this.getParentObject(model, models)
           if (parentObj) {
             setEntityFieldValue(parentObj, model.substring(model.lastIndexOf('.') + 1), finallyOrgResult)
-            // Vue.set(parentObj, model.substring(model.lastIndexOf('.') + 1), finallyOrgResult)
           }
         } else {
-          model = this.getPropName(model)
-          setEntityFieldValue(this.models, model, finallyOrgResult)
-          // Vue.set(this.models, model, finallyOrgResult)
+          const name = this.getPropName(model)
+          setEntityFieldValue(models, name, finallyOrgResult)
         }
-        console.log('this.value', this.models)
+        console.log('this.value===models=', models)
         // 调用setValue事件
         this.$emit('setValue', model, finallyOrgResult)
         if (finallyOrgResult === undefined || finallyOrgResult === null || finallyOrgResult === '') {

package/packages/super-grid/src/dynamic-input.vue

@@ -425,8 +425,6 @@
       :disabled="disabled"
       :inactive-text="getSwitchConfig('inactiveText')"
       :inactive-value="getSwitchConfig('inactiveValue')"
-      :active-color="getSwitchConfig('onColor')"
-      :inactive-color="getSwitchConfig('offColor')"
       @change="cellEvent('change', $event)"
       @input="cellEvent('input', $event, true)"
     />
@@ -1884,11 +1882,12 @@ export default {
           } else {
             return 0
           }
-        } else if (switchProp === 'offColor') {
-          return '#ff4949'
-        } else if (switchProp === 'onColor') {
-          return '#13ce66'
         }
+        //  else if (switchProp === 'offColor') {
+        //   return '#ff4949'
+        // } else if (switchProp === 'onColor') {
+        //   return '#13ce66'
+        // }
       }
     },
     scanClick() {

package/src/styles/index.scss

@@ -160,3 +160,35 @@ body .el-table colgroup.gutter {
   margin-left: 10px;
 }
 
+// v10图表样式
+.amb-widget-chart {
+  --el-card-border-color: var(--el-border-color-light);
+  --el-card-border-radius: 4px;
+  --el-card-padding: 20px;
+  --el-card-bg-color: var(--el-fill-color-blank);
+  background-color: var(--el-card-bg-color);
+  border: 1px solid var(--el-card-border-color);
+  border-radius: var(--el-card-border-radius);
+  color: var(--el-text-color-primary);
+  overflow: hidden;
+  transition: var(--el-transition-duration);
+  box-shadow: var(--el-box-shadow-light);
+  margin-bottom: 18px;
+}
+
+.amb-widget-chart-header {
+  border-bottom: 1px solid var(--el-card-border-color);
+  padding: 6px 10px;
+  display: flex;
+  min-height: 36px;
+}
+.amb-widget-chart-header-item {
+  display: flex;
+  align-items: center;
+}
+.amb-widget-chart-header-center {
+  flex-grow: 1;
+  text-align: center;
+  vertical-align: middle;
+  justify-content: center;
+}