From 718666123eeedfb8c161f3918efdfc34da224162 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Tue, 12 Dec 2023 19:55:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=89=8D=E7=AB=AF-?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95=E4=B8=AD=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E7=9A=84=E5=8F=96=E5=80=BC=EF=BC=8C=E7=94=B1=E8=BD=AF=E4=BB=B6?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=A8=A1=E5=9E=8B=E7=9A=84=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E6=94=B9=E6=88=90=E5=85=A8=E5=B1=80=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1045002900176896]前端-应用清单中环境的取值，由软件服务模型的环境属性改成全局变量 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1045002900176896
---
 .../cmdb/resourceentity/mapping-setting.vue   |   8 ++
 .../typecomponent/globalattr-type.vue         | 113 ++++++++++++++++++
 .../resourceentity/typecomponent/index.js     |   4 +-
 3 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100644 src/views/pages/cmdb/resourceentity/typecomponent/globalattr-type.vue

diff --git a/src/views/pages/cmdb/resourceentity/mapping-setting.vue b/src/views/pages/cmdb/resourceentity/mapping-setting.vue
index bd31bde9..38fcfb7f 100644
--- a/src/views/pages/cmdb/resourceentity/mapping-setting.vue
+++ b/src/views/pages/cmdb/resourceentity/mapping-setting.vue
@@ -66,6 +66,14 @@ export default {
         {
           text: this.$t('page.relation'),
           value: 'rel'
+        },
+        {
+          text: this.$t('全局属性'),
+          value: 'globalAttr'
+        },
+        {
+          text: this.$t('为空'),
+          value: 'empty'
         }
       ],
       validateList: ['required'],
diff --git a/src/views/pages/cmdb/resourceentity/typecomponent/globalattr-type.vue b/src/views/pages/cmdb/resourceentity/typecomponent/globalattr-type.vue
new file mode 100644
index 00000000..50f6a992
--- /dev/null
+++ b/src/views/pages/cmdb/resourceentity/typecomponent/globalattr-type.vue
@@ -0,0 +1,113 @@
+<template>
+  <div class="controller-group">
+    <TsFormTree
+      ref="fromCi"
+      v-model="item.fromCi"
+      v-bind="treeConfig"
+      :placeholder="$t('term.cmdb.attrci')"
+      @on-change="()=>{
+        $set(item,'fromAttr','');
+      }"
+    ></TsFormTree>
+    <TsFormSelect
+      ref="fromAttr"
+      v-model="item.fromAttr"
+      v-bind="globalAttrConfig"
+      :validateList="validateList"
+      :placeholder="$t('page.attribute')"
+      transfer
+    ></TsFormSelect>
+    <TsFormSelect
+      ref="toAttr"
+      v-model="item.toAttr"
+      :dataList="dataList"
+      :validateList="validateList"
+      :placeholder="$t('page.attribute')"
+      transfer
+    ></TsFormSelect>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    TsFormSelect: resolve => require(['@/resources/plugins/TsForm/TsFormSelect'], resolve),
+    TsFormTree: resolve => require(['@/resources/plugins/TsForm/TsFormTree'], resolve)
+ 
+  },
+  props: {
+    item: Object,
+    mainCi: String
+  },
+  data() {
+    return {
+      treeConfig: {
+        url: 'api/rest/cmdb/ci/listtree',
+        valueName: 'name',
+        textName: 'label',
+        params: {
+          rootCiName: this.mainCi
+        },
+        transfer: true,
+        showPath: true,
+        validateList: ['required']
+      },
+      globalAttrConfig: {
+        url: 'api/rest/cmdb/globalattr/search',
+        rootName: 'tbodyList',
+        valueName: 'name',
+        textName: 'label',
+        params: {},
+        transfer: true,
+        showPath: true,
+        validateList: ['required']
+      },
+      validateList: ['required'],
+      dataList: [
+        {
+          'value': 'id',
+          'text': 'ID'
+        },
+        {
+          'value': 'value',
+          'text': this.$t('page.name')
+        },
+        {
+          'value': 'sort',
+          'text': this.$t('page.sort')
+        }
+      ]
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    setConfig(val, attr) {
+      this.$emit('change', val, attr);
+    },
+    valid() {
+      let isValid = true;
+      let list = this.$refs;
+      Object.keys(list).forEach(key => {
+        if (this.$refs[key] && !this.$refs[key].valid()) {
+          isValid = false;
+        }
+      });
+      return isValid;
+    }
+  },
+  filter: {},
+  computed: {},
+  watch: {}
+};
+</script>
+<style lang="less">
+</style>
diff --git a/src/views/pages/cmdb/resourceentity/typecomponent/index.js b/src/views/pages/cmdb/resourceentity/typecomponent/index.js
index e6fbdaf0..6561dd99 100644
--- a/src/views/pages/cmdb/resourceentity/typecomponent/index.js
+++ b/src/views/pages/cmdb/resourceentity/typecomponent/index.js
@@ -1,8 +1,10 @@
 import constType from './const-type.vue';
 import attrType from './attr-type.vue';
 import relType from './rel-type.vue';
+import globalAttrType from './globalattr-type.vue';
 export default {
   constType,
   attrType,
-  relType
+  relType,
+  globalAttrType
 };
-- 
Gitee


From f794310f6152eb1970dc2b203ef1dc242499f912 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Tue, 12 Dec 2023 20:00:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=89=8D=E7=AB=AF-?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95=E4=B8=AD=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E7=9A=84=E5=8F=96=E5=80=BC=EF=BC=8C=E7=94=B1=E8=BD=AF=E4=BB=B6?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=A8=A1=E5=9E=8B=E7=9A=84=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E6=94=B9=E6=88=90=E5=85=A8=E5=B1=80=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1045002900176896]前端-应用清单中环境的取值，由软件服务模型的环境属性改成全局变量 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1045002900176896
---
 src/views/pages/cmdb/resourceentity/mapping-setting.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/pages/cmdb/resourceentity/mapping-setting.vue b/src/views/pages/cmdb/resourceentity/mapping-setting.vue
index 38fcfb7f..7a9fb125 100644
--- a/src/views/pages/cmdb/resourceentity/mapping-setting.vue
+++ b/src/views/pages/cmdb/resourceentity/mapping-setting.vue
@@ -68,11 +68,11 @@ export default {
           value: 'rel'
         },
         {
-          text: this.$t('全局属性'),
+          text: this.$t('term.cmdb.globalattr'),
           value: 'globalAttr'
         },
         {
-          text: this.$t('为空'),
+          text: this.$t('term.expression.empty'),
           value: 'empty'
         }
       ],
-- 
Gitee