@steedos-labs/content-compliance 1.0.8 → 1.0.10

package/main/default/objects/pepesio_ch__c/buttons/retry_content_hub_push.button.yml

@@ -0,0 +1,70 @@
+name: retry_content_hub_push
+amis_schema: |-
+  {
+      "type": "service",
+      "body": [
+          {
+              "type": "button",
+              "label": "重新推送",
+              "id": "u:retry_content_hub_push",
+              "editorState": "default",
+              "confirmText": "确认要重新推送该文件到 Content Hub 吗?",
+              "onEvent": {
+                  "click": {
+                      "weight": 0,
+                      "actions": [
+                          {
+                              "ignoreError": false,
+                              "actionType": "ajax",
+                              "outputVar": "responseResult",
+                              "options": {},
+                              "api": {
+                                  "url": "/api/pepsico-content/content-hub/push-record/retry",
+                                  "method": "post",
+                                  "requestAdaptor": "\napi.data = {\n    id: context._id\n}\n\nreturn api;",
+                                  "adaptor": "",
+                                  "messages": {
+                                    "success": "重新推送成功",
+                                    "failed": "重新推送失败"
+                                  }
+                              }
+                          },
+                          {
+                                "actionType": "broadcast",
+                                "args": {
+                                    "eventName": "@data.changed.pepesio_ch__c"
+                                },
+                                "data": {
+                                    "objectName": "pepesio_ch__c"
+                                }
+                            }
+                      ]
+                  }
+              },
+              "visibleOn": "${push_status == 'failed' && global.user.is_space_admin}"
+          }
+      ],
+      "regions": [
+          "body"
+      ],
+      "data": {
+          "context": {},
+          "dataComponentId": "",
+          "record_id": "",
+          "record": {},
+          "permissions": {}
+      },
+      "bodyClassName": "p-0",
+      "id": "u:retry_content_hub_push_service",
+      "dsType": "api",
+      "asideResizor": false,
+      "editorState": "default",
+      "pullRefresh": {
+          "disabled": true
+      }
+  }
+is_enable: true
+label: 重新推送
+'on': record
+type: amis_button
+visible: true

package/main/default/objects/pepesio_ch__c/fields/pepsico_material.field.yml

@@ -0,0 +1,7 @@
+name: pepsico_material
+description: 推送的素材(补充素材记所属素材); 版权文件压缩包为空。用于失败后按素材重新推送
+group: 通用
+label: 素材
+reference_to: pepsico_material
+sort_no: 130
+type: lookup

package/main/default/objects/pepesio_ch__c/listviews/all.listview.yml

@@ -2,6 +2,7 @@ name: all
 columns:
   - field: name
   - field: pepsico_material_approval
+  - field: pepsico_material
   - field: file_name
   - field: type
   - field: media_type

package/main/default/objects/pepsico_ch_material_group_rule/listviews/all.listview.yml

@@ -1,13 +1,12 @@
 name: all
 columns:
-  - field: priority
   - field: name
     wrap: true
   - field: orgs
-    wrap: true
-  - field: classification
+    width: '300'
     wrap: true
   - field: query_mode
+  - field: priority
   - field: active
 filter_scope: space
 filters: []

package/main/default/objects/pepsico_ch_sync_rule/fields/kol_classification.field.yml

@@ -1,5 +1,11 @@
 name: kol_classification
 amis:
+  # 分类里选了 KOL's Post(MD-SC1-SC13 / SLS-SC2-SC23)时必填; 分类值可能是字符串或 {value} 对象
+  requiredOn: >-
+    [].concat(classification || []).some(function (c) {
+      var v = c && c.value || c;
+      return v === 'MD-SC1-SC13' || v === 'SLS-SC2-SC23';
+    })
   type: tree-select
   multiple: true
   joinValues: false
@@ -57,9 +63,8 @@ amis:
     messages: {}
     cache: 86400000
 data_type: text
-description: 审批单的 KOL 分类(粉丝量级)是所选项之一时命中; 不填表示不限。只有 KOL 类分类的审批单有 KOL 分类, 其他审批单不看这个条件
+description: 审批单的 KOL 分类(粉丝量级)是所选项之一时命中; 不填表示不限。分类包含 KOL's Post 时必填。只有 KOL 类分类的审批单有 KOL 分类, 其他审批单不看这个条件
 group: 匹配条件
-is_wide: true
 label: KOL 分类
 multiple: true
 required: false

package/main/default/objects/pepsico_ch_sync_rule/fields/spot_check.field.yml

@@ -1,12 +1,12 @@
 name: spot_check
-description: 「抽查核准」匹配靠素材抽查核准后推送的单据(跳过审核的 KOL 尾部等); 「非抽查」匹配确认上线时推送的单据; 不填表示两种都匹配。只影响填单时带出的默认值
+description: 「抽查核准」匹配靠素材抽查核准后推送的单据(跳过审核的 KOL 尾部等); 「审核通过」匹配确认上线时推送的单据; 不填表示两种都匹配。只影响填单时带出的默认值; 申请单上勾了同步但没有命中任何同步规则时, 按「审核通过」推送
 group: 匹配条件
-label: 抽查
+label: 推送节点
 options:
   - label: 抽查核准
     value: approved
-  - label: 非抽查
+  - label: 审核通过
     value: none
 required: false
-sort_no: 250
+sort_no: 225
 type: select

package/main/default/objects/pepsico_ch_sync_rule/listviews/all.listview.yml

@@ -1,17 +1,12 @@
 name: all
 columns:
-  - field: priority
   - field: name
     wrap: true
-  - field: need_sync
   - field: orgs
+    width: '300'
     wrap: true
-  - field: classification
-    wrap: true
-  - field: product
-    wrap: true
-  - field: kol_classification
   - field: spot_check
+  - field: priority
   - field: active
 filter_scope: space
 filters: []

package/main/default/objects/pepsico_material_approval/fields/available_channels.field.yml

@@ -21,17 +21,38 @@ amis:
     url: /graphql
     method: post
     requestAdaptor: |-
+      // 停用的选项也查出来, 怎么显示由 adaptor 决定; 模式和当前值放进 url, 缓存才会按搜索框 / 单据区分
+      const isSearch = !!context && Object.prototype.hasOwnProperty.call(context, 'filterFormSearchableFields');
+      const keepIds = isSearch ? [] : _.uniq(_.compact(_.flatMap(_.castArray((context && context.available_channels) || []), (v) => {
+        const s = _.isString(v) ? v : String((v && v.value) || '');
+        return _.flatMap(s.split(/[,、]/), (p) => [p].concat(p.split('-')));
+      }).map((s) => s.trim())));
+      api.url = api.url.split('?')[0] + '?tag_options=' + (isSearch ? 'all' : encodeURIComponent(keepIds.join(',')));
       api.data = { query:`
           query{
         picklists(filters: [["code", "=", "223321001114944"]]){
-          options: _related_picklist_options_picklist(filters: [["enable", "=", true]], sort: "sort_no desc"){
-            label: name, value, , parent: parent__expand{ value }
+          options: _related_picklist_options_picklist(sort: "sort_no desc"){
+            label: name, value, enable, parent: parent__expand{ value }
           }
         }
       }
       `}
     adaptor: |+
-      const pOptions = payload.data.picklists[0].options;
+      const allOptions = payload.data.picklists[0].options;
+      // 停用的选项: 列表搜索框全部列出并标「已停用」, 用来筛选历史单据;
+      // 表单 / 详情页只留当前值用到的(置灰, 不能再选), 否则停用后只显示一串 ID; 其余停用选项不显示
+      const tagOptions = new URLSearchParams(((api && api.url) || '').split('?')[1] || '').get('tag_options') || '';
+      const keepIds = tagOptions === 'all' ? null : tagOptions.split(',');
+      // 值里只存了末级 ID 时, 停用的上级也要带出来, 否则挂不到树上
+      _.forEach(keepIds, (id) => {
+        const op = _.find(allOptions, { value: id });
+        if (op && op.parent && !_.includes(keepIds, op.parent.value)) keepIds.push(op.parent.value);
+      });
+      const pOptions = _.compact(_.map(allOptions, (op) => {
+        if (op.enable !== false) return op;
+        if (keepIds == null) return { ...op, label: op.label + '(已停用)' };
+        return _.includes(keepIds, op.value) ? { ...op, disabled: true } : null;
+      }));
       let depth = 0;
       function getChildren(value) {
           depth++;

package/main/default/objects/pepsico_material_approval/fields/classification.field.yml

@@ -22,18 +22,39 @@ amis:
     url: /graphql
     method: post
     requestAdaptor: |-
+      // 停用的选项也查出来, 怎么显示由 adaptor 决定; 模式和当前值放进 url, 缓存才会按搜索框 / 单据区分
+      const isSearch = !!context && Object.prototype.hasOwnProperty.call(context, 'filterFormSearchableFields');
+      const keepIds = isSearch ? [] : _.uniq(_.compact(_.flatMap(_.castArray((context && context.classification) || []), (v) => {
+        const s = _.isString(v) ? v : String((v && v.value) || '');
+        return _.flatMap(s.split(/[,、]/), (p) => [p].concat(p.split('-')));
+      }).map((s) => s.trim())));
+      api.url = api.url.split('?')[0] + '?tag_options=' + (isSearch ? 'all' : encodeURIComponent(keepIds.join(',')));
       api.data = {
         query: `
           query{
         picklists(filters: [["code", "=", "classification"]]){
-          options: _related_picklist_options_picklist(filters: [["enable", "=", true]], sort: "sort_no desc"){
-            label: name, value, , parent: parent__expand{value}
+          options: _related_picklist_options_picklist(sort: "sort_no desc"){
+            label: name, value, enable, parent: parent__expand{value}
         }
         }
         }
       `}
     adaptor: |+
-      const pOptions = payload.data.picklists[0].options;
+      const allOptions = payload.data.picklists[0].options;
+      // 停用的选项: 列表搜索框全部列出并标「已停用」, 用来筛选历史单据;
+      // 表单 / 详情页只留当前值用到的(置灰, 不能再选), 否则停用后只显示一串 ID; 其余停用选项不显示
+      const tagOptions = new URLSearchParams(((api && api.url) || '').split('?')[1] || '').get('tag_options') || '';
+      const keepIds = tagOptions === 'all' ? null : tagOptions.split(',');
+      // 值里只存了末级 ID 时, 停用的上级也要带出来, 否则挂不到树上
+      _.forEach(keepIds, (id) => {
+        const op = _.find(allOptions, { value: id });
+        if (op && op.parent && !_.includes(keepIds, op.parent.value)) keepIds.push(op.parent.value);
+      });
+      const pOptions = _.compact(_.map(allOptions, (op) => {
+        if (op.enable !== false) return op;
+        if (keepIds == null) return { ...op, label: op.label + '(已停用)' };
+        return _.includes(keepIds, op.value) ? { ...op, disabled: true } : null;
+      }));
       let depth = 0;
       function getChildren(value) {
         depth++;

package/main/default/objects/pepsico_material_approval/fields/content_rule.field.yml

@@ -18,17 +18,38 @@ amis:
     url: /graphql
     method: post
     requestAdaptor: |-
+      // 停用的选项也查出来, 怎么显示由 adaptor 决定; 模式和当前值放进 url, 缓存才会按搜索框 / 单据区分
+      const isSearch = !!context && Object.prototype.hasOwnProperty.call(context, 'filterFormSearchableFields');
+      const keepIds = isSearch ? [] : _.uniq(_.compact(_.flatMap(_.castArray((context && context.content_rule) || []), (v) => {
+        const s = _.isString(v) ? v : String((v && v.value) || '');
+        return _.flatMap(s.split(/[,、]/), (p) => [p].concat(p.split('-')));
+      }).map((s) => s.trim())));
+      api.url = api.url.split('?')[0] + '?tag_options=' + (isSearch ? 'all' : encodeURIComponent(keepIds.join(',')));
       api.data = { query:`
           query{
         picklists(filters: [["code", "=", "223321022150011"]]){
-          options: _related_picklist_options_picklist(filters: [["enable", "=", true]], sort: "sort_no desc"){
-            label: name, value, , parent: parent__expand{ value }
+          options: _related_picklist_options_picklist(sort: "sort_no desc"){
+            label: name, value, enable, parent: parent__expand{ value }
           }
         }
       }
       `}
     adaptor: |+
-      const pOptions = payload.data.picklists[0].options;
+      const allOptions = payload.data.picklists[0].options;
+      // 停用的选项: 列表搜索框全部列出并标「已停用」, 用来筛选历史单据;
+      // 表单 / 详情页只留当前值用到的(置灰, 不能再选), 否则停用后只显示一串 ID; 其余停用选项不显示
+      const tagOptions = new URLSearchParams(((api && api.url) || '').split('?')[1] || '').get('tag_options') || '';
+      const keepIds = tagOptions === 'all' ? null : tagOptions.split(',');
+      // 值里只存了末级 ID 时, 停用的上级也要带出来, 否则挂不到树上
+      _.forEach(keepIds, (id) => {
+        const op = _.find(allOptions, { value: id });
+        if (op && op.parent && !_.includes(keepIds, op.parent.value)) keepIds.push(op.parent.value);
+      });
+      const pOptions = _.compact(_.map(allOptions, (op) => {
+        if (op.enable !== false) return op;
+        if (keepIds == null) return { ...op, label: op.label + '(已停用)' };
+        return _.includes(keepIds, op.value) ? { ...op, disabled: true } : null;
+      }));
       let depth = 0;
       function getChildren(value) {
           depth++;

package/main/default/objects/pepsico_material_approval/fields/kol_classification.field.yml

@@ -20,18 +20,39 @@ amis:
     url: /graphql
     method: post
     requestAdaptor: |-
+      // 停用的选项也查出来, 怎么显示由 adaptor 决定; 模式和当前值放进 url, 缓存才会按搜索框 / 单据区分
+      const isSearch = !!context && Object.prototype.hasOwnProperty.call(context, 'filterFormSearchableFields');
+      const keepIds = isSearch ? [] : _.uniq(_.compact(_.flatMap(_.castArray((context && context.kol_classification) || []), (v) => {
+        const s = _.isString(v) ? v : String((v && v.value) || '');
+        return _.flatMap(s.split(/[,、]/), (p) => [p].concat(p.split('-')));
+      }).map((s) => s.trim())));
+      api.url = api.url.split('?')[0] + '?tag_options=' + (isSearch ? 'all' : encodeURIComponent(keepIds.join(',')));
       api.data = {
         query: `
           query{
         picklists(filters: [["code", "=", "kol_classification"]]){
-          options: _related_picklist_options_picklist(filters: [["enable", "=", true]], sort: "sort_no desc"){
-            label: name, value, , parent: parent__expand{value}
+          options: _related_picklist_options_picklist(sort: "sort_no desc"){
+            label: name, value, enable, parent: parent__expand{value}
         }
         }
         }
       `}
     adaptor: |+
-      const pOptions = payload.data.picklists[0].options;
+      const allOptions = payload.data.picklists[0].options;
+      // 停用的选项: 列表搜索框全部列出并标「已停用」, 用来筛选历史单据;
+      // 表单 / 详情页只留当前值用到的(置灰, 不能再选), 否则停用后只显示一串 ID; 其余停用选项不显示
+      const tagOptions = new URLSearchParams(((api && api.url) || '').split('?')[1] || '').get('tag_options') || '';
+      const keepIds = tagOptions === 'all' ? null : tagOptions.split(',');
+      // 值里只存了末级 ID 时, 停用的上级也要带出来, 否则挂不到树上
+      _.forEach(keepIds, (id) => {
+        const op = _.find(allOptions, { value: id });
+        if (op && op.parent && !_.includes(keepIds, op.parent.value)) keepIds.push(op.parent.value);
+      });
+      const pOptions = _.compact(_.map(allOptions, (op) => {
+        if (op.enable !== false) return op;
+        if (keepIds == null) return { ...op, label: op.label + '(已停用)' };
+        return _.includes(keepIds, op.value) ? { ...op, disabled: true } : null;
+      }));
       let depth = 0;
       function getChildren(value) {
         depth++;

package/main/default/objects/pepsico_material_approval/fields/material_editable.field.yml

@@ -1,5 +1,5 @@
 name: material_editable
-# 选项与素材授权规则(content_rule)相同, 动态读取 picklist 223321022150011 的启用选项
+# 选项与素材授权规则(content_rule)相同, 动态读取 picklist 223321022150011 的选项(停用的只在搜索框和当前值里显示)
 amis:
   id: 'u:material_editable'
   # 与「有无BGM」一样用按钮点选; 选项仍动态读取公共选项集的末级启用选项
@@ -10,18 +10,39 @@ amis:
     url: /graphql
     method: post
     requestAdaptor: |-
+      // 停用的选项也查出来, 怎么显示由 adaptor 决定; 模式和当前值放进 url, 缓存才会按搜索框 / 单据区分
+      const isSearch = !!context && Object.prototype.hasOwnProperty.call(context, 'filterFormSearchableFields');
+      const keepIds = isSearch ? [] : _.uniq(_.compact(_.flatMap(_.castArray((context && context.material_editable) || []), (v) => {
+        const s = _.isString(v) ? v : String((v && v.value) || '');
+        return _.flatMap(s.split(/[,、]/), (p) => [p].concat(p.split('-')));
+      }).map((s) => s.trim())));
+      api.url = api.url.split('?')[0] + '?tag_options=' + (isSearch ? 'all' : encodeURIComponent(keepIds.join(',')));
       api.data = { query:`
           query{
         picklists(filters: [["code", "=", "223321022150011"]]){
-          options: _related_picklist_options_picklist(filters: [["enable", "=", true]], sort: "sort_no desc"){
-            label: name, value, , parent: parent__expand{ value }
+          options: _related_picklist_options_picklist(sort: "sort_no desc"){
+            label: name, value, enable, parent: parent__expand{ value }
           }
         }
       }
       `}
     adaptor: |+
       // 只取末级选项作为按钮; 值沿用原树形下拉的节点路径(各级 value 用 - 连接), 存量单据和推送 Content Hub 不受影响
-      const pOptions = payload.data.picklists[0].options;
+      const allOptions = payload.data.picklists[0].options;
+      // 停用的选项: 列表搜索框全部列出并标「已停用」, 用来筛选历史单据;
+      // 表单 / 详情页只留当前值用到的(置灰, 不能再选), 否则停用后只显示一串 ID; 其余停用选项不显示
+      const tagOptions = new URLSearchParams(((api && api.url) || '').split('?')[1] || '').get('tag_options') || '';
+      const keepIds = tagOptions === 'all' ? null : tagOptions.split(',');
+      // 值里只存了末级 ID 时, 停用的上级也要带出来, 否则挂不到树上
+      _.forEach(keepIds, (id) => {
+        const op = _.find(allOptions, { value: id });
+        if (op && op.parent && !_.includes(keepIds, op.parent.value)) keepIds.push(op.parent.value);
+      });
+      const pOptions = _.compact(_.map(allOptions, (op) => {
+        if (op.enable !== false) return op;
+        if (keepIds == null) return { ...op, label: op.label + '(已停用)' };
+        return _.includes(keepIds, op.value) ? { ...op, disabled: true } : null;
+      }));
       const options = [];
       let depth = 0;
       function walk(parentValue, path) {
@@ -42,7 +63,7 @@ amis:
               if (hasChildren) {
                   walk(item.value, itemPath);
               } else {
-                  options.push({ label: item.label, value: itemPath.join('-') });
+                  options.push({ label: item.label, value: itemPath.join('-'), disabled: item.disabled });
               }
           });
       }

package/main/default/objects/pepsico_material_approval/fields/material_type.field.yml

@@ -16,18 +16,39 @@ amis:
     url: /graphql
     method: post
     requestAdaptor: |-
+      // 停用的选项也查出来, 怎么显示由 adaptor 决定; 模式和当前值放进 url, 缓存才会按搜索框 / 单据区分
+      const isSearch = !!context && Object.prototype.hasOwnProperty.call(context, 'filterFormSearchableFields');
+      const keepIds = isSearch ? [] : _.uniq(_.compact(_.flatMap(_.castArray((context && context.material_type) || []), (v) => {
+        const s = _.isString(v) ? v : String((v && v.value) || '');
+        return _.flatMap(s.split(/[,、]/), (p) => [p].concat(p.split('-')));
+      }).map((s) => s.trim())));
+      api.url = api.url.split('?')[0] + '?tag_options=' + (isSearch ? 'all' : encodeURIComponent(keepIds.join(',')));
       api.data = {
           query: `
           query{
         picklists(filters: [["code", "=", "223321001114222"]]){
-          options: _related_picklist_options_picklist(filters: [["enable", "=", true]], sort: "sort_no desc"){
-            label: name, value, , parent: parent__expand{value}
+          options: _related_picklist_options_picklist(sort: "sort_no desc"){
+            label: name, value, enable, parent: parent__expand{value}
         }
         }
         }
       `}
     adaptor: |+
-      const pOptions = payload.data.picklists[0].options;
+      const allOptions = payload.data.picklists[0].options;
+      // 停用的选项: 列表搜索框全部列出并标「已停用」, 用来筛选历史单据;
+      // 表单 / 详情页只留当前值用到的(置灰, 不能再选), 否则停用后只显示一串 ID; 其余停用选项不显示
+      const tagOptions = new URLSearchParams(((api && api.url) || '').split('?')[1] || '').get('tag_options') || '';
+      const keepIds = tagOptions === 'all' ? null : tagOptions.split(',');
+      // 值里只存了末级 ID 时, 停用的上级也要带出来, 否则挂不到树上
+      _.forEach(keepIds, (id) => {
+        const op = _.find(allOptions, { value: id });
+        if (op && op.parent && !_.includes(keepIds, op.parent.value)) keepIds.push(op.parent.value);
+      });
+      const pOptions = _.compact(_.map(allOptions, (op) => {
+        if (op.enable !== false) return op;
+        if (keepIds == null) return { ...op, label: op.label + '(已停用)' };
+        return _.includes(keepIds, op.value) ? { ...op, disabled: true } : null;
+      }));
       let depth = 0;
       function getChildren(value) {
           depth++;

package/main/default/objects/pepsico_material_approval/fields/product.field.yml

@@ -23,13 +23,19 @@ amis:
       // 搜索框的数据上有 filterFormSearchableFields; 只认自身属性, 不认从列表页继承下来的
       const isSearch = !!context && Object.prototype.hasOwnProperty.call(context, 'filterFormSearchableFields');
       const codes = isSearch ? ['223321001114213', '223321001114213-v3'] : [context && context.form_version === 'v3' ? '223321001114213-v3' : '223321001114213'];
-      api.url = api.url.split('?')[0] + '?product_picklist=' + (isSearch ? 'all' : codes[0]);
+      // 停用的选项也查出来, 怎么显示由 adaptor 决定; 当前值放进 url, 缓存才会按单据区分
+      const keepIds = isSearch ? [] : _.uniq(_.compact(_.flatMap(_.castArray((context && context.product) || []), (v) => {
+        const s = _.isString(v) ? v : String((v && v.value) || '');
+        return _.flatMap(s.split(/[,、]/), (p) => [p].concat(p.split('-')));
+      }).map((s) => s.trim())));
+      api.url = api.url.split('?')[0] + '?product_picklist=' + (isSearch ? 'all' : codes[0])
+        + '&tag_options=' + (isSearch ? 'all' : encodeURIComponent(keepIds.join(',')));
       api.data = { query:`
           query{
         picklists(filters: [["code", "in", ${JSON.stringify(codes)}]]){
           code,
-          options: _related_picklist_options_picklist(filters: [["enable", "=", true]], sort: "sort_no desc"){
-            label: name, value, , parent: parent__expand{value}
+          options: _related_picklist_options_picklist(sort: "sort_no desc"){
+            label: name, value, enable, parent: parent__expand{value}
         }
         }
         }
@@ -38,9 +44,23 @@ amis:
     adaptor: |+
       // 选项集还没建好时下拉为空, 不报错。两套一起列出时(搜索框), 新选项集的顶级品牌标「[新]」
       const picklists = (payload.data && payload.data.picklists) || [];
-      const pOptions = _.flatMap(picklists, (picklist) => picklists.length > 1 && picklist.code === '223321001114213-v3'
+      const allOptions = _.flatMap(picklists, (picklist) => picklists.length > 1 && picklist.code === '223321001114213-v3'
         ? _.map(picklist.options, (op) => op.parent == null ? { ...op, label: '[新] ' + op.label } : op)
         : picklist.options);
+      // 停用的选项: 搜索框全部列出并标「已停用」, 用来筛选历史单据(原选项集冻结后旧品牌都停用了也要能搜);
+      // 表单 / 详情页只留当前值用到的(置灰, 不能再选), 否则停用后只显示一串 ID; 其余停用选项不显示
+      const tagOptions = new URLSearchParams(((api && api.url) || '').split('?')[1] || '').get('tag_options') || '';
+      const keepIds = tagOptions === 'all' ? null : tagOptions.split(',');
+      // 值里只存了末级 ID 时, 停用的上级也要带出来, 否则挂不到树上
+      _.forEach(keepIds, (id) => {
+        const op = _.find(allOptions, { value: id });
+        if (op && op.parent && !_.includes(keepIds, op.parent.value)) keepIds.push(op.parent.value);
+      });
+      const pOptions = _.compact(_.map(allOptions, (op) => {
+        if (op.enable !== false) return op;
+        if (keepIds == null) return { ...op, label: op.label + '(已停用)' };
+        return _.includes(keepIds, op.value) ? { ...op, disabled: true } : null;
+      }));
       let depth = 0;
       function getChildren(value) {
         depth++;

package/main/default/objects/pepsico_material_approval/fields/social_media.field.yml

@@ -16,17 +16,38 @@ amis:
     url: /graphql
     method: post
     requestAdaptor: |-
+      // 停用的选项也查出来, 怎么显示由 adaptor 决定; 模式和当前值放进 url, 缓存才会按搜索框 / 单据区分
+      const isSearch = !!context && Object.prototype.hasOwnProperty.call(context, 'filterFormSearchableFields');
+      const keepIds = isSearch ? [] : _.uniq(_.compact(_.flatMap(_.castArray((context && context.social_media) || []), (v) => {
+        const s = _.isString(v) ? v : String((v && v.value) || '');
+        return _.flatMap(s.split(/[,、]/), (p) => [p].concat(p.split('-')));
+      }).map((s) => s.trim())));
+      api.url = api.url.split('?')[0] + '?tag_options=' + (isSearch ? 'all' : encodeURIComponent(keepIds.join(',')));
       api.data = { query:`
           query{
         picklists(filters: [["code", "=", "social_media"]]){
-          options: _related_picklist_options_picklist(filters: [["enable", "=", true]], sort: "sort_no desc"){
-            label: name, value, , parent: parent__expand{value}
+          options: _related_picklist_options_picklist(sort: "sort_no desc"){
+            label: name, value, enable, parent: parent__expand{value}
         }
         }
         }
       `}
     adaptor: |+
-      const pOptions = payload.data.picklists[0].options;
+      const allOptions = payload.data.picklists[0].options;
+      // 停用的选项: 列表搜索框全部列出并标「已停用」, 用来筛选历史单据;
+      // 表单 / 详情页只留当前值用到的(置灰, 不能再选), 否则停用后只显示一串 ID; 其余停用选项不显示
+      const tagOptions = new URLSearchParams(((api && api.url) || '').split('?')[1] || '').get('tag_options') || '';
+      const keepIds = tagOptions === 'all' ? null : tagOptions.split(',');
+      // 值里只存了末级 ID 时, 停用的上级也要带出来, 否则挂不到树上
+      _.forEach(keepIds, (id) => {
+        const op = _.find(allOptions, { value: id });
+        if (op && op.parent && !_.includes(keepIds, op.parent.value)) keepIds.push(op.parent.value);
+      });
+      const pOptions = _.compact(_.map(allOptions, (op) => {
+        if (op.enable !== false) return op;
+        if (keepIds == null) return { ...op, label: op.label + '(已停用)' };
+        return _.includes(keepIds, op.value) ? { ...op, disabled: true } : null;
+      }));
       let depth = 0;
       function getChildren(value) {
         depth++;

package/main/default/objects/space_users/fields/agency_contract_expiry_date.field.yml

@@ -1,9 +1,9 @@
 name: agency_contract_expiry_date
 amis:
   id: 'u:agency_contract_expiry_date'
-group: 系统信息
+group: 个人信息
 label: Agency合同截止日期
 required: false
-sort_no: 1710
+sort_no: 10000
 type: date
-visible_on: '{{global.user.is_space_admin}}'
+visible_on: '{{global.user.is_space_admin === true && formData.is_collaborator === true}}'

package/main/default/objects/space_users/fields/agency_pepsico_contact.field.yml

@@ -2,13 +2,13 @@ name: agency_pepsico_contact
 amis:
   id: 'u:agency_pepsico_contact'
 filters: []
-group: 系统信息
+group: 个人信息
 is_wide: false
 label: Agency百事内部对接人
 multiple: false
 reference_to: space_users
 reference_to_field: user
 required: false
-sort_no: 1720
+sort_no: 10010
 type: lookup
-visible_on: '{{global.user.is_space_admin}}'
+visible_on: '{{global.user.is_space_admin === true && formData.is_collaborator === true}}'

package/main/default/objects/space_users/fields/avatar.field.yml

@@ -7,4 +7,4 @@ inlineHelpText: ''
 label: 头像
 sort_no: 99998
 type: avatar
-is_wide: false
+is_wide: true

package/main/default/objects/space_users/fields/created.field.yml

@@ -7,6 +7,6 @@ index: true
 inlineHelpText: ''
 label: 创建时间
 readonly: true
-sort_no: 1750
+sort_no: 1151
 sortable: true
 type: datetime

package/main/default/objects/space_users/fields/email_notification.field.yml

@@ -6,6 +6,6 @@ enable_thousands: true
 group: 个人信息
 inlineHelpText: ''
 label: 接收邮件通知
-sort_no: 9999
+sort_no: 845
 is_wide: false
 type: boolean

package/main/default/objects/space_users/fields/is_collaborator.field.yml

@@ -6,5 +6,6 @@ enable_thousands: true
 group: 个人信息
 inlineHelpText: ''
 label: 是否协作者
-sort_no: 845
+sort_no: 999
 type: boolean
+is_wide: true

package/main/default/objects/space_users/fields/last_logon.field.yml

@@ -5,11 +5,11 @@ description: ''
 enable_thousands: true
 group: 系统信息
 inlineHelpText: ''
-label: 最近登陆
+label: 最近登录
 sort_no: 1700
 type: date
-visible_on: '{{global.user.is_space_admin}}'
+visible_on: '{{global.user.is_space_admin === true && global.mode === "read"}}'
 hidden: false
 omit: false
 static: true
-is_wide: false
+is_wide: false

package/main/default/objects/space_users/fields/login_expired.field.yml

@@ -9,7 +9,7 @@ hidden: false
 inlineHelpText: ''
 label: 超90天未登录
 omit: false
-sort_no: 1151
+sort_no: 1900
 type: boolean
-visible_on: '{{global.user.is_space_admin}}'
-static: true
+visible_on: '{{global.user.is_space_admin === true && global.mode === "read"}}'
+static: true

package/main/default/objects/space_users/fields/modified.field.yml

@@ -7,6 +7,6 @@ index: true
 inlineHelpText: ''
 label: 修改时间
 readonly: true
-sort_no: 1900
+sort_no: 1750
 sortable: true
 type: datetime